nixos/flake.lock

@@ -25,42 +25,63 @@
         ]
       },
       "locked": {
-        "lastModified": 1781184346,
+        "lastModified": 1770260404,
-        "narHash": "sha256-cZRlW47U6A2nWvAmnZeeO6Xvq23gxYbVLel4KxqOrcQ=",
+        "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ea6d221d7aa85652d014b6f719dddf036037515b",
+        "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-26.05",
+        "ref": "release-25.11",
         "repo": "home-manager",
         "type": "github"
       }
     },
+    "nix-github-actions": {
+      "inputs": {
+        "nixpkgs": [
+          "openconnect-sso",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1720066371,
+        "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=",
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1780902259,
+        "lastModified": 1770136044,
-        "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
+        "narHash": "sha256-tlFqNG/uzz2++aAmn4v8J0vAkV3z7XngeIIB3rM3650=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca",
+        "rev": "e576e3c9cf9bad747afcddd9e34f51d18c855b4e",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-26.05",
+        "ref": "nixos-25.11",
         "type": "indirect"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1781074563,
+        "lastModified": 1770197578,
-        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
+        "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
+        "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
         "type": "github"
       },
       "original": {
@@ -69,12 +90,78 @@
         "type": "indirect"
       }
     },
+    "openconnect-sso": {
+      "inputs": {
+        "flake-utils": [
+          "utils"
+        ],
+        "nix-github-actions": "nix-github-actions",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "poetry2nix": "poetry2nix",
+        "systems": "systems_2",
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1758594056,
+        "narHash": "sha256-6XyKDRWqBngw1g73e789iyIaw/0VF04ELk/ATtlkTVU=",
+        "owner": "ThinkChaos",
+        "repo": "openconnect-sso",
+        "rev": "2041471efd331d0591d34e122aefb02690fb233a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ThinkChaos",
+        "ref": "fix/nix-flake",
+        "repo": "openconnect-sso",
+        "type": "github"
+      }
+    },
+    "poetry2nix": {
+      "inputs": {
+        "flake-utils": [
+          "openconnect-sso",
+          "flake-utils"
+        ],
+        "nix-github-actions": [
+          "openconnect-sso",
+          "nix-github-actions"
+        ],
+        "nixpkgs": [
+          "openconnect-sso",
+          "nixpkgs"
+        ],
+        "systems": [
+          "openconnect-sso",
+          "systems"
+        ],
+        "treefmt-nix": [
+          "openconnect-sso",
+          "treefmt-nix"
+        ]
+      },
+      "locked": {
+        "lastModified": 1721039874,
+        "narHash": "sha256-XANsG9GYHip8pxZpbqKf/YGv8tIa0xTh289Y+WNBNfw=",
+        "owner": "nix-community",
+        "repo": "poetry2nix",
+        "rev": "d11c01e58587e5f21037ed6477465a7f26a32e27",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "poetry2nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
+        "openconnect-sso": "openconnect-sso",
         "sops-nix": "sops-nix",
         "utils": "utils"
       }
@@ -86,11 +173,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780547341,
+        "lastModified": 1770145881,
-        "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=",
+        "narHash": "sha256-ktjWTq+D5MTXQcL9N6cDZXUf9kX8JBLLBLT0ZyOTSYY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a",
+        "rev": "17eea6f3816ba6568b8c81db8a4e6ca438b30b7c",
         "type": "github"
       },
       "original": {
@@ -114,6 +201,42 @@
         "type": "github"
       }
     },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "openconnect-sso",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1721769617,
