home: move foot,overlay,zsh into modules. Add backup to workdell

home-manager/default.nix

@@ -3,7 +3,6 @@
 let
   home-manager = (import ../nix/sources.nix).home-manager;
   unstable = import <nixos-unstable> { };
-  fontSize = hiDPI: if hiDPI then "FiraCode:size=14" else "FiraCode:size=8";
 in
 {
   imports = [
@@ -22,40 +21,17 @@ in
       modules/udiskie.nix
       modules/discord.nix
       modules/devenv.nix
+      modules/overlay.nix
+      modules/zsh.nix
     ] ++ lib.optionals (config.networking.hostName == "jimbo") [
       modules/kanshi.nix
     ] ++ lib.optionals (config.networking.hostName == "milhouse") [
       modules/kanshi.nix
     ];
 
-    nixpkgs.overlays = [
-      (import ../overlay/default.nix)
-    ];
-
-    home.stateVersion = "21.11";
-
-    gtk = {
-      enable = true;
-      theme = {
-        name = "Adwaita";
-        package = pkgs.gnome3.adwaita-icon-theme;
-      };
-    };
-
-    xdg = {
-      enable = true;
-    };
-
-    services.gnome-keyring.enable = true;
-
-    # e.g. for  vscode
-    nixpkgs.config.allowUnfree = true;
-
-
     home.packages = with pkgs; [
       httpie
       wdisplays
-      albert
       firefox
       evince
       chromium
@@ -116,27 +92,44 @@ in
       guvcview
       vnstat
       gnome.gedit
+      pwgen
 
       # for coc
       nodejs
       rnix-lsp
 
+      # kubernetes stuff
+      kubectl
+      krew
+      kubectx
+
       # from my overlay
       studio-link
+      #george-decker
 
-    ] ++ lib.optionals (config.networking.hostName == "jimbo") [
+    ] ++ lib.optionals (sysConfig.networking.hostname == "jimbo") [
       networkmanager
-
+    ] ++ lib.optionals (sysConfig.networking.hostname == "milhouse") [
-      # Stuff only needed for work
-      networkmanager-openvpn
-      packer
-      pwgen
-      mysql-client
-
-    ] ++ lib.optionals (config.networking.hostName == "milhouse") [
       networkmanager
     ];
+    home.stateVersion = "21.11";
 
+    gtk = {
+      enable = true;
+      theme = {
+        name = "Adwaita";
+        package = pkgs.gnome3.adwaita-icon-theme;
+      };
+    };
+
+    xdg = {
+      enable = true;
+    };
+
+    services.gnome-keyring.enable = true;
+
+    # e.g. for  vscode
+    nixpkgs.config.allowUnfree = true;
 
     programs.zsh = {
       enable = true;
@@ -294,37 +287,4 @@ in
     # Enable blueman-applet when the machine has bluetooth enabled
     services.blueman-applet.enable = config.hardware.bluetooth.enable == true;
 
-    programs.foot = {
-      enable = true;
-      settings = {
-        main = {
-          term = "xterm-256color";
-          font = fontSize config.my.highDPI;
-        };
-        scrollback = { lines = 100000; };
-        colors = {
-          alpha = "0.98";
-          foreground = "B3B1AD";
-          background = "0A0E14";
-          regular0 = "01060E";
-          regular1 = "EA6C73";
-          regular2 = "91B362";
-          regular3 = "F9AF4F";
-          regular4 = "53BDFA";
-          regular5 = "FAE994";
-          regular6 = "90E1C6";
-          regular7 = "C7C7C7";
-          bright0 = "686868";
-          bright1 = "F07178";
-          bright2 = "C2D94C";
-          bright3 = "FFB454";
-          bright4 = "59C2FF";
-          bright5 = "FFEE99";
-          bright6 = "95E6CB";
-          bright7 = "FFFFFF";
-        };
-      };
-    };
-
-  };
   }

home-manager/dell.nix

@@ -7,19 +7,15 @@
     modules/neovim.nix
     modules/git.nix
     modules/tmux.nix
+    modules/foot.nix
+    modules/overlay.nix
+    modules/zsh.nix
 
     ../secrets/denic.nix
+    ../customOptions.nix
   ];
 
-  home.username = "felix";
-  home.homeDirectory = "/home/felix";
-  home.stateVersion = "23.05"; # Please read the comment before changing.
-
-  # e.g. for  obsidian
-  nixpkgs.config.allowUnfree = true;
-
   home.packages = with pkgs; [
-    sensu-go-cli
     kubectl
     krew
     kubectx
@@ -28,7 +24,6 @@
     subversionClient
     tig
     freerdp
-    obsidian
 
     # for coc
     nodejs
@@ -39,64 +34,37 @@
     firefox
   ];
 
