📦 Moved more configs to common files, and refactored code with common

home-manager/hyprland/binds.nix

@@ -1,20 +1,27 @@
+let
+  common = import ../../common.nix;
+  app = common.default;
+in
 {
+  # TODO binds to move focused window
   wayland.windowManager.hyprland.settings = {
     "$mainMod" = "SUPER";
     "$shiftMod" = "$mainMod SHIFT";
+    "$menu" = "rofi -show drun";
 
     bind = [
-      "$mainMod,  Q, exec, $terminal"
+      "$mainMod,  Q, exec, ${app.terminal}"
       "$mainMod,  C, killactive,"
       "$shiftMod, M, exit,"
-      "$mainMod,  E, exec, $fileManager"
+      "$mainMod,  E, exec, ${app.fileManager}"
       "$mainMod,  V, togglefloating,"
       "$mainMod,  R, exec, $menu"
       "$mainMod,  P, pseudo," # dwindle
       "$mainMod,  J, togglesplit," # dwindle
-      "$mainMod,  B, exec, $browser"
-      "$mainMod,  L, exec, hyprlock"
-      "$mainMod,  K, exec, [float] gnome-calculator"
+      "$mainMod,  B, exec, ${app.browser}"
+      "$mainMod,  L, exec, ${app.lockScreen}"
+      "$mainMod,  K, exec, [float] ${app.calculator}"
+      "$mainMod,  ESC, exec, wlogout"
 
       # Move focus with mainMod + arrow keys
       "$mainMod, left, movefocus, l"

home-manager/hyprland/default.nix

@@ -11,10 +11,5 @@
     ./swaync
   ];
 
-  programs = {
-    btop.enable = true;
-    kitty.settings.window_padding_width = 10;
-  };
-
   wayland.windowManager.hyprland.enable = true;
 }

home-manager/hyprland/settings.nix

@@ -1,6 +1,7 @@
 { lib, ... }:
 let
   common = import ../../common.nix;
+  app = common.default;
   theme = import ../../theme.nix;
 in
 {
@@ -10,16 +11,11 @@ in
       "DP-3, 2560x1440@59.95, 1920x0, 1"
     ];
 
-    "$browser" = "io.github.zen_browser.zen";
-    "$terminal" = "kitty";
-    "$fileManager" = "nautilus";
-    "$menu" = "rofi -show drun";
-
     # Autostart
     exec-once = [
-      "$browser"
+      "${app.browser}"
       "nextcloud"
-      "$terminal"
+      "${app.terminal}"
       "hypridle"
       "systemctl --user start hyprpolkitagent"
       "swaync"

home-manager/hyprland/swaync/default.nix

@@ -10,7 +10,7 @@ in
       * {
         all: unset;
         font-size: 14px;
-        font-family: "JetBrains Mono", monospace;
+        font-family: "${theme.nerdFont} Nerd Font", monospace;
         transition: 200ms;
       }