From 7d90f5f21084014b5d537151230253c0a92c9c84 Mon Sep 17 00:00:00 2001 From: materus Date: Mon, 17 Jun 2024 13:09:58 +0200 Subject: [PATCH] flake: updates to 24.05 --- configurations/host/default.nix | 4 +- .../host/flamaster/configuration.nix | 2 +- .../host/flamaster/home/materus/default.nix | 2 +- .../host/materusPC/home/materus/default.nix | 2 +- configurations/host/materusPC/tmp.nix | 4 +- .../host/materusPC/vm/win10/default.nix | 6 +- configurations/host/valkyrie/default.nix | 2 +- .../host/valkyrie/secrets/private/default.nix | Bin 8376 -> 8422 bytes .../host/waffentrager/configuration.nix | 2 +- .../waffentrager/secrets/private/default.nix | Bin 732 -> 773 bytes configurations/profile/common/nixpkgs.nix | 2 +- .../profile/common/packages/default.nix | 2 +- configurations/profile/home/shell/zsh.nix | 4 +- flake.lock | 214 +++++++++--------- flake.nix | 4 +- 15 files changed, 126 insertions(+), 124 deletions(-) diff --git a/configurations/host/default.nix b/configurations/host/default.nix index cc777ec..55856bc 100644 --- a/configurations/host/default.nix +++ b/configurations/host/default.nix @@ -52,10 +52,10 @@ let }) // { inherit materusCfg; }; in { - materusPC = makeSystem { host = "materusPC"; stable = false; }; + materusPC = makeSystem { host = "materusPC"; stable = true; }; flamaster = makeSystem { host = "flamaster"; stable = true; }; valkyrie = makeSystem { host = "valkyrie"; stable = true; }; waffentrager = makeSystem { host = "waffentrager"; stable = true; arch = "aarch64-linux"; }; - Old-materusPC = makeSystem { host = "Old-materusPC"; stable = false; }; + Old-materusPC = makeSystem { host = "Old-materusPC"; stable = true; }; } diff --git a/configurations/host/flamaster/configuration.nix b/configurations/host/flamaster/configuration.nix index e1ff3ed..960d955 100644 --- a/configurations/host/flamaster/configuration.nix +++ b/configurations/host/flamaster/configuration.nix @@ -108,7 +108,7 @@ }; # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; + services.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. users.users.materus = { diff --git a/configurations/host/flamaster/home/materus/default.nix b/configurations/host/flamaster/home/materus/default.nix index 5e37175..1065c13 100644 --- a/configurations/host/flamaster/home/materus/default.nix +++ b/configurations/host/flamaster/home/materus/default.nix @@ -27,7 +27,7 @@ gcc gdb nil - nixfmt + nixfmt-classic nixpkgs-fmt cmake gnumake diff --git a/configurations/host/materusPC/home/materus/default.nix b/configurations/host/materusPC/home/materus/default.nix index 3f6de1a..c93d1a8 100644 --- a/configurations/host/materusPC/home/materus/default.nix +++ b/configurations/host/materusPC/home/materus/default.nix @@ -31,7 +31,7 @@ gcc gdb nil - nixfmt + nixfmt-classic nixpkgs-fmt cmake gnumake diff --git a/configurations/host/materusPC/tmp.nix b/configurations/host/materusPC/tmp.nix index b64f150..93fe8fc 100644 --- a/configurations/host/materusPC/tmp.nix +++ b/configurations/host/materusPC/tmp.nix @@ -56,9 +56,9 @@ services.printing.enable = true; + config.nix.package = pkgs.nixVersions.latest; - - services.xserver.libinput.enable = true; + services.libinput.enable = true; virtualisation.waydroid.enable = false; virtualisation.podman = { diff --git a/configurations/host/materusPC/vm/win10/default.nix b/configurations/host/materusPC/vm/win10/default.nix index a92bcbc..b741187 100644 --- a/configurations/host/materusPC/vm/win10/default.nix +++ b/configurations/host/materusPC/vm/win10/default.nix @@ -44,8 +44,10 @@ let systemctl stop windows-share-mount.service # Make sure nothing renders on gpu to prevent "sysfs: cannot create duplicate filename" after rebinding to amdgpu - chmod 0 /dev/dri/renderD128 - fuser -k /dev/dri/renderD128 + chmod 0 /dev/dri/by-path/pci-$VIRSH_GPU_VIDEO-render + chmod 0 /dev/dri/by-path/pci-$VIRSH_GPU_VIDEO-card + fuser -k /dev/dri/by-path/pci-$VIRSH_GPU_VIDEO-render + pkill Xwayland # Seems to fix reset bug for 7900 XTX echo "0" > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/d3cold_allowed" diff --git a/configurations/host/valkyrie/default.nix b/configurations/host/valkyrie/default.nix index fb20448..46456ad 100644 --- a/configurations/host/valkyrie/default.nix +++ b/configurations/host/valkyrie/default.nix @@ -64,7 +64,7 @@ # hardware.pulseaudio.enable = true; # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; + services.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. users.users.materus = { diff --git a/configurations/host/valkyrie/secrets/private/default.nix b/configurations/host/valkyrie/secrets/private/default.nix index ca0f504aaed66f13c7fc3aef09771e17bb1a35cb..5b2e9e27d1c75945df43672d85622cb5f455c9cd 100644 GIT binary patch literal 8422 zcmVedly6Cv~q9h^oj)8T{S1uXDm~@eWY3~blxFTWMqO5%^kjHH#TV6 z<$LqKw@M>-y6cis$^l@;{9F?a%4B8c_6E2iU#isI#B1Vjcg-PVlzBO|Efwxqt`tUl z2xEng*n2WaK}%U%K4yoVnnh1ItYT|W)DhjVa*SRq!p}rA6%l@)X+!4aU0WMzn^f>I zGE|8y2AA`60V}A>Yl-yHhCpT@zU?{XpQLq0COV@O=|oEZU#m_Wh{AD65X!RDIZy-W z)&RI(AQZ5-?|)Ke`hvmLWHC^S0-dL zec5KrxP$9}64F!tEPT$Dbo3Rk5}20K;=cLi_5=nWbkX2z>A~+T&%<x&FdheqZT;}AHLvRg` zTuHEww=Q1EG;VDu2bpWQ(iQrG1vg(&rsFN?#$C{|GDbJB%J3_g+R96Amrw3>FH_S4 zv$Y6sUsne5Ka%c0u1g9YWfqw(OxU1g21-nMZZFZ*P&Ox;oUju=f&kXLh=yZt3AXni zZz1|9p0hgs+PAUlE4?d~hi^$ozl~>Ty>U!ZwY(Os(6c3m`14Kx+|fRkrzIX{$)uRtTFWN4=&9;9&y(9j_5D%x7@&=&7yCwUTP5d z{D}K=`#evj_33j3g?WleDU?U&9Fug=3k_!-vvu!13OZe%@#|uLs3GY_5YgV_w_FGm zfo+qbexy~KvQOvMoBxg=|G_bFzUiWoLl51EQC&N<{Z;CoMC6nc4EVls2V$~~rGFgf z?@@&KY>aQw*qRy)WU`?4lWvs)QzpQveo*dPT8evJ-nB>C-FY!oT_~#F+fayMwLU?& z8?-nX$9|28i4%%hxE$Se<0+Q!8CM+7rW1i8EF~wP6eb?tgv4+DPevWWG|I)jl}Brw zxlP^&=N2Rix}meD!U0K0hq2VJH5-6Vk`LeA8r+eE@kPJgIa*CO$vw9dt6iC?n4xOXfct~)x88vUVz7n4T^ zChg&dI+I+)N#G<1Kt~KS8J&@thgCc-0LgqgEY|@DDMuFxX14FWnRX+*gxECX~-r7 zOh#*xhvd7jgrt&x3xeiW*M>GC>Bmlk%$W(lZ}7VjFrEDx6VP^ZQ@>KRJ;56x4!~N* z(DZr$Rhj6eikD_)k;q>UJM%Zpx>}tSaR5pxF1o%^Co&bNXRfh&=(nXVvW%&upgj7K zsgfIz-Fe!D^NVl#gE^t$e2#QxvHTqHBGS?BqQ@~11G)BUy9aC#Co%c!NQ8wMStHB=GIyk@ctgG9CR%oUqVXr*2*6g2@QN0qzKKop2tP z5-!_r2G4mzdP)LTFpbj9bH&A2l?aK)ct5Ezt)GBDjgm!g6beQFL>u{_S<$Xg4v8Q7 z>E1%V(AL&SGpa+ch?Y45G!|zD%X-a&1GdV~vh;J&CbnncS3x3=Ic2<_8lRxGDPOFs zsy$>n{!3Dtg{WiqN|y$Z3FZ<_$5WNj@2yQW;Z{iBv!Tx7vJ4?w=OSe&0=5xT{VG5J z=EFybG-iD0XHYl#Y)`dp$U+_n#hN6D{p7Z=(4#fy$m3MaKuPh+g?!iDq&`%14f8b0 zf2}ai&nQUSMXTfquIrzWnH8+$@SMsN6z3xcuNhF9`L_M*c|qe=90Ti