-  programs.zsh = {
+  home.username = "felix";
-    enable = true;
+  home.homeDirectory = "/home/felix";
-    oh-my-zsh = {
+  home.stateVersion = "23.05"; # Please read the comment before changing.
-      enable = true;
-      plugins = [ "git" "fzf" ];
-      theme = "kolo";
-    };
-    history = {
-      share = false; # every terminal has it's own history
-      size = 10000;
-    };
-    shellAliases = {
-      "dl" = "ls -lhtr --color=always ~/Downloads | tail -n 10"; # Show the 10 newest Downloads
-      "buzzer" = "ssh -i Nextcloud/Privat/id_door door@door.w17.io buzzer";
-      "k" = "kubectl";
-    };
-    initExtra = ''
-      export EDITOR="nvim";
-      export PATH="$PATH:$HOME/.krew/bin:$HOME/bin:$HOME/go/bin";
-      source <(kubectl completion zsh)
-    '';
-  };
 
-  programs.foot = {
+  # e.g. for  obsidian
-    enable = true;
+  nixpkgs.config.allowUnfree = true;
-    settings = {
-      main = {
-        term = "xterm-256color";
-        font = "FiraCode:size=10";
-      };
-      scrollback = { lines = 100000; };
-      colors = {
-        alpha = "0.98";
-        foreground = "B3B1AD";
-        background = "0A0E14";
-        regular0 = "01060E";
-        regular1 = "EA6C73";
-        regular2 = "91B362";
-        regular3 = "F9AF4F";
-        regular4 = "53BDFA";
-        regular5 = "FAE994";
-        regular6 = "90E1C6";
-        regular7 = "C7C7C7";
-        bright0 = "686868";
-        bright1 = "F07178";
-        bright2 = "C2D94C";
-        bright3 = "FFB454";
-        bright4 = "59C2FF";
-        bright5 = "FFEE99";
-        bright6 = "95E6CB";
-        bright7 = "FFFFFF";
-      };
-    };
-  };
 
   home.file = { };
   home.sessionVariables = { };
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
+
+  systemd.user.services.backup = {
+    Unit = {
+      Description = "Run a backup";
+    };
+
+    Service = {
+      Type = "oneshot";
+      ExecStart = "/home/felix/bin/backup.sh";
+    };
+  };
+
+  systemd.user.timers.backup = {
+    Unit = {
+      Description = "Backup every 3h";
+    };
+    Timer = {
+      OnBootSec = "3h";
+      OnUnitActiveSec = "3h";
+    };
+  };
 }

home-manager/modules/foot.nix

@@ -0,0 +1,40 @@
+{ config
+, ...
+}:
+let
+  fontSize = hiDPI: if hiDPI then "FiraCode:size=14" else "FiraCode:size=8";
+in
+{
+  programs.foot = {
+    enable = true;
+    settings = {
+      main = {
+        term = "xterm-256color";
+        font = fontSize config.my.highDPI;
+      };
+      scrollback = { lines = 100000; };
+      colors = {
+        alpha = "0.98";
+        foreground = "B3B1AD";
+        background = "0A0E14";
+        regular0 = "01060E";
+        regular1 = "EA6C73";
+        regular2 = "91B362";
+        regular3 = "F9AF4F";
+        regular4 = "53BDFA";
+        regular5 = "FAE994";
+        regular6 = "90E1C6";
+        regular7 = "C7C7C7";
+        bright0 = "686868";
+        bright1 = "F07178";
+        bright2 = "C2D94C";
+        bright3 = "FFB454";
+        bright4 = "59C2FF";
+        bright5 = "FFEE99";
+        bright6 = "95E6CB";
+        bright7 = "FFFFFF";
+      };
+    };
+  };
+
+}

home-manager/modules/overlay.nix

@@ -0,0 +1,5 @@
+{
+  nixpkgs.overlays = [
+    (import ../../overlay/default.nix)
+  ];
+}

home-manager/modules/zsh.nix

@@ -0,0 +1,19 @@
+{
+  programs.zsh = {
+    enable = true;
+    oh-my-zsh = {
+      enable = true;
+      plugins = [ "git" "fzf" ];
+      theme = "kolo";
+    };
+    history = {
+      share = false; # every terminal has it's own history
+      size = 10000;
+    };
+    shellAliases = {
+      "dl" = "ls -lhtr --color=always ~/Downloads | tail -n 10"; # Show the 10 newest Downloads
+      "buzzer" = "ssh -i Nextcloud/Privat/id_door door@door.w17.io buzzer";
+    };
+  };
+
+}

secrets

@@ -1 +1 @@
-Subproject commit 5bb5db7a6e82331b2697c0b9fde910ffaca0f703
+Subproject commit b4c65d5730613e021e7f3c5e0b507d4cb12df1fe