feat: font; qt theme; foot program

font: Change from Monocraft to JetBrains
qt: Change theme to Fusion (doesn't look like it works)
foot: enable proper home-manger foot server support

9 files changed, 49 insertions, 26 deletions

diff --git a/common/variables.nix b/common/variables.nix
index 61384e4..b4d5127 100644
--- a/common/variables.nix
+++ b/common/variables.nix
@@ -32,10 +32,10 @@
       myAutostartCommands = ["${pkgs.brightnessctl}/bin/brightnessctl s 64"];
     };
     myConfigLocation = "/home/${myUserName}/nix-conf";
-    desktopFontFullName = "Monocraft Nerd Font";
+    desktopFontFullName = "JetBrainsMono Nerd Font";
     myAutostartCommands = [
       "fcitx5"
-      "${pkgs.foot}/bin/foot --server -f \"${desktopFontFullName}:size=12\" -o colors.alpha=0.85"
+      # "${pkgs.foot}/bin/foot --server -f \"${desktopFontFullName}:size=12\" -o colors.alpha=0.85"
       "${pkgs.udiskie}/bin/udiskie"
       "${pkgs.pa-notify}/bin/pa-notify"
     ];
diff --git a/home-manager/stvnliu/gtk.nix b/home-manager/stvnliu/gtk.nix
index 838152f..39f0f80 100644
--- a/home-manager/stvnliu/gtk.nix
+++ b/home-manager/stvnliu/gtk.nix
@@ -13,12 +13,7 @@
   qt = {
     enable = true;
     platformTheme.name = "gtk";
-    style = {
-      package = pkgs.libsForQt5.breeze-qt5;
-      name = "breeze";
-    };
+    style = {name = "Fusion";};
   };
-  home.packages = with pkgs; [
-    libsForQt5.breeze-qt5
-  ];
+  home.packages = with pkgs; [libsForQt5.breeze-qt5];
 }
diff --git a/home-manager/stvnliu/nixvim/default.nix b/home-manager/stvnliu/nixvim/default.nix
index 6ff04a0..4373b54 100644
--- a/home-manager/stvnliu/nixvim/default.nix
+++ b/home-manager/stvnliu/nixvim/default.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
+{config, ...}: {
   imports = [
     ./auto-pairs.nix
     ./autosave.nix
diff --git a/home-manager/stvnliu/nixvim/lsp.nix b/home-manager/stvnliu/nixvim/lsp.nix
index 9861ba4..e6cab91 100644
--- a/home-manager/stvnliu/nixvim/lsp.nix
+++ b/home-manager/stvnliu/nixvim/lsp.nix
@@ -1,4 +1,4 @@
-{
+{config, ...}: {
   plugins = {
     lsp = {
       enable = true;
@@ -8,8 +8,15 @@
         clangd.enable = true;
         fsautocomplete.enable = true;
         gopls.enable = true;
-        nil_ls.enable = true;
-        #nixd.enable = true;
+        #nil_ls.enable = true;
+        nixd = {
+          enable = true;
+          extraOptions = {
+            home-manager = {
+              expr = "(builtins.getFlake \"/home/stvnliu/nix-conf/\").homeConfigurations.\"stvnliu@nixos-msi\".options";
+            };
+          };
+        };
         rust_analyzer = {
           enable = true;
           installRustc = true;
diff --git a/home-manager/stvnliu/programs/default.nix b/home-manager/stvnliu/programs/default.nix
index 86cfa3a..6451c71 100644
--- a/home-manager/stvnliu/programs/default.nix
+++ b/home-manager/stvnliu/programs/default.nix
@@ -8,5 +8,6 @@
     ./git.nix
     ./rofi.nix
     ./tmux.nix
+    ./foot.nix
   ];
 }
diff --git a/home-manager/stvnliu/programs/foot.nix b/home-manager/stvnliu/programs/foot.nix
new file mode 100644
index 0000000..54bcec3
--- /dev/null
+++ b/home-manager/stvnliu/programs/foot.nix
@@ -0,0 +1,21 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: {
+  programs.foot = {
+    enable = true;
+    settings = {
+      main = {
+        term = "xterm-256color";
+        font = "${config.desktopFontFullName}:size=12";
+        dpi-aware = lib.mkForce "yes";
+      };
+      mouse = {
+        hide-when-typing = "yes";
+      };
+    };
+    server.enable = true;
+  };
+}
diff --git a/home-manager/stvnliu/programs/tmux.nix b/home-manager/stvnliu/programs/tmux.nix
index dd89012..55e3787 100644
--- a/home-manager/stvnliu/programs/tmux.nix
+++ b/home-manager/stvnliu/programs/tmux.nix
@@ -8,5 +8,13 @@
     enable = true;
     shell = "${pkgs.fish}/bin/fish";
     terminal = "screen-256color"; # Fix for apps not recognising full color
+    mouse = true;
+    plugins = with pkgs; [
+      tmuxPlugins.cpu
+      {
+        plugin = tmuxPlugins.resurrect;
+        extraConfig = "set -g @resurrect-strategy-nvim 'session'";
+      }
+    ];
   };
 }
diff --git a/home-manager/stvnliu/stylix.nix b/home-manager/stvnliu/stylix.nix
index 8d3c0bf..be53624 100644
--- a/home-manager/stvnliu/stylix.nix
+++ b/home-manager/stvnliu/stylix.nix
@@ -16,8 +16,8 @@ in {
         package = pkgs.aileron;
       };
       monospace = {
-        name = "BlexMono Nerd Font";
-        package = pkgs.nerdfonts.override {fonts = ["IBMPlexMono"];};
+        name = config.desktopFontFullName;
+        package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
       };
     };
     opacity = {
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 8abac3b..d4c1dff 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -22,7 +22,6 @@
     FLAKE = config.myConfigLocation;
     GTK_IM_MODULE = lib.mkForce "";
   };
-
   services.pcscd.enable = true;
   services.keyd = {
     enable = true;
@@ -35,8 +34,7 @@
             esc = "capslock";
           };
         };
-        extraConfig = ''
-        '';
+        extraConfig = "";
       };
     };
   };
@@ -105,10 +103,7 @@
   };
   security.polkit.enable = true;
   environment.systemPackages = with pkgs; [
-    (pass-wayland.withExtensions (exts: [
-      exts.pass-otp
-      exts.pass-import
-    ]))
+    (pass-wayland.withExtensions (exts: [exts.pass-otp exts.pass-import]))
     gparted
     zed-editor
     libsForQt5.qt5.qtquickcontrols2