From cb2549c417efbf399a14ea16e54e697af952eb5f Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Sat, 30 Nov 2024 19:41:45 -0600 Subject: [PATCH 1/4] update to 24.11 --- flake.nix | 4 ++-- sys/platforms/vps/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index a01fb7f..1a053f5 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; unstable.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/sys/platforms/vps/default.nix b/sys/platforms/vps/default.nix index b46056c..71a85e6 100644 --- a/sys/platforms/vps/default.nix +++ b/sys/platforms/vps/default.nix @@ -104,5 +104,5 @@ with lib; { time.timeZone = "Europe/Amsterdam"; - system.stateVersion = "24.05"; + system.stateVersion = "24.05"; # DO NOT CHANGE } From 96e0b06807f879962b7cf448f216539b26bc31c8 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Sat, 30 Nov 2024 19:42:49 -0600 Subject: [PATCH 2/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'authentik-nix': 'github:nix-community/authentik-nix/91ff8d93f089104d3d75c85758832252989c6a04' (2024-11-14) → 'github:nix-community/authentik-nix/9d9c0a3a94a91cfed654a18239e27cf56970daa4' (2024-11-21) • Updated input 'authentik-nix/authentik-src': 'github:goauthentik/authentik/66a4970014da49ceec0715e5dec8c9aa032a3146' (2024-11-14) → 'github:goauthentik/authentik/527e584699abc93712114b05f70f59c5187caa66' (2024-11-21) • Updated input 'home-manager': 'github:nix-community/home-manager/2f23fa308a7c067e52dfcc30a0758f47043ec176' (2024-09-22) → 'github:nix-community/home-manager/f3111f62a23451114433888902a55cf0692b408d' (2024-11-24) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/e8c38b73aeb218e27163376a2d617e61a2ad9b59' (2024-11-16) → 'github:nixos/nixpkgs/c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9' (2024-11-28) • Updated input 'nur': 'github:nix-community/NUR/a1d4c79a93b4a56127c152f4eec71eee63f8f5e6' (2024-11-20) → 'github:nix-community/NUR/d711073b26533360c2bc595b4e6a824b873f8e22' (2024-12-01) • Updated input 'unstable': 'github:nixos/nixpkgs/23e89b7da85c3640bbc2173fe04f4bd114342367' (2024-11-19) → 'github:nixos/nixpkgs/970e93b9f82e2a0f3675757eb0bfc73297cc6370' (2024-11-28) • Updated input 'vpsadminos': 'github:vpsfreecz/vpsadminos/c387a0c9461e1ea261987897d342edec12c1af4f' (2024-11-20) → 'github:vpsfreecz/vpsadminos/adea302cd4033be844cd033d30bc552270025331' (2024-11-30) --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index b9bd21b..e55e8d0 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1731622832, - "narHash": "sha256-uTdeXrKRhkBaDAGSxw7s8YYvbU2JN6bbWh2ngUjmnUM=", + "lastModified": 1732215451, + "narHash": "sha256-P2VVlzRGKBNsiHsN1yMZcSMXpwtIx9ysMFZAqKFJ14o=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "91ff8d93f089104d3d75c85758832252989c6a04", + "rev": "9d9c0a3a94a91cfed654a18239e27cf56970daa4", "type": "github" }, "original": { @@ -53,16 +53,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1731600340, - "narHash": "sha256-7uQteE+Ywiu04Ymhl3G8IRH6JJXPyd0mg61tJJMeGvg=", + "lastModified": 1732213300, + "narHash": "sha256-4Pv35cnZGiTxe6j2O0F9L9sHzxVIC1SazeAUD5kWeBs=", "owner": "goauthentik", "repo": "authentik", - "rev": "66a4970014da49ceec0715e5dec8c9aa032a3146", + "rev": "527e584699abc93712114b05f70f59c5187caa66", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2024.10.2", + "ref": "version/2024.10.4", "repo": "authentik", "type": "github" } @@ -593,16 +593,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1732466619, + "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "f3111f62a23451114433888902a55cf0692b408d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -998,27 +998,27 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1732824227, + "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1732140964, - "narHash": "sha256-OrmDjtdoUqsWE7DPwEgn+a3qcPMX21f7uCzMnDjxdFs=", + "lastModified": 1733015936, + "narHash": "sha256-d/wq3j57flyYQ1F3s/B2f0bHCaOKF6d7JTxzfMCGRmw=", "owner": "nix-community", "repo": "NUR", - "rev": "a1d4c79a93b4a56127c152f4eec71eee63f8f5e6", + "rev": "d711073b26533360c2bc595b4e6a824b873f8e22", "type": "github" }, "original": { @@ -1260,11 +1260,11 @@ }, "unstable": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1732837521, + "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "type": "github" }, "original": { @@ -1276,11 +1276,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1732118640, - "narHash": "sha256-wsCd/zbCHAOVvM6X2UQLvDszo0uiEEUP8F65M97qREw=", + "lastModified": 1732972373, + "narHash": "sha256-n1JQ6x5nh7/sgKKe8uWWdrw2pz2tkJm6IRpI5+I1chI=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "c387a0c9461e1ea261987897d342edec12c1af4f", + "rev": "adea302cd4033be844cd033d30bc552270025331", "type": "github" }, "original": { From b9087c333b61ab34fe7e69db56b25dbb95f24715 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Sat, 30 Nov 2024 20:22:44 -0600 Subject: [PATCH 3/4] switch from pulseaudio to pipewire --- sys/platforms/posixlycorrect/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/sys/platforms/posixlycorrect/default.nix b/sys/platforms/posixlycorrect/default.nix index 3a18f9b..6e0ae3c 100644 --- a/sys/platforms/posixlycorrect/default.nix +++ b/sys/platforms/posixlycorrect/default.nix @@ -50,8 +50,23 @@ hardware.opengl.enable = true; # Enable sound. - sound.enable = true; - hardware.pulseaudio.enable = true; + # Remove sound.enable or set it to false if you had it set previously, as sound.enable is only meant for ALSA-based configurations + sound.enable = false; + + security.rtkit.enable = true; + + services.pipewire = { + enable = true; + + alsa = { + enable = true; + support32Bit = true; + }; + + jack.enable = true; + pulse.enable = true; + wireplumber.enable = true; + }; programs.zsh.enable = true; environment.pathsToLink = ["/share/zsh"]; From bd18abd3e8d4c1d9a5af203f9b6a39adf59240e0 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Sat, 30 Nov 2024 20:26:05 -0600 Subject: [PATCH 4/4] add fixes in order to be compatible with 24.11 --- home/modules/gpg.nix | 4 ++-- home/modules/zsh/zshrc.nix | 2 +- pkgs/config/unfree.nix | 1 + sys/platforms/posixlycorrect/default.nix | 12 +++--------- sys/platforms/posixlycorrect/yubikey.nix | 6 ++++-- sys/platforms/vps/default.nix | 4 ++-- sys/platforms/vps/srv/mediawiki.nix | 4 ++-- 7 files changed, 15 insertions(+), 18 deletions(-) diff --git a/home/modules/gpg.nix b/home/modules/gpg.nix index 3dc2d30..9e317cc 100644 --- a/home/modules/gpg.nix +++ b/home/modules/gpg.nix @@ -25,10 +25,10 @@ in { services.gpg-agent = { enable = true; - + enableZshIntegration = true; enableBashIntegration = true; - + enableExtraSocket = true; enableSshSupport = true; diff --git a/home/modules/zsh/zshrc.nix b/home/modules/zsh/zshrc.nix index 8cadd7e..f210031 100644 --- a/home/modules/zsh/zshrc.nix +++ b/home/modules/zsh/zshrc.nix @@ -1,7 +1,7 @@ { config, lib, - pkgs + pkgs, }: '' # The following lines were added by compinstall diff --git a/pkgs/config/unfree.nix b/pkgs/config/unfree.nix index c53524e..5028b08 100644 --- a/pkgs/config/unfree.nix +++ b/pkgs/config/unfree.nix @@ -6,6 +6,7 @@ with lib; "spotify-unwrapped" "steam" "steam-original" + "steam-unwrapped" "steam-run" "zoom" ] diff --git a/sys/platforms/posixlycorrect/default.nix b/sys/platforms/posixlycorrect/default.nix index 6e0ae3c..d8f7946 100644 --- a/sys/platforms/posixlycorrect/default.nix +++ b/sys/platforms/posixlycorrect/default.nix @@ -47,11 +47,7 @@ }; services.libinput.enable = true; - hardware.opengl.enable = true; - - # Enable sound. - # Remove sound.enable or set it to false if you had it set previously, as sound.enable is only meant for ALSA-based configurations - sound.enable = false; + hardware.graphics.enable = true; security.rtkit.enable = true; @@ -101,14 +97,12 @@ virtualisation.libvirtd.onBoot = "start"; nix = { - package = pkgs.nixFlakes; + package = pkgs.nixVersions.stable; extraOptions = '' - experimental-features = nix-command flakes repl-flake + experimental-features = nix-command flakes ''; }; - hardware.opengl.driSupport32Bit = true; - services.openssh.enable = true; services.earlyoom = { diff --git a/sys/platforms/posixlycorrect/yubikey.nix b/sys/platforms/posixlycorrect/yubikey.nix index 0c852b8..8b83a12 100644 --- a/sys/platforms/posixlycorrect/yubikey.nix +++ b/sys/platforms/posixlycorrect/yubikey.nix @@ -26,9 +26,11 @@ u2f = { enable = true; - debug = false; - cue = true; control = "sufficient"; + settings = { + debug = false; + cue = true; + }; }; }; } diff --git a/sys/platforms/vps/default.nix b/sys/platforms/vps/default.nix index 71a85e6..e983e06 100644 --- a/sys/platforms/vps/default.nix +++ b/sys/platforms/vps/default.nix @@ -46,10 +46,10 @@ with lib; { networking.hostName = "vps"; nix = { - package = pkgs.nixFlakes; + package = pkgs.nixVersions.stable; extraOptions = '' - experimental-features = nix-command flakes repl-flake + experimental-features = nix-command flakes ''; # No me interesa el global registry diff --git a/sys/platforms/vps/srv/mediawiki.nix b/sys/platforms/vps/srv/mediawiki.nix index d806a18..2d4aa25 100644 --- a/sys/platforms/vps/srv/mediawiki.nix +++ b/sys/platforms/vps/srv/mediawiki.nix @@ -67,8 +67,8 @@ with lib; { ParserFunctions = null; TemplateStyles = pkgs.fetchzip { - url = "https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/TemplateStyles/+archive/refs/heads/wmf/1.42.0-wmf.9.tar.gz"; - sha256 = "sha256-+EOwkDU8L0qQ4Wo3WDqNug4Pyz/PUhOiHKmNcFJO4G0="; + url = "https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/TemplateStyles/+archive/refs/heads/wmf/1.44.0-wmf.5.tar.gz"; + sha256 = "sha256-Mb8svP8zt4d1U/NHd9Dd2oUe/SksB/zKYGNYdpmrRfc="; stripRoot = false; }; };