diff --git a/common/auto-upgrade.nix b/common/auto-upgrade.nix index 65ddbb9..d8c7042 100644 --- a/common/auto-upgrade.nix +++ b/common/auto-upgrade.nix @@ -7,7 +7,7 @@ flags = [ # Override nixpkgs (only). Notably does not include home-manager, sops or other utility/application flake inputs. "--refresh" - "--override-input" "nixpkgs" "github:NixOS/nixpkgs/nixos-25.05" + "--override-input" "nixpkgs" "github:NixOS/nixpkgs/nixos-25.11" "--override-input" "nixpkgs-unstable" "github:nixos/nixpkgs/nixos-unstable" "--no-write-lock-file" ]; diff --git a/flake.lock b/flake.lock index c6f3ebc..4b1873c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,28 +1,13 @@ { "nodes": { - "extra-config": { - "locked": { - "lastModified": 1745649002, - "narHash": "sha256-XNBExt3+U3o4lip+yj6oorCEPZ9Qe8PzBSFM5ZzVtSA=", - "ref": "refs/heads/main", - "rev": "50c9c15db2b309d299b1c19089c962979e01f45b", - "revCount": 13, - "type": "git", - "url": "file:///home/felixalb/nix-extra-config" - }, - "original": { - "type": "git", - "url": "file:///home/felixalb/nix-extra-config" - } - }, "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -36,11 +21,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -52,20 +37,20 @@ "home-manager": { "inputs": { "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1764536451, + "narHash": "sha256-BgtcUkBfItu9/yU14IgUaj4rYOanTOUZjUfBP20/ZB4=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "3fdd076e08049a9c7a83149b270440d9787d2df5", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -92,20 +77,20 @@ "nix-darwin": { "inputs": { "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ] }, "locked": { - "lastModified": 1749744770, - "narHash": "sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls=", + "lastModified": 1764161084, + "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb", + "rev": "e95de00a471d07435e0527ff4db092c84998698e", "type": "github" }, "original": { "owner": "lnl7", - "ref": "nix-darwin-25.05", + "ref": "master", "repo": "nix-darwin", "type": "github" } @@ -117,11 +102,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1734314370, - "narHash": "sha256-9PhjDAAuXP4tuJg+kM1AozKwBFyHHJ8ZqhQD+peqGtg=", + "lastModified": 1764208886, + "narHash": "sha256-voOx8RsK3miw3EHw05nwuOS4ltzeH8tKJnVr+mxtTPQ=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "616634de04e87b621bc3d495af114c4e9c6ccd36", + "rev": "7da8a2d675f9cc56b3f6d654b4cccdca5016ac8e", "type": "github" }, "original": { @@ -147,7 +132,6 @@ }, "nixpkgs-2211": { "locked": { - "lastModified": 1658083977, "narHash": "sha256-yqLXI+viN5+Vx5YpG9gNapKL3/+P6Pkprc36xNdyqSU=", "type": "tarball", "url": "https://github.com/NixOS/nixpkgs/archive/34bfa9403e42eece93d1a3740e9d8a02fceafbca.tar.gz" @@ -157,13 +141,29 @@ "url": "https://github.com/NixOS/nixpkgs/archive/34bfa9403e42eece93d1a3740e9d8a02fceafbca.tar.gz" } }, - "nixpkgs-unstable": { + "nixpkgs-darwin": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1764491476, + "narHash": "sha256-E4rtgPS7fntINb6fVJ5qQdkhfbZn8pzMYNdmiXqZmCo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "54f09efd2ca0dd5bb9c5fafc89573ab3ac44701d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-25.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { @@ -175,11 +175,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1748929857, + "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", "type": "github" }, "original": { @@ -191,29 +191,29 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1761999846, - "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=", + "lastModified": 1764494334, + "narHash": "sha256-x2xCEXUlU4Ap56+t5HaoReOQ/bV/bIQ5rzTn/m+V3HQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31", + "rev": "d542db745310b6929708d9abea513f3ff19b1341", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "extra-config": "extra-config", "home-manager": "home-manager", "matrix-synapse-next": "matrix-synapse-next", "nix-darwin": "nix-darwin", "nix-minecraft": "nix-minecraft", "nixpkgs": "nixpkgs_3", "nixpkgs-2211": "nixpkgs-2211", + "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" } @@ -225,11 +225,11 @@ ] }, "locked": { - "lastModified": 1752544651, - "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", + "lastModified": 1764483358, + "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2c8def626f54708a9c38a5861866660395bb3461", + "rev": "5aca6ff67264321d47856a2ed183729271107c9c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f715b39..414679e 100644 --- a/flake.nix +++ b/flake.nix @@ -2,20 +2,23 @@ description = "Felixalb System flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; # Remember to update ./common/auto-upgrade.nix - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; # Remember to update ./common/auto-upgrade.nix + nixpkgs-darwin.url = "github:NixOS/nixpkgs/nixpkgs-25.11-darwin"; nixpkgs-2211.url = "https://github.com/NixOS/nixpkgs/archive/34bfa9403e42eece93d1a3740e9d8a02fceafbca.tar.gz"; # old nixpgks for e.g. remmina + nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; - nix-darwin.url = "github:lnl7/nix-darwin/nix-darwin-25.05"; + # nix-darwin.url = "github:lnl7/nix-darwin/nix-darwin-25.11"; # TODO - Uncomment when available + # nix-darwin.inputs.nixpkgs.follows = "nixpkgs-darwin"; + nix-darwin.url = "github:lnl7/nix-darwin/master"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.url = "github:nix-community/home-manager/release-25.05"; + home-manager.url = "github:nix-community/home-manager/release-25.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; matrix-synapse-next.url = "github:dali99/nixos-matrix-modules/v0.7.1"; nix-minecraft.url = "github:Infinidoge/nix-minecraft"; - extra-config.url = "git+file:///home/felixalb/nix-extra-config"; + # extra-config.url = "git+file:///home/felixalb/nix-extra-config"; # TODO - Re-add on challenger sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; @@ -29,9 +32,10 @@ , nix-darwin , nixpkgs , nixpkgs-2211 + , nixpkgs-darwin , nixpkgs-unstable , sops-nix - , extra-config + # , extra-config , ... }@inputs: let pkgs-overlay = final: prev: { @@ -52,7 +56,7 @@ { nixosConfigurations = let normalSys = name: hostConfig: nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; + system = "x86_64-linux"; # TODO - Handle specialArgs = { inherit inputs; }; @@ -85,7 +89,7 @@ # Media / storage server challenger = normalSys "challenger" { modules = [ - extra-config.nixosModules.default + # extra-config.nixosModules.default ]; }; diff --git a/home/base.nix b/home/base.nix index 8479206..0d52432 100644 --- a/home/base.nix +++ b/home/base.nix @@ -32,7 +32,7 @@ programs.git = { enable = true; - extraConfig = { + settings = { pull.rebase = true; push.autoSetupRemote = true; color.ui = "auto"; diff --git a/hosts/sisko/configuration.nix b/hosts/sisko/configuration.nix index a51788c..5ad6a51 100644 --- a/hosts/sisko/configuration.nix +++ b/hosts/sisko/configuration.nix @@ -39,7 +39,6 @@ programs = { alvr = { enable = true; - package = pkgs.unstable.alvr; openFirewall = true; }; diff --git a/hosts/sisko/home.nix b/hosts/sisko/home.nix index a4c2958..15b77e6 100644 --- a/hosts/sisko/home.nix +++ b/hosts/sisko/home.nix @@ -19,7 +19,7 @@ jellyfin-media-player kitty libreoffice - unstable.lutris + lutris mpv mumble orca-slicer diff --git a/hosts/worf/configuration.nix b/hosts/worf/configuration.nix index ee86ec8..3d25304 100644 --- a/hosts/worf/configuration.nix +++ b/hosts/worf/configuration.nix @@ -111,13 +111,6 @@ }; - # firewall settings - alf = { - # 0 = disabled 1 = enabled 2 = blocks all connections except for essential services - globalstate = 1; - loggingenabled = 0; - }; - # dock settings dock = { autohide = true; @@ -133,12 +126,16 @@ }; }; + # firewall settings + networking.applicationFirewall = { + enable = true; + blockAllIncoming = true; + }; + system.keyboard = { enableKeyMapping = true; remapCapsLockToControl = true; }; - # nix.package = pkgs.nix; - system.stateVersion = 5; } diff --git a/hosts/worf/home.nix b/hosts/worf/home.nix index 5594ecf..407d362 100644 --- a/hosts/worf/home.nix +++ b/hosts/worf/home.nix @@ -26,7 +26,7 @@ prismlauncher restic snicat - spotify + # spotify # TODO - broken in 25.11 tldr w3m zellij diff --git a/hosts/worf/yabai.nix b/hosts/worf/yabai.nix index a3582c5..cf6d66e 100644 --- a/hosts/worf/yabai.nix +++ b/hosts/worf/yabai.nix @@ -5,7 +5,6 @@ let in { services.yabai = { enable = true; - package = pkgs.unstable.yabai; enableScriptingAddition = true; config = {