chore: merge remote-tracking branch 'refs/remotes/origin/master'

modules/home/default.server.nix

@@ -2,7 +2,7 @@
   imports =
        [(import ./git.nix)]                       # version control
     ++ [(import ./nvim.nix)]                      # neovim editor
-    ++ [(import ./packages.violet.nix)]           # other packages
+    ++ [(import ./packages.server.nix)]           # other packages
     ++ [(import ./scripts/scripts.nix)]           # personal scripts
     ++ [(import ./zsh.nix)]                       # shell
     ++ [(import ./tmux.nix)];                     # terminal multiplexer

modules/home/hyprland/config.nix

@@ -28,18 +28,18 @@
         color = "black";
       };
     };
-    # cursorTheme = {
-    #   name = "Bibata-Modern-Ice";
-    #   package = pkgs.bibata-cursors;
-    #   size = 24;
-    # };
+    cursorTheme = {
+      name = "Bibata-Modern-Ice";
+      package = pkgs.bibata-cursors;
+      size = 24;
+    };
   };
   
-  # home.pointerCursor = {
-  #   name = "Bibata-Modern-Ice";
-  #   package = pkgs.bibata-cursors;
-  #   size = 24;
-  # };
+  home.pointerCursor = {
+    name = "Bibata-Modern-Ice";
+    package = pkgs.bibata-cursors;
+    size = 24;
+  };
 
   # gtk = {
   #   enable = true;
@@ -84,7 +84,7 @@
       source = "~/nixos-config/modules/home/hyprland/displays.conf";
 
       "debug:disable_scale_checks" = true;
-      monitor = "eDP-1, 2256x1504@60, 0x0, 1.5";
+      monitor = "eDP-1, 2256x1504@60, 0x0, 1.5"; # this works as I only have one computer using eDP-1 as a display, I could also add LVDS or DP-1 since that'd also be machine-specific.
 
       # autostart
       exec-once = [
@@ -226,6 +226,8 @@
         "$mainMod SHIFT, V, exec, cliphist list | bemenu -l 5 --ignorecase | cliphist decode | wl-copy"
 
         "$mainMod SHIFT, F, exec, librewolf"
+        "$mainMod SHIFT, C, exec, chromium"
+        "$mainMod SHIFT, Q, exec, qutebrowser"
         "$mainMod SHIFT, W, exec, wdisplays"
         "$mainMod SHIFT, T, exec, thunderbird"
         "$mainMod SHIFT, E, exec, element-desktop"

modules/home/packages.nix

@@ -61,8 +61,9 @@
     anki-bin
     obs-studio
     wdisplays
-    librewolf
-    ungoogled-chromium
+    librewolf # main
+    ungoogled-chromium # for things that don't work with librewolf
+    qutebrowser # focus
     nsxiv
     libreoffice
     xfce.thunar

modules/home/packages.server.nix

@@ -14,11 +14,6 @@
     ripgrep
     yt-dlp
     neofetch
-    yarn
-
-    # C / C++
-    gcc
-    gnumake
 
     # Python
     python3