chore: spring cleaning

purge unused files
fmt according to alejandra syntax

6 files changed, 31 insertions, 7 deletions

diff --git a/common/variables.nix b/common/variables.nix
index bfa3f50..f4af0f1 100644
--- a/common/variables.nix
+++ b/common/variables.nix
@@ -10,6 +10,7 @@ in {
   # Type definitions for nix variables used in this configuration
   options = with lib;
   with types; {
+    defaultApplications = {fileManager = mkOption {type = str;};};
     myWallPaperPath = mkOption {type = path;};
     myUserName = mkOption {type = str;};
     myHostName = mkOption {type = str;};
@@ -35,13 +36,15 @@ in {
       myAutostartCommands = ["${pkgs.brightnessctl}/bin/brightnessctl s ${monitorMinBrightness}"];
     };
     myConfigLocation = "/home/${myUserName}/nix-conf";
-    desktopFontFullName = "JetBrainsMono Nerd Font";
+    desktopFontFullName = "IntoneMono NFM:style=Regular";
     myAutostartCommands = [
       "${pkgs.brightnessctl}/bin/brightnessctl s ${monitorMaxBrightness}"
       "fcitx5"
       # "${pkgs.foot}/bin/foot --server -f \"${desktopFontFullName}:size=12\" -o colors.alpha=0.85"
       "${pkgs.udiskie}/bin/udiskie"
       "${pkgs.pa-notify}/bin/pa-notify"
+      "${pkgs.networkmanagerapplet}/bin/nm-applet"
     ];
+    defaultApplications.fileManager = "${pkgs.nemo}/bin/nemo";
   };
 }
diff --git a/home-manager/stvnliu/hypr/hyprland/binds.nix b/home-manager/stvnliu/hypr/hyprland/binds.nix
index bb215a8..dd46cbb 100644
--- a/home-manager/stvnliu/hypr/hyprland/binds.nix
+++ b/home-manager/stvnliu/hypr/hyprland/binds.nix
@@ -1,6 +1,8 @@
 {
   config,
   pkgs,
+  lib,
+  ...
 }: let
   terminalCmd = "${pkgs.foot}/bin/footclient";
   screenshotLocation = "/home/${config.myUserName}/Screenshots/$(date '+%Y-%m-%d-%H-%M-%S').png";
@@ -21,13 +23,18 @@ in
     "$mod, Q, killactive"
     "$mod, D, exec, ${pkgs.fuzzel}/bin/fuzzel"
     "$mod, F, fullscreen"
-    "$mod, E, exec, ${pkgs.pcmanfm}/bin/pcmanfm"
+    "$mod, E, exec, ${config.defaultApplications.fileManager}"
     # foot terminal
     "$mod, Return, exec, ${terminalCmd} ${config.myShells.defaultShell}"
     "$mod SHIFT, Return, exec, [float] ${terminalCmd} ${config.myShells.defaultShell}"
 
     # cmdline utilities
-    "$mod, N, exec, [float] ${terminalCmd} ${pkgs.networkmanager}/bin/nmtui"
+    /*
+    NOTE Replaced by network manager applet
+     nmtui interface is no longer needed
+    TODO Fix floating window rule
+    */
+    # "$mod, N, exec, [float] ${terminalCmd} ${pkgs.networkmanager}/bin/nmtui"
     "$mod, M, exec, [float] ${terminalCmd} ${pkgs.zenith}/bin/zenith"
 
     # vimkeys navigation
@@ -37,6 +44,11 @@ in
     "$mod, L, movefocus, r"
   ]
   ++ (
+    if config.services.swaync.enable
+    then ["$mod, N, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -t"]
+    else []
+  )
+  ++ (
     # workspaces
     # binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
     builtins.concatLists (builtins.genList (x: let
diff --git a/home-manager/stvnliu/hypr/hyprland/default.nix b/home-manager/stvnliu/hypr/hyprland/default.nix
index a5bc05c..2dbaf35 100644
--- a/home-manager/stvnliu/hypr/hyprland/default.nix
+++ b/home-manager/stvnliu/hypr/hyprland/default.nix
@@ -1,6 +1,7 @@
 {
   config,
   pkgs,
+  lib,
   ...
 }: {
   home.packages = with pkgs; [foot];
@@ -58,6 +59,7 @@
       };
       bind = import ./binds.nix {
         inherit config;
+        inherit lib;
         inherit pkgs;
       };
       bindm = [
diff --git a/home-manager/stvnliu/packages/default.nix b/home-manager/stvnliu/packages/default.nix
index eaa5e54..9063c20 100644
--- a/home-manager/stvnliu/packages/default.nix
+++ b/home-manager/stvnliu/packages/default.nix
@@ -10,5 +10,6 @@
     ./discord.nix
     ./wayland-utils.nix
     ./pentesting.nix
+    ./dev.nix
   ];
 }
diff --git a/home-manager/stvnliu/packages/dev.nix b/home-manager/stvnliu/packages/dev.nix
new file mode 100644
index 0000000..e1e91ff
--- /dev/null
+++ b/home-manager/stvnliu/packages/dev.nix
@@ -0,0 +1,9 @@
+{
+  pkgs,
+  config,
+  ...
+}: {
+  home.packages = with pkgs; [
+    wget
+  ];
+}
diff --git a/home-manager/stvnliu/programs/foot.nix b/home-manager/stvnliu/programs/foot.nix
index a78c840..ae5188e 100644
--- a/home-manager/stvnliu/programs/foot.nix
+++ b/home-manager/stvnliu/programs/foot.nix
@@ -9,12 +9,9 @@
     settings = {
       main = {
         term = "xterm-256color";
-        #font = "${config.desktopFontFullName}:size=24";
         dpi-aware = lib.mkForce "yes";
       };
-      mouse = {
-        hide-when-typing = "yes";
-      };
+      mouse = {hide-when-typing = "yes";};
     };
     server.enable = true;
   };