cleanup and restructuring

users/rouven/modules/default.nix

@@ -1,22 +1,21 @@
 { config, pkgs, ... }:
 {
-  imports =
-    [
-      ./accounts
-      ./foot
-      ./fzf
-      ./git
-      ./gpg
-      ./hyprland
-      ./neovim
-      ./qutebrowser
-      ./sops
-      ./spotify
-      ./ssh
-      ./tmux
-      ./vifm
-      ./theme
-      ./zsh
-      ./packages.nix
-    ];
+  imports = [
+    ./accounts
+    ./foot
+    ./fzf
+    ./git
+    ./gpg
+    ./hyprland
+    ./neovim
+    ./qutebrowser
+    ./sops
+    ./spotify
+    ./ssh
+    ./tmux
+    ./vifm
+    ./theme
+    ./zsh
+    ./packages.nix
+  ];
 }

users/rouven/modules/foot/default.nix

@@ -16,7 +16,6 @@
       bell = {
         urgent = true;
         notify = true;
-        #command = "${pkgs.notify-desktop}/bin/notify-desktop a";
       };
       colors =
         let

users/rouven/modules/git/default.nix

@@ -1,13 +1,12 @@
 { config, pkgs, ... }:
 {
-  home.packages = with pkgs; [ delta ];
   programs.git = {
     enable = true;
     userName = "Rouven Seifert";
     userEmail = "rouven@rfive.de";
     extraConfig = {
-      core.pager = "delta";
-      interactive.diffFilter = "delta --color-only";
+      core.pager = "${pkgs.delta}/bin/delta";
+      interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
       delta = {
         navigate = true;
         light = false;

users/rouven/modules/ssh/default.nix

@@ -1,13 +1,16 @@
 { config, ... }:
+let
+  git = "~/.ssh/git";
+in
 {
-  programs.ssh = {
+  programs.ssh = rec {
     enable = true;
     matchBlocks = {
       "se-gitlab.inf.tu-dresden.de" = {
-        identityFile = "~/.ssh/git";
+        identityFile = git;
       };
       "github.com" = {
-        identityFile = "~/.ssh/git";
+        identityFile = git;
       };
       "rfive.de" = {
         user = "debian";
@@ -16,10 +19,11 @@
         hostname = "kaki.ifsr.de";
         user = "root";
       };
-      "fsr" = {
+      "ifsr" = {
         hostname = "ifsr.de";
         user = "rouven.seifert";
       };
+      "fsr" = matchBlocks."ifsr";
       "quitte" = {
         hostname = "quitte.ifsr.de";
         user = "root";
@@ -30,15 +34,15 @@
       };
       "git@rfive.de" = {
         match = "Host rfive.de User git";
-        identityFile = "~/.ssh/git";
+        identityFile = git;
       };
       "git@raspi" = {
         match = "Host raspi User git";
-        identityFile = "~/.ssh/git";
+        identityFile = git;
       };
       "git@ifsr.de" = {
         match = "Host ifsr.de User git";
-        identityFile = "~/.ssh/git";
+        identityFile = git;
       };
     };
     extraConfig = ''

users/rouven/modules/theme/default.nix

@@ -1,5 +1,7 @@
-{ config, pkgs, ... }:
+{ pkgs, nix-colors, ... }:
 {
+  colorScheme = nix-colors.colorSchemes.dracula;
+
   # theme hardcoded to dracula, too lazy to make all this base16
   home.sessionVariables.GTK_THEME = "Dracula";
   gtk = {

users/rouven/modules/zsh/default.nix

@@ -48,7 +48,6 @@
     localVariables = {
       COMPLETION_WAITING_DOTS = "true";
       ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=#00bbbb,bold";
-      # ZSH_AUTOSUGGEST_STRATEGY="(history completion)";
     };
 
     initExtra =