Refactor hosts and some modules

joinemm · Jul 27, 2024 · 91bfa40 · 91bfa40
1 parent 6d21f66
commit 91bfa40
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 36 deletions.
diff --git a/hosts/hetzner/disk-block-storage.nix → disko/hetzner-block-storage.nix b/hosts/hetzner/disk-block-storage.nix → disko/hetzner-block-storage.nix
diff --git a/hosts/hetzner/disk-root.nix → disko/hetzner-osdisk.nix b/hosts/hetzner/disk-root.nix → disko/hetzner-osdisk.nix
diff --git a/flake.nix b/flake.nix
@@ -91,6 +91,7 @@
           rpi_export = pkgs.callPackage ./pkgs/rpi_export {};
           headscale-alpha = pkgs.callPackage ./pkgs/headscale {};
         };
+
         formatter =
           inputs.treefmt-nix.lib.mkWrapper
           pkgs

diff --git a/home-modules/common.nix b/home-modules/common.nix
@@ -1,14 +1,20 @@
 {pkgs, ...}: {
   home.stateVersion = "23.11";
   programs.home-manager.enable = true;
-  dconf.enable = true;
   nixpkgs.config.allowUnfree = true;
   systemd.user.startServices = "sd-switch";
 
   services = {
     udiskie.enable = true;
   };
 
+  dconf = {
+    enable = true;
+    settings = {
+      "org/gnome/desktop/interface".color-scheme = "prefer-dark";
+    };
+  };
+
   home.packages = with pkgs; [
     # development
     python3

diff --git a/home-modules/dark-mode.nix b/home-modules/dark-mode.nix
diff --git a/home-modules/default.nix b/home-modules/default.nix
@@ -4,7 +4,6 @@ rec {
   polybar = import ./polybar;
   xmonad = import ./xmonad;
   common = import ./common.nix;
-  dark-mode = import ./dark-mode.nix;
   discord = import ./discord.nix;
   dunst = import ./dunst.nix;
   firefox = import ./firefox.nix;
@@ -36,7 +35,6 @@ rec {
     polybar
     xmonad
     common
-    dark-mode
     discord
     dunst
     firefox

diff --git a/home-modules/ssh-personal.nix b/home-modules/ssh-personal.nix
@@ -10,6 +10,9 @@
         hostname = "65.21.184.54";
         user = "captain";
       };
+      apollo = {
+        hostname = "65.21.249.145";
+      };
     };
   };
 }
diff --git a/home-modules/zathura.nix b/home-modules/zathura.nix
@@ -47,7 +47,7 @@
       render-loading-fg = background;
       render-loading-bg = foreground;
 
-      recolor = true;
+      recolor = false;
       recolor-lightcolor = invisible;
       recolor-darkcolor = foreground;
 

diff --git a/home-modules/zsh.nix b/home-modules/zsh.nix
@@ -6,20 +6,11 @@
   imports = [
     inputs.nix-index-database.hmModules.nix-index
   ];
-  # show what package provides a commands when it's not found
-  programs = {
-    nix-index = {
-      enable = true;
-      enableZshIntegration = true;
-    };
 
-    # run commands without installing them
-    # , <cmd>
+  programs = {
+    # run commands without installing them with `, <cmd>`
     nix-index-database.comma.enable = true;
-    fzf = {
-      enable = true;
-      enableZshIntegration = true;
-    };
+    fzf.enable = true;
   };
 
   programs.zsh = {
@@ -28,13 +19,7 @@
     dotDir = ".config/zsh";
     autosuggestion.enable = true;
     enableCompletion = true;
-
     syntaxHighlighting.enable = true;
-    historySubstringSearch = {
-      enable = true;
-      searchUpKey = ["^[j" "^[[A"];
-      searchDownKey = ["^[k" "^[[B"];
-    };
 
     shellAliases = {
       ls = "ls --color=auto --hyperlink";

diff --git a/hosts/hetzner/apollo/default.nix → hosts/apollo/default.nix b/hosts/hetzner/apollo/default.nix → hosts/apollo/default.nix
@@ -23,10 +23,10 @@ in {
     inputs.disko.nixosModules.disko
     inputs.sops-nix.nixosModules.sops
     inputs.attic.nixosModules.atticd
-    (import ../disk-root.nix {
+    (import ../../disko/hetzner-osdisk.nix {
       pci = "0000:06:00.0";
     })
-    (import ../disk-block-storage.nix {
+    (import ../../disko/hetzner-block-storage.nix {
       id = "100958858";
       mountpoint = volumePath;
     })
@@ -155,7 +155,7 @@ in {
   services.headscale = {
     enable = true;
     port = 8085;
-    package = pkgs.callPackage ../../../pkgs/headscale {};
+    package = pkgs.callPackage ../../pkgs/headscale {};
     settings = {
       server_url = "https://portal.joinemm.dev";
       metrics_listen_addr = "127.0.0.1:8095";

diff --git a/hosts/hetzner/apollo/secrets.yaml → hosts/apollo/secrets.yaml b/hosts/hetzner/apollo/secrets.yaml → hosts/apollo/secrets.yaml
diff --git a/hosts/archimedes/configuration.nix → hosts/archimedes/default.nix b/hosts/archimedes/configuration.nix → hosts/archimedes/default.nix
diff --git a/hosts/default.nix b/hosts/default.nix
@@ -28,11 +28,11 @@ in {
     };
     apollo = lib.nixosSystem {
       inherit specialArgs;
-      modules = [./hetzner/apollo];
+      modules = [./apollo];
     };
     monitoring = lib.nixosSystem {
       inherit specialArgs;
-      modules = [./hetzner/monitoring];
+      modules = [./monitoring];
     };
     archimedes = lib.nixosSystem {
       inherit specialArgs;

diff --git a/hosts/hetzner/monitoring/default.nix → hosts/monitoring/default.nix b/hosts/hetzner/monitoring/default.nix → hosts/monitoring/default.nix
@@ -18,13 +18,12 @@ in {
       ssh-access
     ])
     inputs.disko.nixosModules.disko
-    (import ../disk-root.nix {
+    (import ../../disko/hetzner-osdisk.nix {
       pci = "0000:00:04.0";
     })
   ];
 
   nixpkgs.hostPlatform = "x86_64-linux";
-
   networking.hostName = "monitoring";
 
   environment.systemPackages = with pkgs; [