diff --git a/flake.lock b/flake.lock index f4d1cfa..99b3064 100644 --- a/flake.lock +++ b/flake.lock @@ -73,11 +73,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1763343993, - "narHash": "sha256-x8C3fZ3zEZr8yhlCQEREFGYqUPPPl8NuFEd+YEhPzNU=", + "lastModified": 1764456074, + "narHash": "sha256-IQ/pkY49XwY0HayUaTNPWAxPLYQOM/npueJo/RG7wwE=", "ref": "refs/heads/main", - "rev": "fecd01c952138f174e1c9ab30eb16dd225b1886d", - "revCount": 254, + "rev": "bbf90ed0d03d648456ef6cc0e24f6ee23d90931f", + "revCount": 260, "type": "git", "url": "https://git.spoodythe.one/spoody/declarative-jellyfin.git" }, @@ -130,11 +130,11 @@ ] }, "locked": { - "lastModified": 1763651264, - "narHash": "sha256-8vvwZbw0s7YvBMJeyPVpWke6lg6ROgtts5N2/SMCcv4=", + "lastModified": 1764350888, + "narHash": "sha256-6Rp18zavTlnlZzcoLoBTJMBahL2FycVkw2rAEs3cQvo=", "owner": "nix-community", "repo": "disko", - "rev": "e86a89079587497174ccab6d0d142a65811a4fd9", + "rev": "2055a08fd0e2fd41318279a5355eb8a161accf26", "type": "github" }, "original": { @@ -162,11 +162,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -218,11 +218,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1762980239, - "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -240,11 +240,11 @@ ] }, "locked": { - "lastModified": 1762980239, - "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -317,11 +317,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1763319842, + "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", "type": "github" }, "original": { @@ -333,11 +333,11 @@ "git-hooks_2": { "flake": false, "locked": { - "lastModified": 1763319842, - "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", + "lastModified": 1763988335, + "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", + "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", "type": "github" }, "original": { @@ -397,16 +397,16 @@ ] }, "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" } @@ -504,20 +504,19 @@ "git-hooks": "git-hooks", "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-25_05": "nixpkgs-25_05" + ] }, "locked": { - "lastModified": 1763302796, - "narHash": "sha256-mEc3SBjRYfMcbNFLxmCc5tRtlu3j+1q7zRz+nRraSFE=", + "lastModified": 1764185122, + "narHash": "sha256-+HUOwSIFLoyett2cvRjuFIbhobpHallfP9J2cia1apo=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "5b38fb599f50e9d78325d1d2706e36303c166047", + "rev": "a14fe3b293ec2720e5b7fc72ad136d22967e12ba", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixos-mailserver", "type": "gitlab" } @@ -530,11 +529,11 @@ ] }, "locked": { - "lastModified": 1763587902, - "narHash": "sha256-kYhcVG34C5MThK6JQp2UeGTooFgi3XEElGk2TNFcTWg=", + "lastModified": 1764072830, + "narHash": "sha256-ezkjlUCohD9o9c47Ey0/I4CamSS0QEORTqGvyGqMud0=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "cce7a45e8fb3398f669bfd54aaa15047e70c81a8", + "rev": "c7832dd786175e20f2697179e0e03efadffe4201", "type": "github" }, "original": { @@ -560,22 +559,6 @@ "type": "github" } }, - "nixpkgs-25_05": { - "locked": { - "lastModified": 1747610100, - "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1761765539, @@ -593,27 +576,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1763334038, - "narHash": "sha256-LBVOyaH6NFzQ3X/c6vfMZ9k4SV2ofhpxeL9YnhHNJQQ=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { @@ -625,27 +608,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1763622513, - "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1763464769, - "narHash": "sha256-AJHrsT7VoeQzErpBRlLJM1SODcaayp0joAoEA35yiwM=", + "lastModified": 1764230294, + "narHash": "sha256-Z63xl5Scj3Y/zRBPAWq1eT68n2wBWGCIEF4waZ0bQBE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6f374686605df381de8541c072038472a5ea2e2d", + "rev": "0d59e0290eefe0f12512043842d7096c4070f30e", "type": "github" }, "original": { @@ -667,10 +650,10 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1763710886, - "narHash": "sha256-x5rBsr+kf1Fk2X+DJj55gm7tgBfYNLmh2tHxsu1CqlY=", + "lastModified": 1764581001, + "narHash": "sha256-ysfw6yXQB3N+7cmbuREuviBiOlqeleszNKQoR54I6Ls=", "ref": "refs/heads/main", - "rev": "c5f4baebab5678fe09de12a1dce279257f31c0d1", + "rev": "785e80afb9febdc0d39b1efac756ed8406d93877", "revCount": 198, "type": "git", "url": "https://git.escapeangle.com/lander/nixvim.git" @@ -688,11 +671,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1763638001, - "narHash": "sha256-Y1SPkwcPaUjrqPff49J4f1t7npRUDuYazccUsNF9XSQ=", + "lastModified": 1764537799, + "narHash": "sha256-+FvqJSUI9kNLwnSbEBnvjoNs9uQplNytf5+jYPafsKw=", "owner": "nix-community", "repo": "nixvim", - "rev": "f4b9a7122425c56d65466fcafb99053730b2646a", + "rev": "aab92fcc99cdfa81c01d754f5a9047414bb6cf32", "type": "github" }, "original": { @@ -751,11 +734,11 @@ ] }, "locked": { - "lastModified": 1763607916, - "narHash": "sha256-VefBA1JWRXM929mBAFohFUtQJLUnEwZ2vmYUNkFnSjE=", + "lastModified": 1764483358, + "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "877bb495a6f8faf0d89fc10bd142c4b7ed2bcc0b", + "rev": "5aca6ff67264321d47856a2ed183729271107c9c", "type": "github" }, "original": { @@ -771,11 +754,11 @@ ] }, "locked": { - "lastModified": 1763600374, - "narHash": "sha256-CPBFJSZrHD/TguhjBzXKaqwtMGz7ac8bX5KZ9dJfdu0=", + "lastModified": 1764551162, + "narHash": "sha256-DV/iPK0EL1vEvz5Qzl6WHVzeIJB0SCFCVrIpr0Ocfwc=", "owner": "nix-community", "repo": "srvos", - "rev": "66d01f019faeacda79b8d81cb37c8094685cb333", + "rev": "ed9d5a032c701cb1534acbcad348d42df12cbc26", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2aa6c52..17dc30f 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Secrets @@ -37,7 +37,7 @@ # Home manager home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -64,7 +64,7 @@ # mailserver nixos-mailserver = { - url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05"; + url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -161,7 +161,6 @@ ]; }; heimdall = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; specialArgs = { inherit inputs outputs; }; modules = [ { diff --git a/home/lander/features/cli/git/default.nix b/home/lander/features/cli/git/default.nix index 0da130d..d44fd40 100644 --- a/home/lander/features/cli/git/default.nix +++ b/home/lander/features/cli/git/default.nix @@ -20,9 +20,9 @@ in programs.git = { enable = true; - package = pkgs.gitAndTools.gitFull; + package = pkgs.gitFull; - extraConfig = { + settings = { user = let name = "Lander Van den Bulcke"; @@ -67,19 +67,22 @@ in # diff3 merge merge.conflictStyle = "diff3"; - }; - # This is optional, as `git identity` will call the `git-identity` script by itself, however - # setting it up explicitly as an alias gives you autocomplete - aliases = { - identity = "! git-identity"; - id = "! git-identity"; + # This is optional, as `git identity` will call the `git-identity` script by itself, however + # setting it up explicitly as an alias gives you autocomplete + alias = { + identity = "! git-identity"; + id = "! git-identity"; + }; }; + }; - # use difftastic - difftastic = { + # use difftastic + programs.difftastic = { + enable = true; + git = { enable = true; - enableAsDifftool = true; + diffToolMode = true; }; }; diff --git a/home/lander/features/cli/zsh.nix b/home/lander/features/cli/zsh.nix index 3c5fa35..25dce93 100644 --- a/home/lander/features/cli/zsh.nix +++ b/home/lander/features/cli/zsh.nix @@ -1,9 +1,9 @@ -{ pkgs, ... }: +{ config, pkgs, ... }: { programs = { zsh = { enable = true; - dotDir = ".config/zsh"; + dotDir = "${config.home.homeDirectory}/.config/zsh"; enableCompletion = true; autosuggestion.enable = true; @@ -41,7 +41,7 @@ zstyle ':completion:*' list-colors "''${(s.:.)LS_COLORS}" # HACK! Simple shell function to patch ruff bins downloaded by tox from PyPI to use - # the ruff included in NixOS - needs to be run each time the tox enviroment is + # the ruff included in NixOS - needs to be run each time the tox environment is # recreated patch_tox_ruff() { for x in $(find .tox -name ruff -type f -print); do diff --git a/home/lander/heimdall.nix b/home/lander/heimdall.nix index 3dd7f75..d76f78d 100644 --- a/home/lander/heimdall.nix +++ b/home/lander/heimdall.nix @@ -11,6 +11,8 @@ programs.ssh = { enable = true; + enableDefaultConfig = false; + matchBlocks = { "*.escapeangle.com" = { addressFamily = "inet"; diff --git a/hosts/heimdall/default.nix b/hosts/heimdall/default.nix index 2336bef..5246172 100644 --- a/hosts/heimdall/default.nix +++ b/hosts/heimdall/default.nix @@ -8,10 +8,14 @@ ../common/users/lander ]; + nixpkgs.hostPlatform = "x86_64-linux"; + wsl = { enable = true; defaultUser = "lander"; + interop.register = true; + usbip = { enable = true; autoAttach = [ "1-2" ];