From 32bea7a44c8906c0a5b68e799dacfc2ede836fb3 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 14 Mar 2025 14:04:28 -0400 Subject: [PATCH] update --- etcnixos/common.nix | 12 ++- etcnixos/flake.lock | 97 ++++++++++--------------- etcnixos/secrets/wifi-passwords.nix | Bin 646 -> 700 bytes etcnixos/system-mreow.nix | 7 -- home-manager/flake.lock | 48 ++++++------ home-manager/gui.nix | 5 ++ home-manager/no-gui.nix | 10 +++ home-manager/progs/gpt4all/gpt4all.nix | 11 --- home-manager/progs/niri.nix | 9 ++- 9 files changed, 97 insertions(+), 102 deletions(-) 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 88a9fc3afeaabb98b43477159a579d10f40294ed..b7ecd973bec15f825cb066b887eff5a6844acfd3 100644 GIT binary patch literal 700 zcmZQ@_Y83kiVO&0sJbgZzt(>Cj2+f#t&DGKUwSW-nfr0_(<~#S_j676TyXkzvrUtn&lN7@nCv<$U3#&eMnC)Ct&a# zb6(VceN%S#(^}8D*)m$&+#h}I%(6az<+bS1C#%jc+S>O|z*%5*v)vn3o3ss@|CgL) zyYcda{yA2W8J}M+Z@b)MpMB$Q)sE!%l8@&P~sj(lb+yZ7yk zK#psZMWX9H=lEOFE5aMaHC{D+&b5>I#1eCRE4Ms*puEN0Q1j@rjP~-K z3fre$`MdOU@^_Cag}1kRuD(}u>gRs6cym(F&l2LfrT1pR-K#xLU;4#AYwL&YFEZpz!o^uC`X=#fyxdfEd2O_2!Q^LkH`X$& zFjiFCm^(MX*Up~j73bxh%Oh?+y|JY#()Rx0m1kf4E6CV;S3zuJxa!U)%dZ?$>rNNF zwnQ)M`vcx7505ZS|9A9^+o@SR+?Uo1Xz>4hnG)vy)K|xLyAgBn$Ir^F+g|)V>a(W% zy@jWC(b>qe`)Apod0XF?bV%B5weGw}*B6PjMqZBCS={@=^yBSmFL#v&Ev~+$nkjJg zMBz@BA|EyVjQ`yxd!249pXYXAO-yR)d)8h-dhZr_HAd6Se@9QPVPM+wboLK{h&@JyHHy+h-rmJzk~h#d&p0@0EL(o);6Sk$qBb$NZL zp8mf>0X3gn-ZS}q>_}5hxum4j-r;|AacX`_?VTs$rNvRn+tZG3?ezJxpHosyYB9qR z6Vn9l`*AO{L``abNB&Ubdv@mdwPnno>te11ny&8Mu)u5KZvT6)Yy%P)d1Xw@j|eKt z)UKE@S$cE(t#5a=Sbr9t?BB(|{I=+l60HkGTRR-g=3Wr}-nHauUFk#FdlBUe51diX zNl?qIY-n%7& zer(=!sAx;J=5ve1ebx~V9C)jbs=Z!%w|@T9Bl#*%E=wNitdiLzxp&JM(W7&pyQS9J zx9`}={4G1x`)#IP+r!OU9~d2DN}c#4jkoPyhs&~u9#Ymue