diff --git a/etcnixos/common.nix b/etcnixos/common.nix index e5ea323..9b8a60f 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -113,7 +113,7 @@ fprintd.enable = false; # Making sure mullvad works on boot - mullvad-vpn.enable = true; + # mullvad-vpn.enable = true; }; # Set your time zone. @@ -211,7 +211,7 @@ # System packages environment.systemPackages = with pkgs; [ - mullvad-vpn + # mullvad-vpn #secureboot ctl sbctl @@ -257,4 +257,12 @@ documentation.enable = true; documentation.man.enable = true; documentation.dev.enable = true; + + swapDevices = [ + { + device = "/var/lib/swapfile"; + size = 64 * 1024; + randomEncryption.enable = true; + } + ]; } diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index e713831..fdc285e 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1740596849, - "narHash": "sha256-8elI7d5XCz9Lv+qovIW6J1/9aGjgNJPjLeJ5OFmtgzY=", + "lastModified": 1741962175, + "narHash": "sha256-ZydxDII0DOv1Ut/QXFL9WtKLs9D+rS/khV8Nu0X+D3I=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "b950948f45d8da3da0bb8dcf95dbeb421fd5fc2b", + "rev": "30d7b193ce1e6d39390d7f6ffb700d33aedeffe6", "type": "github" }, "original": { @@ -50,11 +50,11 @@ }, "crane": { "locked": { - "lastModified": 1731098351, - "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", + "lastModified": 1741148495, + "narHash": "sha256-EV8KUaIZ2/CdBXlutXrHoZYbWPeB65p5kKZk71gvDRI=", "owner": "ipetkov", "repo": "crane", - "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", + "rev": "75390a36cd0c2cdd5f1aafd8a9f827d7107f2e53", "type": "github" }, "original": { @@ -115,11 +115,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1740551776, - "narHash": "sha256-CkcCb2hGSL1owuZpjuNB6UQzlyaXgvuRXmjY6jLqjPc=", + "lastModified": 1741847799, + "narHash": "sha256-muvsng8/+e9AC+xg5HuHgHwuQ/etKlTevNgr8fw5r9s=", "owner": "nix-community", "repo": "fenix", - "rev": "07a730bc80e8a4106df5b2341aa5602a240ee112", + "rev": "05f331e61277f70f55769060f783457fdacf8da1", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1740872218, + "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "3876f6b87db82f33775b1ef5ea343986105db764", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1740494361, - "narHash": "sha256-Dd/GhJ9qKmUwuhgt/PAROG8J6YdU2ZjtJI9SQX5sVQI=", + "lastModified": 1741879521, + "narHash": "sha256-GylyCwdUe2Kd69bC8txEX+A3H/DXBZl2a+GcmTcJw/g=", "owner": "nix-community", "repo": "home-manager", - "rev": "74f0a8546e3f2458c870cf90fc4b38ac1f498b17", + "rev": "1b0efe3d335f452595512c7b275e5dddfbfb28a5", "type": "github" }, "original": { @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1740553144, - "narHash": "sha256-ujQ/f3mcYECH1o0vzakMLAQRCMeF/SXd8w4uBFHxYO8=", + "lastModified": 1741874414, + "narHash": "sha256-gtIrDkG/iap32MYyaSAlWaixshiqMyFB9eKyhcF66eM=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "14a125ea5c440c57310dc1bb3acf7641078d783a", + "rev": "662d117ac0ffc81f3e91b5f0fb800c3effd904a1", "type": "github" }, "original": { @@ -277,11 +277,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1740440383, - "narHash": "sha256-w8ixbqOGrVWMQZFFs4uAwZpuwuGMzFoKjocMFxTR5Ts=", + "lastModified": 1741442524, + "narHash": "sha256-tVcxLDLLho8dWcO81Xj/3/ANLdVs0bGyCPyKjp70JWk=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "6321bc060d757c137c1fbae2057c7e941483878f", + "rev": "d8099586d9a84308ffedac07880e7f07a0180ff4", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1740646007, - "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", + "lastModified": 1741792691, + "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", + "rev": "e1f12151258b12c567f456d8248e4694e9390613", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "lastModified": 1741851582, + "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", "type": "github" }, "original": { @@ -345,22 +345,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -371,15 +355,14 @@ "nixpkgs": [ "lanzaboote", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1740915799, + "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", "type": "github" }, "original": { @@ -401,11 +384,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1740470570, - "narHash": "sha256-iYjLS4jy/IJScOHZfbQ31vkrS5tl0bjXtzYP4XKA2Pc=", + "lastModified": 1741807049, + "narHash": "sha256-/tH4gSW/0ePa2+0DAzk5xuHAa5qeaB4T8RnmiG3Ex4w=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "89255449982473939a4f8ee954512d339225c182", + "rev": "3fc655b239058deb93f503f9d25cc69a32ca7675", "type": "github" }, "original": { @@ -423,11 +406,11 @@ ] }, "locked": { - "lastModified": 1731897198, - "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", + "lastModified": 1741228283, + "narHash": "sha256-VzqI+k/eoijLQ5am6rDFDAtFAbw8nltXfLBC6SIEJAE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", + "rev": "38e9826bc4296c9daf18bc1e6aa299f3e932a403", "type": "github" }, "original": { diff --git a/etcnixos/secrets/wifi-passwords.nix b/etcnixos/secrets/wifi-passwords.nix index 88a9fc3..b7ecd97 100644 Binary files a/etcnixos/secrets/wifi-passwords.nix and b/etcnixos/secrets/wifi-passwords.nix differ diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 394910d..5d00398 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -78,13 +78,6 @@ in */ systemd-boot.enable = lib.mkForce false; }; - - kernelParams = [ - "mitigations=off" - "rcu_nocbs=all" - "rcutree.enable_rcu_lazy=1" - "rtc_cmos.use_acpi_alarm=1" - ]; }; programs.gamescope = { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index b3f8518..56985cb 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1740624780, - "narHash": "sha256-8TP61AI3QBQsjzVUQFIV8NoB5nbYfJB3iHczhBikDkU=", + "lastModified": 1741914680, + "narHash": "sha256-Vu4DIZvgfWMzhUyxbHUrJaQb5232S5vuwxQ2sBcBVHk=", "owner": "nix-community", "repo": "home-manager", - "rev": "b8869e4ead721bbd4f0d6b927e8395705d4f16e6", + "rev": "30cce6848a5aa41ceb5fb33185b84868cc3e9bef", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1740655457, - "narHash": "sha256-brpdF7wEdGDZWuV8T5axwzHr5gnGfB7Dua2QVAjSSL4=", + "lastModified": 1741915514, + "narHash": "sha256-zpXOsXAk1x823REV4KRDetvWQp9ymRt79Avh9GVAQDo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "2a098dfa179b6d89c962908df0e4840308db04df", + "rev": "0c97d9ef5031198ed85bd0ce8ec75eaec7527927", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1740641916, - "narHash": "sha256-aYAYvdKnmmlkN7t4VbPfPbAtWHHADKHL8bPlNYZ2bZY=", + "lastModified": 1741891147, + "narHash": "sha256-hCD/llnO/I0ARk6divzVG3a82nNgrcG58dIe0yhzNo8=", "owner": "YaLTeR", "repo": "niri", - "rev": "70dcd229cfaa54946163ccf0a1ea0ce595a35cc4", + "rev": "ee0e2c7f1b4edae42d2f1b05466adbdffe156e61", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "lastModified": 1741851582, + "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1740463929, - "narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=", + "lastModified": 1741862977, + "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b", + "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1740623427, - "narHash": "sha256-3SdPQrZoa4odlScFDUHd4CUPQ/R1gtH4Mq9u8CBiK8M=", + "lastModified": 1741919466, + "narHash": "sha256-xto0Oq+WItjDZvafo6ZVI4TZa6/2oxJHb0tkcSGVUJI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d342e8b5fd88421ff982f383c853f0fc78a847ab", + "rev": "8b137260b776525542d47d3a4dbac753df478a42", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1739246919, - "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", + "lastModified": 1741910413, + "narHash": "sha256-z9bvteu0rf+xmUDj4VifN06XAFJZQGRSOvdN7rn/oDs=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", + "rev": "0325cb1f48a292d873a6844772cca00251cbf945", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1740554227, - "narHash": "sha256-xpwZeMw2gGenixGQDyVv+ja+epcR+EJ1BPuGFdgFS18=", + "lastModified": 1741554872, + "narHash": "sha256-A/Iim9o0hHJjDJVynwtLzkox7NquvPc8CsJ/8OB4dDw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "7de16ae319e6f6852274fa90b0d41c00049767c9", + "rev": "a4408170c5a2168bb79abcf587c5072e2ee5fb90", "type": "github" }, "original": { diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 2840f29..863b6c3 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -119,6 +119,8 @@ hyprpicker blender + + ghidra-bin ] ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); @@ -154,6 +156,9 @@ home.sessionVariables = { TERMINAL = "alacritty"; BROWSER = "zen"; + LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath [ + pkgs.stdenv.cc.cc + ]}"; }; # allow extra fonts to be detected by fontconfig diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 65909b6..900955a 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -33,7 +33,11 @@ targets = [ "thumbv7m-none-eabi" ]; })) cargo-expand + cargo-pgo rust-script + bolt_19 + libllvm # llvm-profdata + cargo-show-asm # find typos in code typos @@ -43,6 +47,7 @@ # for website generation hugo + go # java development google-java-format # formatter @@ -162,6 +167,11 @@ borgbackup tinyxxd + + bfc + + # java assembler + jasmin ]; # https://github.com/flamegraph-rs/flamegraph diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 1ae2d0a..674dadd 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -16,17 +16,6 @@ let sha256 = "031b190e7aa81770b5d069de181dcfe4b284bf5d75fa12f82f5e54a3178adcfd"; }; } - - rec { - name = "DeepScaleR-1.5B-Preview-Q8_0.gguf"; - filename = src.name; - context_length = 131072; - gen_length = 32768; - src = pkgs.fetchurl { - url = "https://huggingface.co/bartowski/agentica-org_DeepScaleR-1.5B-Preview-GGUF/resolve/main/agentica-org_DeepScaleR-1.5B-Preview-Q8_0.gguf"; - sha256 = "932ecb3ae043335c78dab621f032d32eb1868c80a27b4fe5f39c7850902de940"; - }; - } ]; gpt4all_package = ( diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 5178238..160e13b 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -91,6 +91,11 @@ { clip-to-geometry = true; } ]; + # XF86AudioMedia allow-when-locked=true { spawn "playerctl" "play-pause"; } + # XF86AudioPlay allow-when-locked=true { spawn "playerctl" "play-pause"; } + # XF86AudioPrev allow-when-locked=true { spawn "playerctl" "previous"; } + # XF86AudioNext allow-when-locked=true { spawn "playerctl" "next"; } + # https://github.com/sodiboo/niri-flake/issues/591 switch-events = with config.lib.niri.actions; { "lid-close".action = spawn "${pkgs.swaylock}/bin/swaylock"; @@ -110,7 +115,9 @@ # screenshotting "Print".action = screenshot; - "Ctrl+Print".action = screenshot-screen; + + # https://github.com/sodiboo/niri-flake/commit/a7949bd0f5551fdfffd04cb9735ad3cd3167d624#r153571513 + # "Ctrl+Print".action = screenshot-screen; "Alt+Print".action = screenshot-window; # Volume control