hehehe

home/core/default.nix

@@ -11,7 +11,7 @@
     ./tui/alacritty
     ./tui/foot
     ./tui/neovim
-    ./tui/wezterm
+    # ./tui/wezterm
     ./tui/yazi
 
     ./services/copyq

home/core/gui/style/gtk.nix

@@ -6,8 +6,10 @@
   home = {
     packages = [pkgs.glib]; # gsettings
     pointerCursor = {
-      package = pkgs.catppuccin-cursors.latteDark;
-      name = "catppuccin-latte-dark-cursors";
+      # package = pkgs.catppuccin-cursors.latteDark;
+      # name = "catppuccin-latte-dark-cursors";
+      package = pkgs.adwaita-icon-theme;
+      name = "Adwaita";
       size = 28;
       gtk.enable = true;
       x11.enable = true;
@@ -20,16 +22,18 @@
       name = "Orchis-Grey-Dark-Compact";
     };
     iconTheme = {
-      package = pkgs.gruvbox-plus-icons;
-      name = "Gruvbox-Plus-Dark";
+      package = pkgs.adwaita-icon-theme;
+      name = "Adwaita";
     };
     font = {
       name = "Input Sans Narrow Light";
       size = 10;
     };
     cursorTheme = {
-      package = pkgs.catppuccin-cursors.latteDark;
-      name = "catppuccin-latte-dark-cursors";
+      # package = pkgs.catppuccin-cursors.latteDark;
+      # name = "catppuccin-latte-dark-cursors";
+      package = pkgs.adwaita-icon-theme;
+      name = "Adwaita";
       size = 28;
     };
 

home/core/tui/wezterm/default.nix

@@ -2,23 +2,43 @@
   pkgs,
   inputs,
   ...
-}: {
+}: let
+  enable_wayland = "true";
+  # weztermPkg = pkgs.wezterm;
+  weztermFlake = inputs.wezterm.packages.${pkgs.system}.default;
+in {
   programs.wezterm = {
     enable = true;
-    package = inputs.wezterm.packages.${pkgs.system}.default;
-
+    package = weztermFlake;
     extraConfig = ''
-      return {
-          font = wezterm.font("Input Mono Compressed"),
-          font_size = 12,
-          check_for_updates = false,
-          color_scheme = 'Gruvbox Material (Gogh)',
-          default_cursor_style = 'SteadyBar',
-          enable_scroll_bar = true,
-          hide_tab_bar_if_only_one_tab = true,
-          scrollback_lines = 10000,
-          window_background_opacity = 0.9,
-      }
+                local wezterm = require 'wezterm';
+
+                local config = {
+                -- font = wezterm.font("Input Mono Compressed"),
+                font_size = 12,
+                check_for_updates = false,
+                color_scheme = 'Gruvbox Material (Gogh)',
+                default_cursor_style = 'SteadyBar',
+                enable_scroll_bar = true,
+                hide_tab_bar_if_only_one_tab = true,
+                scrollback_lines = 10000,
+                window_background_opacity = 0.9,
+                }
+                if wezterm.target_triple == "x86_64-pc-windows-msvc" then
+                  config.default_prog = { "powershell.exe" }
+                else
+                  config.enable_wayland = ${enable_wayland}
+                  -- config.window_decorations = "TITLE"
+                  config.window_close_confirmation = "NeverPrompt"
+                  -- config.freetype_load_target = "Light"
+                  -- config.freetype_render_target = "HorizontalLcd"
+                  local f = wezterm.font_with_fallback({
+                    {family="Input Mono Compressed", weight="Light"},
+                    {family="Input Sans Narrow", weight="Light"},
+                  })
+                  config.font = f;
+                end
+      return config
     '';
   };
 }

home/core/tui/wezterm/default.nixbak

@@ -0,0 +1,25 @@
+{
+  pkgs,
+  inputs,
+  ...
+}: {
+  programs.wezterm = {
+    enable = true;
+    package = inputs.wezterm.packages.${pkgs.system}.default;
+
+    extraConfig = ''
+      return {
+          enable_wayland = true,
+          font = wezterm.font("Input Mono Compressed"),
+          font_size = 12,
+          check_for_updates = false,
+          color_scheme = 'Gruvbox Material (Gogh)',
+          default_cursor_style = 'SteadyBar',
+          enable_scroll_bar = true,
+          hide_tab_bar_if_only_one_tab = true,
+          scrollback_lines = 10000,
+          window_background_opacity = 0.9,
+      }
+    '';
+  };
+}

home/default.nix

@@ -8,16 +8,25 @@
 
   homeImports = {
     "cnst@cnix" = [
-      ../core
-      ./cnst
+      ./core/gui/hypr/cnst.nix
+      ./core/tui/git/cnst.nix
+      ./core/tui/shell/cnst.nix
+      ./core
+      ./users/cnst
     ];
     "adam@adampad" = [
-      ../core
-      ./adam
+      ./core/gui/hypr/cnst.nix
+      ./core/tui/git/cnst.nix
+      ./core/tui/shell/cnst.nix
+      ./core
+      ./users/adam
     ];
     "toothpick@toothpc" = [
-      ../core
-      ./toothpick
+      ./core/gui/hypr/toothpick.nix
+      ./core/tui/git/toothpick.nix
+      ./core/tui/shell/toothpick.nix
+      ./core
+      ./users/toothpick
     ];
   };
 

home/users/cnst/default.nix

@@ -1,14 +1,4 @@
 {pkgs, ...}: {
-  imports = [
-    # core.gui
-    # ../../core/gui/ags
-    ../../core/gui/hypr/cnst.nix
-    # core.tui
-    ../../core/tui/git/cnst.nix
-    ../../core/tui/shell/cnst.nix
-    # core.services
-    # ../../core/services/power-monitor
-  ];
   home = {
     username = "cnst";
     homeDirectory = "/home/cnst";