Update flake

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "dotfiles"]
+	path = dotfiles
+	url = ssh://git@git.dmeiburg.de:2222/dm/dotfiles.git

configuration.nix

@@ -36,7 +36,7 @@
     LC_TELEPHONE = "de_DE.UTF-8";
     LC_TIME = "de_DE.UTF-8";
   };
-  fonts.fonts = with pkgs; [
+  fonts.packages = with pkgs; [
   noto-fonts
   font-awesome
   ];
@@ -73,6 +73,16 @@
     ];
   };
 
+  # enable nitrokeys
+  services.udev.packages = [ pkgs.nitrokey-udev-rules ];
+  programs = {
+    ssh.startAgent = false;
+    gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+    };
+  };
+
   nixpkgs.config.allowUnfree = true;
 
   environment.systemPackages = with pkgs; [

dotfiles

@@ -0,0 +1 @@
+Subproject commit cb8d0a0a4494c450610853717e5b9cd453e9b517

flake.lock

@@ -4,15 +4,14 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ],
+        ]
-        "utils": "utils"
       },
       "locked": {
-        "lastModified": 1678006026,
+        "lastModified": 1695224363,
-        "narHash": "sha256-cGOfrU7JsKHAWXbPVDTOu2yyMb7GeWdUtJQNQSqht+w=",
+        "narHash": "sha256-+hfjJLUMck5G92RVFDZA7LWkR3kOxs5zQ7RPW9t3eM8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "68ba59578352815ac372b17fb3df9db39afb1407",
+        "rev": "408ba13188ff9ce309fa2bdd2f81287d79773b00",
         "type": "github"
       },
       "original": {
@@ -23,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1677932085,
+        "lastModified": 1695145219,
-        "narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=",
+        "narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89",
+        "rev": "5ba549eafcf3e33405e5f66decd1a72356632b96",
         "type": "github"
       },
       "original": {
@@ -42,21 +41,6 @@
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs"
       }
-    },
-    "utils": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
     }
   },
   "root": "root",

git/config

@@ -0,0 +1,24 @@
+[user]
+	email = key@dmeiburg.de
+	name = Daniel Meiburg
+	signingkey = 782C4A83DD7B9E4A64B12EDEE5827ECFFE0AA4F2
+[alias]
+	br = branch
+  co = checkout
+  cm = commit
+  l = log --oneline --graph
+[commit]
+	gpgSign = true
+[init]
+	defaultBranch = master
+[filter "lfs"]
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+	required = true
+[difftool]
+    prompt = true
+[diff]
+    tool = nvimdiff
+[difftool "nvimdiff"]
+    cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""

hardware-configuration.nix

@@ -37,6 +37,4 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  # high-resolution display
-  hardware.video.hidpi.enable = lib.mkDefault true;
 }

home.nix

@@ -4,6 +4,11 @@
   home.packages = with pkgs; [ 
       firefox
       gnupg
+      htop
+      ripgrep
+      pavucontrol
+      fish
+      pass
       # All of the below is for sway
       wl-clipboard
       mako
@@ -13,13 +18,12 @@
     programs.home-manager = {
       enable = true;
     };
-    programs.git = {
+    home.file = {
-      enable = true;
+      ".config/git" = {
-      userName = "Daniel Meiburg";
+        source = ./git;
-      userEmail = "key@dmeiburg.de";
+        recursive = true;
-      signing.key = "782C4A83DD7B9E4A64B12EDEE5827ECFFE0AA4F2";
+      };
-      signing.signByDefault = true;
+   };
-    };
     programs.kitty = {
       enable = true;
       theme = "Solarized Dark";