diff options
| -rw-r--r-- | flake.lock | 30 | ||||
| -rw-r--r-- | hosts/laptop/cfg.nix | 28 | ||||
| -rw-r--r-- | hosts/vps/website.nix | 17 | ||||
| -rw-r--r-- | mixins/cli.nix | 14 | ||||
| -rw-r--r-- | mixins/multimedia.nix | 3 | ||||
| -rw-r--r-- | mixins/syncthing.nix | 16 | ||||
| -rw-r--r-- | profiles/ssh.nix | 6 | ||||
| -rw-r--r-- | profiles/user.nix | 2 |
8 files changed, 76 insertions, 40 deletions
diff --git a/flake.lock b/flake.lock index 8d34479..a9ea28f 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ }, "hardware": { "locked": { - "lastModified": 1684169666, - "narHash": "sha256-N5jrykeSxLVgvm3Dd3hZ38/XwM/jU+dltqlXgrGlYxk=", + "lastModified": 1684899633, + "narHash": "sha256-NtwerXX8UFsoNy6k+DukJMriWtEjQtMU/Urbff2O2Dg=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "71ce85372a614d418d5e303dd5702a79d1545c04", + "rev": "4cc688ee711159b9bcb5a367be44007934e1a49d", "type": "github" }, "original": { @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1684596126, - "narHash": "sha256-4RZZmygeEXpuBqEXGs38ZAcWjWKGwu13Iqbxub6wuJk=", + "lastModified": 1685573051, + "narHash": "sha256-zrpbdQVJFpNVFK3SlA6mE0le8qnKjUjcuY4OzL+wSHw=", "owner": "nix-community", "repo": "home-manager", - "rev": "27ef11f0218d9018ebb2948d40133df2b1de622d", + "rev": "3876cc613ac3983078964ffb5a0c01d00028139e", "type": "github" }, "original": { @@ -151,11 +151,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1684570954, - "narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=", + "lastModified": 1685383865, + "narHash": "sha256-3uQytfnotO6QJv3r04ajSXbEFMII0dUtw0uqYlZ4dbk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3005f20ce0aaa58169cdee57c8aa12e5f1b6e1b3", + "rev": "5e871d8aa6f57cc8e0dc087d1c5013f6e212b4ce", "type": "github" }, "original": { @@ -173,11 +173,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1684603398, - "narHash": "sha256-ViwldcC0X2QR6pw1SI1BRl9U7+XL+8qyTelysh1MePE=", + "lastModified": 1685600155, + "narHash": "sha256-od1ax3UUft+NJzXzP1tODRb0ZmFV0X4AyBgsuXMOCgk=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "f81a2062c106fa85b0b4ecd1fa60b196f041c284", + "rev": "5cca303fa112c76a800aa3c5c6b4311996a9bd37", "type": "github" }, "original": { @@ -220,11 +220,11 @@ ] }, "locked": { - "lastModified": 1684655198, - "narHash": "sha256-Rg2+w1ZQnA3XjLXxAV5O9C8d3po8deNnqwHPI1cW340=", + "lastModified": 1685606169, + "narHash": "sha256-J0nL9OsXPq8scNC5TCMxP2tiQ4n9zYCYMEMOxKd2vDk=", "owner": "viperML", "repo": "nix-common", - "rev": "f29f6f737ff4be5eeb6b56e494dcdfc1aa132acf", + "rev": "dbb67bae3ac5578e41e8cc2f5ed2c511f30c5400", "type": "github" }, "original": { diff --git a/hosts/laptop/cfg.nix b/hosts/laptop/cfg.nix index b835355..10d1696 100644 --- a/hosts/laptop/cfg.nix +++ b/hosts/laptop/cfg.nix @@ -36,10 +36,10 @@ boot = { initrd = { supportedFilesystems = ["btrfs"]; - availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod"]; + availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "usbhid" "snd_usb_audio"]; }; supportedFilesystems = ["ntfs"]; - kernelModules = ["kvm-intel"]; + kernelModules = ["kvm-intel" "snd-seq" "snd-rawmidi" "bridge"]; kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; # extraModulePackages = [ config.boot.kernelPackages.rtl8821ce ]; loader = { @@ -61,7 +61,7 @@ device = "none"; fsType = "tmpfs"; # hyprland doesnt compile with noexec root - options = ["defaults" "size=2G" "mode=755"]; + options = ["defaults" "size=8G" "mode=755"]; }; fileSystems."/boot" = { @@ -101,6 +101,12 @@ user = "tzlil"; group = "users"; } + { + directory = "/home/tzlil/.local/share/Steam"; + user = "tzlil"; + group = "users"; + } + "/var/lib/docker" ]; home-manager.users.tzlil = { @@ -111,6 +117,8 @@ }; }; + programs.steam.enable = true; + programs.firejail.wrappedBinaries = { mullvad-browser = { executable = lib.getExe pkgs.mullvad-browser; @@ -159,10 +167,14 @@ # dont know if i like this nix.settings.trusted-public-keys = [ - "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" -]; -nix.settings.substituters = [ - "https://cache.iog.io" -]; + "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" + ]; + nix.settings.substituters = [ + "https://cache.iog.io" + ]; + + virtualisation.docker.enable = true; + virtualisation.docker.storageDriver = "btrfs"; + users.users.tzlil.extraGroups = [ "docker" ]; }; } diff --git a/hosts/vps/website.nix b/hosts/vps/website.nix index 6e17d49..edfaf57 100644 --- a/hosts/vps/website.nix +++ b/hosts/vps/website.nix @@ -76,6 +76,9 @@ i currently work as a security researcher but in a few months i will be drafted to the army + i like music + https://last.fm/user/tzlils + my interests: plan9 lambda calculus @@ -87,24 +90,30 @@ my wares: hard: - aurora lily58 with kailh low profile + aurora lily58 with sunset kailh low profile laptop(s): - lenovo v14 phone: - google pixel 7 - desktop: - - amd ryzen 5 5600g + OUT OF COMMISSION + <s>desktop:</s> + <s>- amd ryzen 5 5600g</s> soft: <a href="/cgit/flake.git">nixos</a> keepassxc syncthing tailscale (to mesh between my devices) - calyxos + grapheneos <a href="/cgit/flake.git/tree/hosts/vps/hydrus.nix">hydrus</a> + ctfs i played in: + google ctf 2023 - 96th place (solo) + tfcctf 2022 - 4th place + google ctf 2022 - 100th place + contact info: tzlil:tzlil.net tzlils@protonmail.com diff --git a/mixins/cli.nix b/mixins/cli.nix index 8853576..3b331cf 100644 --- a/mixins/cli.nix +++ b/mixins/cli.nix @@ -30,6 +30,20 @@ numpy more-itertools ])) + + ( + pkgs.writeShellScriptBin "hs" '' + exec ${pkgs.ghc.withPackages (p: with p; [relude pretty-simple])}/bin/ghci -ghci-script ${pkgs.writeText "ghci.conf" '' + :set -XNoImplicitPrelude + :set -XFlexibleContexts + :set -XFlexibleInstances + :set -XOverloadedStrings + :set prompt "\ESC[38;5;208m\STXλ>\ESC[m\STX " + :set -ferror-spans -freverse-errors -fprint-expanded-synonyms + :set -interactive-print Text.Pretty.Simple.pPrint + import Relude''} + '' + ) ]; sessionVariables = { EDITOR = "nvim"; diff --git a/mixins/multimedia.nix b/mixins/multimedia.nix index 9d5c4b2..8186b87 100644 --- a/mixins/multimedia.nix +++ b/mixins/multimedia.nix @@ -40,6 +40,9 @@ }; zathura = { enable = true; + options = { + selection-clipboard = "clipboard"; + }; }; }; }; diff --git a/mixins/syncthing.nix b/mixins/syncthing.nix index 7faf5db..3e219ae 100644 --- a/mixins/syncthing.nix +++ b/mixins/syncthing.nix @@ -11,15 +11,13 @@ configDir = "/home/tzlil/.config/syncthing"; overrideDevices = true; overrideFolders = true; - settings = { - devices = { - "phone" = {id = "UHWVTEZ-BERNFCH-3ZXQHNE-ZRBHLU6-MBAVEHB-TKLQJM7-ZGHLJ4R-6E4SAA7";}; - }; - folders = { - "passwords" = { - path = "/home/tzlil/sync/passwords"; - devices = ["phone"]; - }; + devices = { + "phone" = {id = "UHWVTEZ-BERNFCH-3ZXQHNE-ZRBHLU6-MBAVEHB-TKLQJM7-ZGHLJ4R-6E4SAA7";}; + }; + folders = { + "passwords" = { + path = "/home/tzlil/sync/passwords"; + devices = ["phone"]; }; }; }; diff --git a/profiles/ssh.nix b/profiles/ssh.nix index a3628ec..294f015 100644 --- a/profiles/ssh.nix +++ b/profiles/ssh.nix @@ -22,9 +22,9 @@ AllowUsers tzlil git ''; settings = { - permitRootLogin = "no"; - passwordAuthentication = false; - kbdInteractiveAuthentication = false; + PermitRootLogin = "no"; + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; }; }; environment.persistence."/nix/persist" = { diff --git a/profiles/user.nix b/profiles/user.nix index 73c4fcb..7355e85 100644 --- a/profiles/user.nix +++ b/profiles/user.nix @@ -57,7 +57,7 @@ in { Unit = { Description = "SSH Agent"; - WantedBy = ["default.target"]; + After = ["default.target"]; }; Service = { ExecStartPre = "${pkgs.coreutils}/bin/rm -f %t/ssh-agent"; |