diff --git a/flake.lock b/flake.lock index e55e8d0..b9bd21b 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1732215451, - "narHash": "sha256-P2VVlzRGKBNsiHsN1yMZcSMXpwtIx9ysMFZAqKFJ14o=", + "lastModified": 1731622832, + "narHash": "sha256-uTdeXrKRhkBaDAGSxw7s8YYvbU2JN6bbWh2ngUjmnUM=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "9d9c0a3a94a91cfed654a18239e27cf56970daa4", + "rev": "91ff8d93f089104d3d75c85758832252989c6a04", "type": "github" }, "original": { @@ -53,16 +53,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1732213300, - "narHash": "sha256-4Pv35cnZGiTxe6j2O0F9L9sHzxVIC1SazeAUD5kWeBs=", + "lastModified": 1731600340, + "narHash": "sha256-7uQteE+Ywiu04Ymhl3G8IRH6JJXPyd0mg61tJJMeGvg=", "owner": "goauthentik", "repo": "authentik", - "rev": "527e584699abc93712114b05f70f59c5187caa66", + "rev": "66a4970014da49ceec0715e5dec8c9aa032a3146", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2024.10.4", + "ref": "version/2024.10.2", "repo": "authentik", "type": "github" } @@ -593,16 +593,16 @@ ] }, "locked": { - "lastModified": 1732466619, - "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "f3111f62a23451114433888902a55cf0692b408d", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -998,27 +998,27 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1732824227, - "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=", + "lastModified": 1731797254, + "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9", + "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1733015936, - "narHash": "sha256-d/wq3j57flyYQ1F3s/B2f0bHCaOKF6d7JTxzfMCGRmw=", + "lastModified": 1732140964, + "narHash": "sha256-OrmDjtdoUqsWE7DPwEgn+a3qcPMX21f7uCzMnDjxdFs=", "owner": "nix-community", "repo": "NUR", - "rev": "d711073b26533360c2bc595b4e6a824b873f8e22", + "rev": "a1d4c79a93b4a56127c152f4eec71eee63f8f5e6", "type": "github" }, "original": { @@ -1260,11 +1260,11 @@ }, "unstable": { "locked": { - "lastModified": 1732837521, - "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -1276,11 +1276,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1732972373, - "narHash": "sha256-n1JQ6x5nh7/sgKKe8uWWdrw2pz2tkJm6IRpI5+I1chI=", + "lastModified": 1732118640, + "narHash": "sha256-wsCd/zbCHAOVvM6X2UQLvDszo0uiEEUP8F65M97qREw=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "adea302cd4033be844cd033d30bc552270025331", + "rev": "c387a0c9461e1ea261987897d342edec12c1af4f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1a053f5..a01fb7f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; unstable.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-24.11"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/modules/gpg.nix b/home/modules/gpg.nix index 9e317cc..3dc2d30 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 f210031..8cadd7e 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 5028b08..c53524e 100644 --- a/pkgs/config/unfree.nix +++ b/pkgs/config/unfree.nix @@ -6,7 +6,6 @@ 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 d8f7946..3a18f9b 100644 --- a/sys/platforms/posixlycorrect/default.nix +++ b/sys/platforms/posixlycorrect/default.nix @@ -47,22 +47,11 @@ }; services.libinput.enable = true; - hardware.graphics.enable = true; + hardware.opengl.enable = true; - security.rtkit.enable = true; - - services.pipewire = { - enable = true; - - alsa = { - enable = true; - support32Bit = true; - }; - - jack.enable = true; - pulse.enable = true; - wireplumber.enable = true; - }; + # Enable sound. + sound.enable = true; + hardware.pulseaudio.enable = true; programs.zsh.enable = true; environment.pathsToLink = ["/share/zsh"]; @@ -97,12 +86,14 @@ virtualisation.libvirtd.onBoot = "start"; nix = { - package = pkgs.nixVersions.stable; + package = pkgs.nixFlakes; extraOptions = '' - experimental-features = nix-command flakes + experimental-features = nix-command flakes repl-flake ''; }; + 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 8b83a12..0c852b8 100644 --- a/sys/platforms/posixlycorrect/yubikey.nix +++ b/sys/platforms/posixlycorrect/yubikey.nix @@ -26,11 +26,9 @@ u2f = { enable = true; - control = "sufficient"; - settings = { - debug = false; + debug = false; cue = true; - }; + control = "sufficient"; }; }; } diff --git a/sys/platforms/vps/default.nix b/sys/platforms/vps/default.nix index e983e06..b46056c 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.nixVersions.stable; + package = pkgs.nixFlakes; extraOptions = '' - experimental-features = nix-command flakes + experimental-features = nix-command flakes repl-flake ''; # No me interesa el global registry @@ -104,5 +104,5 @@ with lib; { time.timeZone = "Europe/Amsterdam"; - system.stateVersion = "24.05"; # DO NOT CHANGE + system.stateVersion = "24.05"; } diff --git a/sys/platforms/vps/srv/mediawiki.nix b/sys/platforms/vps/srv/mediawiki.nix index 2d4aa25..d806a18 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.44.0-wmf.5.tar.gz"; - sha256 = "sha256-Mb8svP8zt4d1U/NHd9Dd2oUe/SksB/zKYGNYdpmrRfc="; + 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="; stripRoot = false; }; };