Merge branch 'master' of github.com:/kropatz/dotfiles

flake.nix

@@ -38,8 +38,7 @@
       inherit system;
       modules = [
         ### User specific ###
-        ./users/anon.nix
+        ./users/anon
-        ./users/option.nix
         ### System sepecific ###
         ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
         ./systems/server/configuration.nix

modules/backup.nix

@@ -74,6 +74,7 @@
                 "/home/**/node_modules"
                 "/home/**/dont_remotebackup"
                 "/home/**/venv"
+                "**/emu"
             ];
             rcloneConfigFile = config.age.secrets.restic-gdrive.path; 
             repository = "rclone:it-experts:backup";

modules/wireguard.nix

@@ -25,70 +25,69 @@ in
           allowedIPs = [
             "192.168.2.2/32"
           ];
-          persistentKeepalive = 25;
           publicKey = "dUBPIEnAiHIZCMjqV0ya8qotN3UnMhlEVyGNQcR3gVI=";
         }
         {
           allowedIPs = [
             "192.168.2.3/32"
           ];
-          persistentKeepalive = 25;
           publicKey = "Eg5ZS3zN05mJ/gct6wJlwVAHTlXpkhxFfUd7yscANV0=";
         }
         {
           allowedIPs = [
             "192.168.2.4/32"
           ];
-          persistentKeepalive = 25;
           publicKey = "8Eigfs+k2k2WPaMn+SqDmlSHdMv+I+xcBr/2qhtpGzI=";
         }
+        # handy
         {
           allowedIPs = [
             "192.168.2.20/32"
           ];
-          persistentKeepalive = 25;
           publicKey = "25u1RSfjsx3wb1DMeTm0pvUfUkG7zTjGaN+m0w6ZjCw=";
         }
         {
           allowedIPs = [
             "192.168.2.21/32"
           ];
-          persistentKeepalive = 25;
           publicKey = "S+8F+yxSQvjjoU44LRYqRv1YulqmOKumUtYo/YIh7X8=";
         }
+        # laptop
         {
           allowedIPs = [
             "192.168.2.22/32"
           ];
-          persistentKeepalive = 25;
           publicKey = "/dIW7K49vB9HOghFeXvcY7wu2utQltuv6RfgCbxZwlk=";
         }
         {
           allowedIPs = [
             "192.168.2.23/32"
           ];
-          persistentKeepalive = 25;
           publicKey = "89rjQXNcyCRUCihqfqcOnctWmhiNR8snpRFF6dyHAmk=";
         }
         {
           allowedIPs = [
             "192.168.2.24/32"
           ];
-          persistentKeepalive = 25;
           publicKey = "adaWtboVz3UhpNBKFirs7slbU2+Y3GaV5yS2EoafwVU=";
         }
+        # raphi
+        {
+          allowedIPs = [
+            "192.168.2.25/32"
+          ];
+          publicKey = "AGBWzMeSTxmB3jwNdROYHbyiqhhAVyofMV5Ku5JIE1A=";
+        }
         {
           allowedIPs = [
             "192.168.2.5/32"
           ];
-          persistentKeepalive = 25;
           publicKey = "g5uTlA1IciXgtSbECjhVis0dajRAc53Oa7Hz6dUI+0Q=";
         }
         {
           allowedIPs = [
             "192.168.2.6/32"
           ];
-          persistentKeepalive = 25;
           publicKey = "5ClF2HcqndpXS7nVgDn2unWFUYcKo5fbudV6xX2OIVE=";
         }
       ];

users/anon/default.nix

@@ -1,32 +1,21 @@
-{ pkgs, inputs, vars, ... }:
+{ inputs
-let 
+, pkgs
-  user = "anon";
+, lib
-in
+, config
+, ...
+}:
 {
-  imports = [
+  imports = [ ../default.nix ]; 
-    (import ../home-manager/nvim.nix ({ user="${user}"; pkgs = pkgs; }))
+  mainUser.name = "anon";
-    (import ../home-manager/direnv.nix ({ user="${user}"; pkgs = pkgs; }))
-    (import ../home-manager/zsh.nix ({ user="${user}"; pkgs = pkgs; }))
-  ];
-  mainUser.name = user;
 
   home-manager = {
-    useGlobalPkgs = true;
+    users.${config.mainUser.name} = import ./home.nix;
-    extraSpecialArgs = {
-      inherit inputs;
-      headless = false;
-    };
-    useUserPackages = true;
-    users.${user} = {
-      programs.git.enable = true;
-      home.stateVersion = "23.05";
-    };
   };
-  
+
   programs.zsh.enable = true;
-  users.users.${user} = {
+  users.users.${config.mainUser.name} = {
     isNormalUser = true;
-    description = user;
+    description = config.mainUser.name;
     shell = pkgs.zsh;
     extraGroups = [ "networkmanager" "wheel" "docker" "wireshark"];
     packages = with pkgs; [

users/anon/home.nix

@@ -0,0 +1,31 @@
+{ config, pkgs, inputs, ...}:
+{
+  home = {
+    # This value determines the Home Manager release that your
+    # configuration is compatible with. This helps avoid breakage
+    # when a new Home Manager release introduces backwards
+    # incompatible changes.
+    #
+    # You can update Home Manager without changing this value. See
+    # the Home Manager release notes for a list of state version
+    # changes in each release.
+    stateVersion = "23.05";
+  };
+      programs.kitty = {
+        enable = true;
+        settings = {
+          foreground = "#${config.colorScheme.colors.base05}";
+          background = "#${config.colorScheme.colors.base00}";
+          # ...
+        };
+    };
+
+  imports = [
+    ../../home-manager/nvim.nix
+    ../../home-manager/zsh.nix
+    ../../home-manager/direnv.nix
+    inputs.nix-colors.homeManagerModule
+  ];
+
+  colorScheme = inputs.nix-colors.colorSchemes.tokyo-night-dark;
+}