i3 updates

home/common/programs/hyprland/default.nix

@@ -135,7 +135,7 @@ in
       "$mod" = "SUPER";
 
       bind = [
-        "$mod, t, exec, ghostty"
+        "$mod, t, exec, kitty"
         "$mod, e, exec, thunar"
         "$mod, v, togglefloating"
         "$mod, q, killactive"

home/common/programs/i3.nix

@@ -1,14 +1,50 @@
-{ config, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 {
   xsession.windowManager.i3 = {
     enable = true;
     package = pkgs.i3-gaps;
     config = {
       modifier = "Mod4";
+      terminal = "${pkgs.kitty}/bin/kitty";
       gaps = {
         inner = 10;
-        outer = 5;
+        outer = 0;
       };
+      keybindings =
+        let
+          modifier = config.xsession.windowManager.i3.config.modifier;
+        in
+        lib.mkOptionDefault {
+          "${modifier}+h" = "focus left";
+          "${modifier}+j" = "focus down";
+          "${modifier}+k" = "focus up";
+          "${modifier}+l" = "focus right";
+
+          "${modifier}+space" = "exec launcher_t2";
+        };
+      bars = [
+        {
+          position = "top";
+          statusCommand = "i3status-rs ~/.config/i3status-rust/config-default.toml";
+        }
+      ];
     };
+    extraConfig = ''
+      smart_gaps on
+      hide_edge_borders smart_no_gaps
+
+      for_window [class="kitty"] border none
+      for_window [class="kitty"] gaps inner current set 0
+      for_window [class="kitty"] gaps outer current set 0
+    '';
+  };
+
+  programs.i3status-rust = {
+    enable = true;
   };
 }

home/common/programs/kitty.nix

@@ -51,5 +51,29 @@
       "kitty_mod+k" = "neighboring_window up";
       "kitty_mod+l" = "neighboring_window right";
     };
+
+    extraConfig = ''
+      background #1c1c1c
+      foreground #ddeedd
+      cursor #e2bbef
+      selection_background #4d4d4d
+      color0 #3d352a
+      color8 #554444
+      color1 #cd5c5c
+      color9 #cc5533
+      color2 #86af80
+      1color10 #88aa22
+      1color3 #e8ae5b
+      1color11 #ffa75d
+      1color4 #6495ed
+      1color12 #87ceeb
+      1color5 #deb887
+      1color13 #996600
+      1color6 #b0c4de
+      1color14 #b0c4de
+      1color7 #bbaa99
+      2color15 #ddccbb
+      2selection_foreground #1c1c1c
+    '';
   };
 }

home/common/programs/zsh.nix

@@ -111,6 +111,7 @@
       swift.disabled = true;
       terraform.disabled = true;
       zig.disabled = true;
+      dotnet.disabled = true;
     };
   };
 
@@ -127,6 +128,14 @@
     fd
   ];
 
+  home.sessionVariables = {
+    "ASDF_NODEJS_AUTO_ENABLE_COREPACK" = "true";
+  };
+
+  home.file.".default-npm-packages".text = ''
+    @anthropic-ai/claude-code
+  '';
+
   home.sessionPath = [
     "./.git/safe/../../node_modules/.bin"
     "./.git/safe/../../bin"

home/desktop/default.nix

@@ -30,7 +30,6 @@
     LIBVA_DRIVER_NAME = "nvidia";
     GDM_BACKEND = "nvidia-drm";
     __GLX_VENDOR_LIBRARY_NAME = "nvidia";
-    QT_SCALE_FACTOR = 2;
   };
 
   wayland.windowManager.hyprland.settings = {
@@ -44,10 +43,6 @@
       "fullscreen, class:bevy-.*"
     ];
 
-    # env = [
-    #   "GDK_SCALE, 2"
-    # ];
-
     render = {
       explicit_sync = 2;
       explicit_sync_kms = 0;
@@ -93,6 +88,8 @@
     };
   };
 
+  programs.kitty.settings.font_size = 14;
+
   home = {
     username = lib.mkDefault "naps62";
     stateVersion = lib.mkDefault "24.05";

home/desktop/monitors.nix

@@ -1,4 +1,5 @@
 {
+  lib,
   inputs,
   pkgs,
   config,
@@ -23,20 +24,36 @@ in
     monitor = [
       # monitor, res,       position, scale, transform, rotation
       "HDMI-A-1, 3840x2160, 0x1620,   1.333333"
-      "DP-3,     3840x2160, 0x0,      1.333333"
+      "DP-1,     3840x2160, 0x0,      1.333333"
       # 300 instead of 0 is so that 'move left' actually focuses the bottom one instead of the top one
       # for some reason, that's the minimum value for which this works
       "DP-2,     3840x2160, 2880x180,   1.333333,   transform, 1"
     ];
     workspace = [
       "1, monitor=DP-2"
-      "2, monitor=DP-3"
+      "2, monitor=DP-1"
       "3, monitor=DP-2"
       "4, monitor=HDMI-A-1"
       "5, monitor=HDMI-A-1"
     ];
   };
 
+  xsession.windowManager.i3 = {
+    extraConfig = lib.mkAfter ''
+      workspace 1 output HDMI-0
+      workspace 2 output DP-2
+      workspace 3 output DP-0
+    '';
+
+    # config.bars = [
+    #   {
+    #     position = "top";
+    #     trayOutput = "DP-0";
+    #     statusCommand = "i3status-rs ~/.config/i3status-rust/config-default.toml";
+    #   }
+    # ];
+  };
+
   services.hyprpaper.settings.preload = [
     (builtins.toString wallpaper1)
     (builtins.toString wallpaper2)
@@ -44,7 +61,7 @@ in
   ];
   services.hyprpaper.settings.wallpaper = [
     "HDMI-A-1,${builtins.toString wallpaper1}"
-    "DP-3,${builtins.toString wallpaper2}"
+    "DP-1,${builtins.toString wallpaper2}"
     "DP-2,${builtins.toString wallpaper-vertical}"
   ];
 }