wip: dnsc-machine config

home/linux.nix

@@ -21,6 +21,10 @@
     zoxide
     swaybg
     xwayland-satellite
+    nerd-fonts.victor-mono
+    work-sans
+    bodoni-moda
+    reversal-icon-theme
   ];
 
   imports = [
@@ -34,4 +38,33 @@
   ];
 
   programs.home-manager.enable = true;
+
+  # Appearance
+  fonts.fontconfig.enable = {
+    antialiasing = true;
+    defaultFonts = {
+      monospace = "VictorMono Nerd Font";
+      sansSerif = "Work Sans";
+      serif = "Bodoni";
+    };
+  };
+
+  gtk = {
+    enable = true;
+    colorScheme = "dark";
+    font = {
+      package = pkgs.work-sans;
+      name = "Work Sans";
+      size = 10;
+    };
+    iconTheme = {
+      package = pkgs.reversal-icon-theme;
+      name = "Reversal";
+    };
+    cursorTheme = {
+      package = pkgs.bibata-cursors;
+      name = "Bibata Ice";
+      size = 24;
+    }; 
+  };
 }

hosts/dnsc-machine/default.nix

@@ -74,6 +74,10 @@
     ];
   };
 
+  # Shell
+  programs.fish.enable = true;
+  users.defaultUserShell = pkgs.fish;
+
   # Window Manager Setup
   programs.niri.enable = true;
   security.polkit.enable = true;
@@ -114,7 +118,6 @@
     wezterm
     fish
     firefox # TODO use zen browser instead
-    nerd-fonts.victor-mono
   ];
 
   # Some programs need SUID wrappers, can be configured further or are

modules/fish/default.nix

@@ -148,7 +148,17 @@
       set -x GPG_TTY (tty)
 
       fish_add_path /run/current-system/sw/bin
-      fish_add_path /opt/homebrew/bin
+
+      switch (uname)
+        case Darwin
+          fish_add_path /opt/homebrew/bin
+          if test -d (brew --prefix)"/share/fish/completions"
+            set -p fish_complete_path (brew --prefix)/share/fish/completions
+          end
+          if test -d (brew --prefix)"/share/fish/vendor_completions.d"
+            set -p fish_complete_path (brew --prefix)/share/fish/vendor_completions.d
+          end
+      end
 
       envsource ~/.env
 
@@ -157,15 +167,7 @@
       fnm env --use-on-cd --shell fish | source
 
       # Temporary fix because of https://github.com/atuinsh/atuin/issues/2803
-      atuin init fish | sed 's/-k up/up/' | source
-
-      if test -d (brew --prefix)"/share/fish/completions"
-          set -p fish_complete_path (brew --prefix)/share/fish/completions
-      end
-
-      if test -d (brew --prefix)"/share/fish/vendor_completions.d"
-          set -p fish_complete_path (brew --prefix)/share/fish/vendor_completions.d
-      end
+      # atuin init fish | sed 's/-k up/up/' | source
     '';
 
     shellAbbrs = {

modules/wezterm/config/overrides.lua

@@ -10,12 +10,12 @@ function M.apply_to_config(config)
 		config.font_size = 19
 	end
 
-	if hn == "dnsc-desktop" then
+	if hn == "dnsc-machine" then
 		config.font = wezterm.font("Victor Mono", { weight = "DemiBold" })
-		config.font_size = 14
+		config.font_size = 15.5
 		config.window_decorations = "RESIZE"
 		config.window_padding = helpers.get_padding(18, 6)
-		config.window_background_opacity = 1
+		config.window_background_opacity = 0.95
 	end
 end