+        "narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
     "utils": {
       "inputs": {
         "flake-utils": [
@@ -121,11 +244,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779563444,
+        "lastModified": 1738591040,
-        "narHash": "sha256-+rEagECcF6BhWfLs8VCkPqsBuxxSSIRxMlgjXj6G8UQ=",
+        "narHash": "sha256-4WNeriUToshQ/L5J+dTSWC5OJIwT39SEP7V7oylndi8=",
         "owner": "gytis-ivaskevicius",
         "repo": "flake-utils-plus",
-        "rev": "a00f6f51907b5c74d2fde086b10b19d446d15717",
+        "rev": "afcb15b845e74ac5e998358709b2b5fe42a948d1",
         "type": "github"
       },
       "original": {

nixos/flake.nix

@@ -2,14 +2,21 @@
   description = "System configuration of my machines using flakes";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-26.05";
+    nixpkgs.url = "nixpkgs/nixos-25.11";
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
 
     flake-utils.url = "github:numtide/flake-utils";
     home-manager = {
-      url = "github:nix-community/home-manager/release-26.05";
+      url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    openconnect-sso = {
+      url = "github:ThinkChaos/openconnect-sso/fix/nix-flake";
+      inputs = {
+        flake-utils.follows = "utils";
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -22,14 +29,14 @@
 
   outputs = inputs@{
     self, nixpkgs, nixpkgs-unstable,
-    flake-utils, home-manager, sops-nix, utils,
+    flake-utils, home-manager, openconnect-sso, sops-nix, utils,
     ... }:
     let
       system = utils.lib.system.x86_64-linux;
 
       unfreePackages = pkg: builtins.elem (nixpkgs.lib.getName pkg) [
         "corefonts"
-        "nvidia-settings" "nvidia-x11" "nvidia-persistenced" "nvidia-kernel-modules"
+        "nvidia-settings" "nvidia-x11" "nvidia-persistenced"
         "Oracle_VirtualBox_Extension_Pack"
         "spotify"
         "steam" "steam-unwrapped" "steam-run"

nixos/hosts/Tibo-NixDesk/default.nix

@@ -31,7 +31,6 @@
 
     programs = {
       direnv.enable = true;
-      git.enable = true;
       home-manager.enable = true;
       sops.enable = true;
       ssh.enable = true;
@@ -64,6 +63,7 @@
   };
 
   environment.systemPackages = with pkgs; [
+    git
     vim-full
     w3m
     wget

nixos/hosts/Tibo-NixTop/default.nix

@@ -25,7 +25,7 @@
 
     networking = {
       networkmanager.enable = true;
-      #openconnect-sso.enable = true;
+      openconnect-sso.enable = true;
       openvpn.enable = true;
       tailscale.enable = true;
     };
@@ -37,7 +37,6 @@
 
     programs = {
       direnv.enable = true;
-      git.enable = true;
       home-manager.enable = true;
       sops.enable = true;
       ssh.enable = true;
@@ -55,8 +54,23 @@
   };
 
   boot = {
+    initrd = {
       # Use EFI and YubiKey
-    initrd.kernelModules = [ "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" ];
+      kernelModules = [ "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" ];
+
+      luks = {
+        # Enable YubiKey PBA
+        yubikeySupport = true;
+        devices."encrypted".yubikey = {
+          slot = 2;
+          twoFactor = false;
+          gracePeriod = 10;
+          keyLength = 64;
+          saltLength = 16;
+          storage.device = "/dev/nvme0n1p1";
+        };
+      };
+    };
 
     loader = {
       # Use the systemd-boot EFI boot loader.
@@ -154,6 +168,7 @@
     localBinInPath = true;
 
     systemPackages = with pkgs; [
+      git
       vim-full # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
       w3m
       wget

nixos/modules/hardware/nvidia/default.nix

@@ -25,6 +25,15 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
+    boot = {
+      extraModprobeConfig = ''
+        options nvidia-drm modeset=1
+      '';
+      kernelParams = [
+        "nvidia_drm.modeset=1"
+      ];
+    };
+
     hardware = {
       graphics = {
         enable = true;
@@ -42,9 +51,7 @@ in {
       nvidia = {
         # Use the NVidia open source kernel module (or not)
         open = false;
-        branch = "stable";
+        package = config.boot.kernelPackages.nvidiaPackages.stable;
-        # To override the default package set by the branch:
-        #package = config.boot.kernelPackages.nvidiaPackages.stable;
         # Modesetting is required.
         modesetting.enable = true;
         nvidiaSettings = cfg.gui-settings;

nixos/modules/programs/git/default.nix

@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  cfg = config.sisyphus.programs.git;
-in {
-  options.sisyphus.programs.git.enable = lib.mkEnableOption "Git";
-
-  config.programs.git = lib.mkIf cfg.enable {
-    enable = true;
-    lfs.enable = true;
-  };
-}

nixos/users/tdpeuter/default.nix

@@ -35,7 +35,7 @@ in {
       shell = pkgs.zsh;
 
       packages = (with pkgs; [
-        #bitwarden-desktop
+        bitwarden-desktop
         brave                 # Internet browser
         chafa                 # Terminal image viewer
         cmdtime               # Zsh plugin
@@ -49,7 +49,7 @@ in {
         #jellyfin-media-player
         libreoffice-fresh     # Office tools
         librewolf             # Internet browser
-        #logseq                # Note taking
+        logseq                # Note taking
         mpv                   # Media player
         nextcloud-client
         nsxiv                 # Lightweight image viewer

nixos/users/tdpeuter/firefox.nix

@@ -54,8 +54,6 @@ in {
         ];
       };
 
-      configPath = "/home/tdpeuter/.config/mozilla/firefox";
-
       languagePacks = [
         "en-GB"
         "nl"