diff --git a/flake.lock b/flake.lock index f63851b..ee62e0c 100755 --- a/flake.lock +++ b/flake.lock @@ -28,16 +28,16 @@ ] }, "locked": { - "lastModified": 1772129556, - "narHash": "sha256-Utk0zd8STPsUJPyjabhzPc5BpPodLTXrwkpXBHYnpeg=", + "lastModified": 1779036909, + "narHash": "sha256-zXcwYQGCT6pzinK+1dBB2ekTVtfxGZAapb3Evdcu4fY=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "ebec37af18215214173c98cf6356d0aca24a2585", + "rev": "56c666e108467d87d13508936aade6d567f2a501", "type": "github" }, "original": { "owner": "nix-darwin", - "ref": "nix-darwin-25.11", + "ref": "nix-darwin-26.05", "repo": "nix-darwin", "type": "github" } @@ -278,16 +278,16 @@ ] }, "locked": { - "lastModified": 1778401693, - "narHash": "sha256-OVHdCqXXUF5UdGkH+FF2ZL06OLZjj2kvP2dIUmzVWoo=", + "lastModified": 1780361225, + "narHash": "sha256-wnV9ttf4fPWNonBIQmvlrSlNpQYgx5HgWWd007mwIFA=", "owner": "nix-community", "repo": "home-manager", - "rev": "389b83002efc26f1145e89a6a8e6edc5a6435948", + "rev": "e28654b71096e08c019d4861ca26acb646f583d8", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } @@ -443,16 +443,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1778003029, - "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=", + "lastModified": 1780203844, + "narHash": "sha256-K5sT4jTpGs15ADhviMKNBH38REpPf5Q6mM1+N6cArVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5", + "rev": "b51242d7d43689db2f3be91bd05d5b24fbb469c4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index c759c64..2e62c49 100755 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "NixOS Hosts"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; disko.url = "github:nix-community/disko"; determinate.url = "github:determinatesystems/determinate"; @@ -11,7 +11,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; apple-silicon = { @@ -31,7 +31,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; darwin = { - url = "github:nix-darwin/nix-darwin/nix-darwin-25.11"; + url = "github:nix-darwin/nix-darwin/nix-darwin-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/homes/aarch64-darwin/evanreichard@mac-va-mbp-personal/default.nix b/homes/aarch64-darwin/evanreichard@mac-va-mbp-personal/default.nix index 52761dd..ec8627b 100755 --- a/homes/aarch64-darwin/evanreichard@mac-va-mbp-personal/default.nix +++ b/homes/aarch64-darwin/evanreichard@mac-va-mbp-personal/default.nix @@ -7,7 +7,7 @@ let inherit (lib.${namespace}) enabled; in { - home.stateVersion = "25.11"; + home.stateVersion = "26.05"; reichard = { user = { diff --git a/homes/aarch64-darwin/evanreichard@mac-va-mbp-work/default.nix b/homes/aarch64-darwin/evanreichard@mac-va-mbp-work/default.nix index bb952d1..b14fadb 100755 --- a/homes/aarch64-darwin/evanreichard@mac-va-mbp-work/default.nix +++ b/homes/aarch64-darwin/evanreichard@mac-va-mbp-work/default.nix @@ -8,7 +8,7 @@ let inherit (lib.${namespace}) enabled; in { - home.stateVersion = "25.11"; + home.stateVersion = "26.05"; reichard = { user = { diff --git a/homes/aarch64-linux/evanreichard@lin-va-mbp-personal/default.nix b/homes/aarch64-linux/evanreichard@lin-va-mbp-personal/default.nix index 076b41f..c37542a 100755 --- a/homes/aarch64-linux/evanreichard@lin-va-mbp-personal/default.nix +++ b/homes/aarch64-linux/evanreichard@lin-va-mbp-personal/default.nix @@ -9,7 +9,7 @@ let inherit (lib.${namespace}) enabled; in { - home.stateVersion = "25.11"; + home.stateVersion = "26.05"; reichard = { user = { diff --git a/homes/aarch64-linux/evanreichard@lin-va-mbp-work-vm/default.nix b/homes/aarch64-linux/evanreichard@lin-va-mbp-work-vm/default.nix index 77448b9..6bc607a 100755 --- a/homes/aarch64-linux/evanreichard@lin-va-mbp-work-vm/default.nix +++ b/homes/aarch64-linux/evanreichard@lin-va-mbp-work-vm/default.nix @@ -7,7 +7,7 @@ let inherit (lib.${namespace}) enabled; in { - home.stateVersion = "25.11"; + home.stateVersion = "26.05"; reichard = { user = { diff --git a/homes/aarch64-raw-efi/evanreichard@lin-terminal-image/default.nix b/homes/aarch64-raw-efi/evanreichard@lin-terminal-image/default.nix index 02b6f6d..89d0709 100755 --- a/homes/aarch64-raw-efi/evanreichard@lin-terminal-image/default.nix +++ b/homes/aarch64-raw-efi/evanreichard@lin-terminal-image/default.nix @@ -7,7 +7,7 @@ let inherit (lib.${namespace}) enabled; in { - home.stateVersion = "25.11"; + home.stateVersion = "26.05"; reichard = { user = { diff --git a/homes/x86_64-linux/evanreichard@lin-va-desktop/default.nix b/homes/x86_64-linux/evanreichard@lin-va-desktop/default.nix index 00b78f4..7aba917 100755 --- a/homes/x86_64-linux/evanreichard@lin-va-desktop/default.nix +++ b/homes/x86_64-linux/evanreichard@lin-va-desktop/default.nix @@ -7,7 +7,7 @@ let inherit (lib.${namespace}) enabled; in { - home.stateVersion = "25.11"; + home.stateVersion = "26.05"; reichard = { user = { diff --git a/homes/x86_64-linux/evanreichard@lin-va-terminal/default.nix b/homes/x86_64-linux/evanreichard@lin-va-terminal/default.nix index 1030aef..212f934 100755 --- a/homes/x86_64-linux/evanreichard@lin-va-terminal/default.nix +++ b/homes/x86_64-linux/evanreichard@lin-va-terminal/default.nix @@ -8,7 +8,7 @@ let inherit (lib.${namespace}) enabled; in { - home.stateVersion = "25.11"; + home.stateVersion = "26.05"; reichard = { user = { diff --git a/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix b/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix index a116067..7b3293e 100755 --- a/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix +++ b/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix @@ -9,7 +9,7 @@ let inherit (lib.${namespace}) enabled; in { - home.stateVersion = "25.11"; + home.stateVersion = "26.05"; reichard = { user = { diff --git a/modules/home/programs/terminal/nvim/default.nix b/modules/home/programs/terminal/nvim/default.nix index 7dce6d9..aa35383 100755 --- a/modules/home/programs/terminal/nvim/default.nix +++ b/modules/home/programs/terminal/nvim/default.nix @@ -135,18 +135,18 @@ in golangci-lint-langserver lua-language-server nil - nodePackages.eslint - nodePackages.svelte-language-server - nodePackages.typescript - nodePackages.typescript-language-server - nodePackages.vscode-langservers-extracted + eslint + svelte-language-server + typescript + typescript-language-server + vscode-langservers-extracted pyright python312Packages.autopep8 # Formatters luaformatter nixpkgs-fmt - nodePackages.prettier + prettier stylua sql-formatter @@ -177,9 +177,9 @@ in clangd = "${pkgs.clang-tools}/bin/clangd", golintls = "${pkgs.golangci-lint-langserver}/bin/golangci-lint-langserver", luals = "${pkgs.lua-language-server}/bin/lua-language-server", - sveltels = "${pkgs.nodePackages.svelte-language-server}/bin/svelteserver", - tsls = "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server", - vscls = "${pkgs.nodePackages.vscode-langservers-extracted}", + sveltels = "${pkgs.svelte-language-server}/bin/svelteserver", + tsls = "${pkgs.typescript-language-server}/bin/typescript-language-server", + vscls = "${pkgs.vscode-langservers-extracted}", sqls = "${pkgs.sqls}/bin/sqls", } return nix_vars diff --git a/systems/aarch64-linux/lin-o1-headscale/default.nix b/systems/aarch64-linux/lin-o1-headscale/default.nix index 450ab3f..f7ded9f 100755 --- a/systems/aarch64-linux/lin-o1-headscale/default.nix +++ b/systems/aarch64-linux/lin-o1-headscale/default.nix @@ -15,7 +15,7 @@ in (modulesPath + "/profiles/qemu-guest.nix") ]; - system.stateVersion = "25.11"; + system.stateVersion = "26.05"; time.timeZone = "UTC"; boot.loader.grub = { diff --git a/systems/aarch64-linux/lin-o1-node/default.nix b/systems/aarch64-linux/lin-o1-node/default.nix index df74787..528798f 100755 --- a/systems/aarch64-linux/lin-o1-node/default.nix +++ b/systems/aarch64-linux/lin-o1-node/default.nix @@ -12,7 +12,7 @@ in (modulesPath + "/profiles/qemu-guest.nix") ]; - system.stateVersion = "25.11"; + system.stateVersion = "26.05"; time.timeZone = "UTC"; boot.loader.grub = { diff --git a/systems/aarch64-linux/lin-va-mbp-personal/default.nix b/systems/aarch64-linux/lin-va-mbp-personal/default.nix index a45e199..aa6bef7 100755 --- a/systems/aarch64-linux/lin-va-mbp-personal/default.nix +++ b/systems/aarch64-linux/lin-va-mbp-personal/default.nix @@ -11,7 +11,7 @@ in ./hardware-configuration.nix ]; - system.stateVersion = "25.11"; + system.stateVersion = "26.05"; time.timeZone = "America/New_York"; programs.firejail.enable = true; diff --git a/systems/aarch64-linux/lin-va-mbp-work-vm/default.nix b/systems/aarch64-linux/lin-va-mbp-work-vm/default.nix index 6c5a9f7..957281d 100755 --- a/systems/aarch64-linux/lin-va-mbp-work-vm/default.nix +++ b/systems/aarch64-linux/lin-va-mbp-work-vm/default.nix @@ -11,7 +11,7 @@ in (modulesPath + "/profiles/qemu-guest.nix") ]; - system.stateVersion = "25.11"; + system.stateVersion = "26.05"; time.timeZone = "America/New_York"; programs.nix-ld.enable = true; diff --git a/systems/aarch64-raw-efi/lin-terminal-image/default.nix b/systems/aarch64-raw-efi/lin-terminal-image/default.nix index 2219e76..c2bc395 100755 --- a/systems/aarch64-raw-efi/lin-terminal-image/default.nix +++ b/systems/aarch64-raw-efi/lin-terminal-image/default.nix @@ -3,7 +3,7 @@ let inherit (lib.${namespace}) enabled; in { - system.stateVersion = "25.11"; + system.stateVersion = "26.05"; time.timeZone = "America/New_York"; # Config Boot diff --git a/systems/x86_64-linux/lin-o1-x86-node/default.nix b/systems/x86_64-linux/lin-o1-x86-node/default.nix index 158d801..e98a407 100755 --- a/systems/x86_64-linux/lin-o1-x86-node/default.nix +++ b/systems/x86_64-linux/lin-o1-x86-node/default.nix @@ -15,7 +15,7 @@ in (modulesPath + "/profiles/qemu-guest.nix") ]; - system.stateVersion = "25.11"; + system.stateVersion = "26.05"; time.timeZone = "UTC"; boot.loader.grub = { diff --git a/systems/x86_64-linux/lin-ovh-kube1/default.nix b/systems/x86_64-linux/lin-ovh-kube1/default.nix index dbd6f50..bbd87c7 100755 --- a/systems/x86_64-linux/lin-ovh-kube1/default.nix +++ b/systems/x86_64-linux/lin-ovh-kube1/default.nix @@ -15,7 +15,7 @@ in (modulesPath + "/profiles/qemu-guest.nix") ]; - system.stateVersion = "25.11"; + system.stateVersion = "26.05"; time.timeZone = "UTC"; networking.firewall.allowedTCPPorts = [ 443 ]; diff --git a/systems/x86_64-linux/lin-ssd-kube1/default.nix b/systems/x86_64-linux/lin-ssd-kube1/default.nix index a9e8070..964dcdc 100755 --- a/systems/x86_64-linux/lin-ssd-kube1/default.nix +++ b/systems/x86_64-linux/lin-ssd-kube1/default.nix @@ -12,7 +12,7 @@ in (modulesPath + "/profiles/qemu-guest.nix") ]; - system.stateVersion = "25.11"; + system.stateVersion = "26.05"; time.timeZone = "UTC"; networking.firewall.allowedTCPPorts = [ 443 ]; diff --git a/systems/x86_64-linux/lin-va-desktop/default.nix b/systems/x86_64-linux/lin-va-desktop/default.nix index d6f7c58..65e0cca 100755 --- a/systems/x86_64-linux/lin-va-desktop/default.nix +++ b/systems/x86_64-linux/lin-va-desktop/default.nix @@ -15,7 +15,7 @@ let }; in { - system.stateVersion = "25.11"; + system.stateVersion = "26.05"; time.timeZone = "America/New_York"; nixpkgs.config.allowUnfree = true; hardware.nvidia-container-toolkit.enable = true; diff --git a/systems/x86_64-linux/lin-va-nix-builder/default.nix b/systems/x86_64-linux/lin-va-nix-builder/default.nix index 77808bc..3a79f6a 100755 --- a/systems/x86_64-linux/lin-va-nix-builder/default.nix +++ b/systems/x86_64-linux/lin-va-nix-builder/default.nix @@ -3,7 +3,7 @@ }: { time.timeZone = "America/New_York"; - system.stateVersion = "25.11"; + system.stateVersion = "26.05"; reichard = { system = { diff --git a/systems/x86_64-linux/lin-va-office/default.nix b/systems/x86_64-linux/lin-va-office/default.nix index 456329b..4c89394 100755 --- a/systems/x86_64-linux/lin-va-office/default.nix +++ b/systems/x86_64-linux/lin-va-office/default.nix @@ -9,7 +9,7 @@ let cfg = config.${namespace}.user; in { - system.stateVersion = "25.11"; + system.stateVersion = "26.05"; time.timeZone = "America/New_York"; nixpkgs.config.allowUnfree = true; diff --git a/systems/x86_64-linux/lin-va-terminal/default.nix b/systems/x86_64-linux/lin-va-terminal/default.nix index 5776e92..8cb366e 100755 --- a/systems/x86_64-linux/lin-va-terminal/default.nix +++ b/systems/x86_64-linux/lin-va-terminal/default.nix @@ -3,7 +3,7 @@ let inherit (lib.${namespace}) enabled; in { - system.stateVersion = "25.11"; + system.stateVersion = "26.05"; time.timeZone = "America/New_York"; programs.nix-ld.enable = true; diff --git a/systems/x86_64-linux/lin-va-thinkpad/default.nix b/systems/x86_64-linux/lin-va-thinkpad/default.nix index 5c85bb3..ceb6e1e 100755 --- a/systems/x86_64-linux/lin-va-thinkpad/default.nix +++ b/systems/x86_64-linux/lin-va-thinkpad/default.nix @@ -7,7 +7,7 @@ let inherit (lib.${namespace}) enabled; in { - system.stateVersion = "25.11"; + system.stateVersion = "26.05"; time.timeZone = "America/New_York"; boot = { diff --git a/systems/x86_64-vmware/lin-va-rke2/default.nix b/systems/x86_64-vmware/lin-va-rke2/default.nix index 43b0065..1e51afc 100755 --- a/systems/x86_64-vmware/lin-va-rke2/default.nix +++ b/systems/x86_64-vmware/lin-va-rke2/default.nix @@ -13,7 +13,7 @@ in config = { # Basic System - system.stateVersion = "25.11"; + system.stateVersion = "26.05"; time.timeZone = "UTC"; reichard = {