mA$XgKBp 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 DY~F$C literal 732 zcmV<20wetZM@dveQdv+`0KWR^&<}?}bue2RSQ|jFPR$*NXxD@)fMm6^2rM=$!Uh>T z8~YAf)dV;hl5xV|*{)SX#VF7bGP_4Tm?=_O3Ld{Q;`vdA%9X7^y>L&K)6dz_=d`?g z?!*ZGh>+b;-I$^<9q<#_v7$EDQy!l2)RTa6-p_1UH@34T@Fuh?--*Q_?=2O$L5^rh ze{wCqoBm)nr)9&f>x#=LoW0;SfjClP0E>xq_aZ+dn;kXpe`Zu6*!qm%hY86s&k~6u zHl%9X!PcpZsBQ>_b!4(%>NN3Q=*)|SH*4_Rra)EF6!>S90`B*Zx_s0jh+Am% z#fTh%rrgO$0Yy`EVp#f2llkgn-uHy-=I+G+%uK8S52YdH2?F>a4!R}O#oL`-v-1Bl z){~iM#$$H~7$HqSwUFH>+QRRgMt|JsHsX~Z3US(gpDsyo)mL8?T+|PmQ38}=Y^@Q(s>cv3OVj diff --git a/configurations/profile/common/nixpkgs.nix b/configurations/profile/common/nixpkgs.nix index 8698357..7f52c25 100644 --- a/configurations/profile/common/nixpkgs.nix +++ b/configurations/profile/common/nixpkgs.nix @@ -20,7 +20,7 @@ in }; config.nixpkgs.overlays = lib.mkIf cfg.enableOverlays [ materusArg.cfg.configInputs.emacs-overlay.overlay ]; - config.nix.package = lib.mkDefault (if (!materusCfg.stable) then pkgs.nixVersions.${"latest"} else pkgs.nixVersions.stable); + config.nix.package = lib.mkDefault pkgs.nixVersions.latest; config.nix.registry = lib.mkIf config.materus.profile.nix.enableRegistry { nixpkgs-stable = { from = { type = "indirect"; id = "nixpkgs-stable"; }; diff --git a/configurations/profile/common/packages/default.nix b/configurations/profile/common/packages/default.nix index 91a09c6..c03967c 100644 --- a/configurations/profile/common/packages/default.nix +++ b/configurations/profile/common/packages/default.nix @@ -19,7 +19,7 @@ with materusArg.pkgs.lib; nix-prefetch-scripts nix-prefetch-github nix-prefetch-docker - nixfmt + nixfmt-classic nix-top nix-tree nix-diff diff --git a/configurations/profile/home/shell/zsh.nix b/configurations/profile/home/shell/zsh.nix index a519948..5c9b389 100644 --- a/configurations/profile/home/shell/zsh.nix +++ b/configurations/profile/home/shell/zsh.nix @@ -71,8 +71,8 @@ in programs.zsh = { enable = true; - enableAutosuggestions = true; - enableSyntaxHighlighting = true; + autosuggestion.enable = true; + syntaxHighlighting.enable = true; enableVteIntegration = true; historySubstringSearch.enable = true; historySubstringSearch.searchUpKey = "$key[Up]"; diff --git a/flake.lock b/flake.lock index 073b542..c624bb7 100644 --- a/flake.lock +++ b/flake.lock @@ -167,11 +167,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1718390211, - "narHash": "sha256-UvqJfD3SHtj3xG9Dc2DVaTlZofkyBJ2wk5WL35iWTgY=", + "lastModified": 1718615420, + "narHash": "sha256-hW9fRiFp/sMlX9PXj5az9tozcq5CYAYhWDWXrrnrmM4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9be87fae5515892871716818dbdc303d76bb8540", + "rev": "292ec2022a1d758d0a91232e524eab5e4a36a219", "type": "github" }, "original": { @@ -194,11 +194,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1718390211, - "narHash": "sha256-UvqJfD3SHtj3xG9Dc2DVaTlZofkyBJ2wk5WL35iWTgY=", + "lastModified": 1718615420, + "narHash": "sha256-hW9fRiFp/sMlX9PXj5az9tozcq5CYAYhWDWXrrnrmM4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9be87fae5515892871716818dbdc303d76bb8540", + "rev": "292ec2022a1d758d0a91232e524eab5e4a36a219", "type": "github" }, "original": { @@ -337,16 +337,16 @@ ] }, "locked": { - "lastModified": 1717476296, - "narHash": "sha256-ScHe38Tr+TxGURC17kby4mIIxOG3aJvZWXzPM79UnEk=", + "lastModified": 1718530513, + "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "owner": "nix-community", "repo": "home-manager", - "rev": "095ef64aa3b2ab4a4f1bf07f29997e21e3a5576a", + "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -359,11 +359,11 @@ ] }, "locked": { - "lastModified": 1718243258, - "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", + "lastModified": 1718526747, + "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", "owner": "nix-community", "repo": "home-manager", - "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", + "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792", "type": "github" }, "original": { @@ -378,10 +378,10 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1714515075, - "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=", - "path": "/nix/store/iybmik4n9y7n3n32asrsad8b02x9awmd-source", - "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef", + "lastModified": 1716736833, + "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", + "path": "/nix/store/69xnjv9zg8a0gsyhsn8lp8937wy0a392-source", + "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", "type": "path" }, "original": { @@ -445,11 +445,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1718349360, - "narHash": "sha256-SuPne4BMqh9/IkKIAG47Cu5qfmntAaqlHdX1yuFoDO0=", + "lastModified": 1718548414, + "narHash": "sha256-1obyIuQPR/Kq1j5/i/5EuAfQrDwjYnjCDG8iLtXmBhQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ae5c8dcc4d0182d07d75df2dc97112de822cb9d6", + "rev": "cde8f7e11f036160b0fd6a9e07dc4c8e4061cf06", "type": "github" }, "original": { @@ -461,11 +461,11 @@ }, "nixos-hardware_2": { "locked": { - "lastModified": 1718349360, - "narHash": "sha256-SuPne4BMqh9/IkKIAG47Cu5qfmntAaqlHdX1yuFoDO0=", + "lastModified": 1718548414, + "narHash": "sha256-1obyIuQPR/Kq1j5/i/5EuAfQrDwjYnjCDG8iLtXmBhQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ae5c8dcc4d0182d07d75df2dc97112de822cb9d6", + "rev": "cde8f7e11f036160b0fd6a9e07dc4c8e4061cf06", "type": "github" }, "original": { @@ -477,85 +477,21 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714076141, - "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", + "lastModified": 1716542732, + "narHash": "sha256-0Y9fRr0CUqWT4KgBITmaGwlnNIGMYuydu2L8iLTfHU4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", + "rev": "d12251ef6e8e6a46e05689eeccd595bdbd3c9e60", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable": { - "locked": { - "lastModified": 1718060059, - "narHash": "sha256-9XKFni8VMXo81RTq9XygCyaO3I/7UKpwIlM/yn0MdcM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a3c8d64ba846725f040582b2d3b875466d2115bd", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1717880976, - "narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { - "locked": { - "lastModified": 1718060059, - "narHash": "sha256-9XKFni8VMXo81RTq9XygCyaO3I/7UKpwIlM/yn0MdcM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a3c8d64ba846725f040582b2d3b875466d2115bd", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_4": { - "locked": { - "lastModified": 1717880976, - "narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_5": { "locked": { "lastModified": 1718229064, "narHash": "sha256-ZFav8A9zPNfjZg/wrxh1uZeMJHELRfRgFP+meq01XYk=", @@ -571,6 +507,70 @@ "type": "github" } }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1718478900, + "narHash": "sha256-v43N1gZLcGkhg3PdcrKUNIZ1L0FBzB2JqhIYEyKAHEs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c884223af91820615a6146af1ae1fea25c107005", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { + "locked": { + "lastModified": 1718229064, + "narHash": "sha256-ZFav8A9zPNfjZg/wrxh1uZeMJHELRfRgFP+meq01XYk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5c2ec3a5c2ee9909904f860dadc19bc12cd9cc44", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_4": { + "locked": { + "lastModified": 1718478900, + "narHash": "sha256-v43N1gZLcGkhg3PdcrKUNIZ1L0FBzB2JqhIYEyKAHEs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c884223af91820615a6146af1ae1fea25c107005", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_5": { + "locked": { + "lastModified": 1718437845, + "narHash": "sha256-ZT7Oc1g4I4pHVGGjQFnewFVDRLH5cIZhEzODLz9YXeY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "752c634c09ceb50c45e751f8791cb45cb3d46c9e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1718318537, @@ -602,11 +602,11 @@ }, "nur_2": { "locked": { - "lastModified": 1718391791, - "narHash": "sha256-l7Ow+MXGqSYr7WliALyRw+5hOH/kSsuC5qswAXU/PP4=", + "lastModified": 1718621143, + "narHash": "sha256-TeU1Yun2IocjJiOgpanrgfb9CqZz6DuN6SykOZkxf0Q=", "owner": "nix-community", "repo": "NUR", - "rev": "e2eac9df491c35b114641a3f4d66210953a623c3", + "rev": "ef9adc6e4f937a4a010867c5625ec14508338083", "type": "github" }, "original": { @@ -631,11 +631,11 @@ }, "nur_4": { "locked": { - "lastModified": 1718391791, - "narHash": "sha256-l7Ow+MXGqSYr7WliALyRw+5hOH/kSsuC5qswAXU/PP4=", + "lastModified": 1718621143, + "narHash": "sha256-TeU1Yun2IocjJiOgpanrgfb9CqZz6DuN6SykOZkxf0Q=", "owner": "nix-community", "repo": "NUR", - "rev": "e2eac9df491c35b114641a3f4d66210953a623c3", + "rev": "ef9adc6e4f937a4a010867c5625ec14508338083", "type": "github" }, "original": { @@ -647,10 +647,10 @@ }, "nur_5": { "locked": { - "lastModified": 1714665582, - "narHash": "sha256-4AvWvlif/vjZeUc5oldA1VlLSwZn5GzJYbrW3yt7YH4=", - "path": "/nix/store/6nxjh945516m460kidrnjnmlbm6s1rgx-source", - "rev": "7182bb77cdf51e1d559a9fe04a204fa96e43ff12", + "lastModified": 1717231546, + "narHash": "sha256-qFMtR4NJZPgjAs7HXo7JbXrekQrX9QLNW506YKlz9Xs=", + "path": "/nix/store/53aq869sffxlrdibzg15csnm73nd9s3x-source", + "rev": "0a7d504ca4d14687d8fbdc07a19efba2a58b87f7", "type": "path" }, "original": { @@ -695,11 +695,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1718137936, - "narHash": "sha256-psA+1Q5fPaK6yI3vzlLINNtb6EeXj111zQWnZYyJS9c=", + "lastModified": 1718506969, + "narHash": "sha256-Pm9I/BMQHbsucdWf6y9G3xBZh3TMlThGo4KBbeoeczg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c279dec105dd53df13a5e57525da97905cc0f0d6", + "rev": "797ce4c1f45a85df6dd3d9abdc53f2691bea9251", "type": "github" }, "original": { @@ -718,11 +718,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1718137936, - "narHash": "sha256-psA+1Q5fPaK6yI3vzlLINNtb6EeXj111zQWnZYyJS9c=", + "lastModified": 1718506969, + "narHash": "sha256-Pm9I/BMQHbsucdWf6y9G3xBZh3TMlThGo4KBbeoeczg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c279dec105dd53df13a5e57525da97905cc0f0d6", + "rev": "797ce4c1f45a85df6dd3d9abdc53f2691bea9251", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1aeda39..e1a8f20 100644 --- a/flake.nix +++ b/flake.nix @@ -29,14 +29,14 @@ type = "github"; owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-23.11"; + ref = "nixos-24.05"; }; hm-stable = { type = "github"; owner = "nix-community"; repo = "home-manager"; - ref = "release-23.11"; + ref = "release-24.05"; inputs.nixpkgs.follows = "nixpkgs-stable"; };