flake.lock

@@ -509,10 +509,31 @@
         "nixpkgs-stable": "nixpkgs-stable",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",
+        "sops-nix": "sops-nix",
         "spicetify-nix": "spicetify-nix",
         "zen-browser": "zen-browser"
       }
     },
+    "sops-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1744103455,
+        "narHash": "sha256-SR6+qjkPjGQG+8eM4dCcVtss8r9bre/LAxFMPJpaZeU=",
+        "owner": "mic92",
+        "repo": "sops-nix",
+        "rev": "69d5a5a4635c27dae5a742f36108beccc506c1ba",
+        "type": "github"
+      },
+      "original": {
+        "owner": "mic92",
+        "repo": "sops-nix",
+        "type": "github"
+      }
+    },
     "spicetify-nix": {
       "inputs": {
         "nixpkgs": [

shared/home-manager/development/git.nix

@@ -23,7 +23,6 @@
       signing.signByDefault = true;
 
       extraConfig = {
-        pull.rebase = true;
         push.autoSetupRemote = true;
         safe.directory = "/etc/nixos";
         credential.helper = "${package}/bin/git-credential-libsecret";

shared/modules/default.nix

@@ -17,7 +17,7 @@
     ./office.nix
     ./hyprland
     ./sddm.nix
-    ./security
+    ./security.nix
     ./shell.nix
     ./social.nix
     ./users.nix

shared/modules/security.nix

@@ -1,10 +1,9 @@
-# Yubikey config: https://nixos.wiki/wiki/Yubikey#pam_u2f
 { pkgs, ... }:
 
 {
   environment.systemPackages = with pkgs; [
     gnupg
-    yubioath-flutter # GUI
+    yubioath-flutter
   ];
 
   programs.gnupg.agent.enable = true;

shared/modules/security/default.nix

@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./yubikey.nix
-  ];
-}