refactor: hjemify foot & keepassxc

home/hyprland/default.nix

@@ -35,7 +35,7 @@ mkIf osConfig.programs.hyprland.enable {
 
       general = {
         gaps_in = 3;
-        gaps_out = 3;
+        gaps_out = 10;
 
         border_size = 2;
 
@@ -56,9 +56,6 @@ mkIf osConfig.programs.hyprland.enable {
         numlock_by_default = true;
         kb_options = "compose:caps";
         kb_layout = osConfig.console.keyMap;
-        touchpad = {
-          natural_scroll = true;
-        };
       };
 
       decoration = {
@@ -134,9 +131,6 @@ mkIf osConfig.programs.hyprland.enable {
         preserve_split = true;
       };
 
-      gestures = {
-        workspace_swipe = true;
-      };
       # https://wiki.hyprland.org/Configuring/Variables/#misc
       misc = {
         force_default_wallpaper = 0;
@@ -147,67 +141,64 @@ mkIf osConfig.programs.hyprland.enable {
 
       bindm = [ "$mod,mouse:272,movewindow" ];
 
-      bind = [
+      bind =
-        "$mod, D, exec, ${pkgs.fuzzel}/bin/fuzzel"
+        [
-        "$mod, E, exec, ${lib.my.getExe osConfig.modules.system.roles.desktop.filemanager}"
+          "$mod, D, exec, ${pkgs.fuzzel}/bin/fuzzel"
-        "$mod, Return, exec, ${lib.my.getExe osConfig.modules.system.roles.desktop.terminal}"
+          "$mod, E, exec, ${lib.my.getExe osConfig.modules.system.roles.desktop.filemanager}"
-        "$mod SHIFT, Q, killactive,"
+          "$mod, Return, exec, ${lib.my.getExe osConfig.modules.system.roles.desktop.terminal}"
-        "$mod, V, togglefloating"
+          "$mod SHIFT, Q, killactive,"
-        "$mod SHIFT, P, exec, ${config.programs.rofi.package}/bin/rofi -show p -modi p:${pkgs.rofi-power-menu}/bin/rofi-power-menu"
+          "$mod, V, togglefloating"
-        "$mod, P, exec, ${pkgs.cliphist}/bin/cliphist wipe & ${pkgs.hyprlock}/bin/hyprlock"
+          "$mod SHIFT, P, exec, ${config.programs.rofi.package}/bin/rofi -show p -modi p:${pkgs.rofi-power-menu}/bin/rofi-power-menu"
-        "$mod SHIFT, C, exec, hyprctl reload"
+          "$mod, P, exec, ${pkgs.cliphist}/bin/cliphist wipe & ${pkgs.hyprlock}/bin/hyprlock"
-        "$mod SHIFT, space, togglefloating"
+          "$mod SHIFT, C, exec, hyprctl reload"
-        "$mod, left, movefocus, l"
+          "$mod SHIFT, space, togglefloating"
-        "$mod, right, movefocus, r"
+          "$mod, left, movefocus, l"
-        "$mod, up, movefocus, u"
+          "$mod, right, movefocus, r"
-        "$mod, down, movefocus, d"
+          "$mod, up, movefocus, u"
+          "$mod, down, movefocus, d"
 
-        # Example special workspace (scratchpad)
+          # Example special workspace (scratchpad)
-        "$mod, S, togglespecialworkspace, magic"
+          "$mod, S, togglespecialworkspace, magic"
-        "$mod SHIFT, S, movetoworkspace, special:magic"
+          "$mod SHIFT, S, movetoworkspace, special:magic"
-        "$mod, X, fullscreen, 1"
+          "$mod, X, fullscreen, 1"
-        "$mod, F, fullscreen, 0"
+          "$mod, F, fullscreen, 0"
-        "$mod, N, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -t"
+          "$mod, N, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -t"
-        "$mod, U, exec, ${pkgs.hyprshot}/bin/hyprshot -z -o $XDG_PICTURES_DIR/screenshots -m region"
+          "$mod, U, exec, ${pkgs.hyprshot}/bin/hyprshot -z -o $XDG_PICTURES_DIR/screenshots -m region"
-        "$mod SHIFT, U, exec, ${pkgs.hyprshot}/bin/hyprshot -z --raw -m region | ${pkgs.satty}/bin/satty -f - --fullscreen"
+          "$mod SHIFT, U, exec, ${pkgs.hyprshot}/bin/hyprshot -z --raw -m region | ${pkgs.satty}/bin/satty -f - --fullscreen"
 
-        #: Brightness and Media {{{
+          #: Brightness and Media {{{
-        ",XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl s +10%"
+          ",XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl s +10%"
-        ",XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl s 10%-"
+          ",XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl s 10%-"
-        ",XF86AudioRaiseVolume, exec, ${pkgs.pamixer}/bin/pamixer -i 5"
+          ",XF86AudioRaiseVolume, exec, ${pkgs.pamixer}/bin/pamixer -i 5"
-        ",XF86AudioLowerVolume, exec, ${pkgs.pamixer}/bin/pamixer -d 5"
+          ",XF86AudioLowerVolume, exec, ${pkgs.pamixer}/bin/pamixer -d 5"
-        ",XF86AudioMicMute, exec, ${pkgs.pamixer}/bin/pamixer --default-source -m"
+          ",XF86AudioMicMute, exec, ${pkgs.pamixer}/bin/pamixer --default-source -m"
-        ",XF86AudioMute, exec, ${pkgs.pamixer}/bin/pamixer -t"
+          ",XF86AudioMute, exec, ${pkgs.pamixer}/bin/pamixer -t"
-        ",XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl play-pause"
+          ",XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl play-pause"
-        ",XF86AudioPause, exec, ${pkgs.playerctl}/bin/playerctl play-pause"
+          ",XF86AudioPause, exec, ${pkgs.playerctl}/bin/playerctl play-pause"
-        ",XF86AudioNext, exec, ${pkgs.playerctl}/bin/playerctl next"
+          ",XF86AudioNext, exec, ${pkgs.playerctl}/bin/playerctl next"
-        ",XF86AudioPrev, exec, ${pkgs.playerctl}/bin/playerctl previous"
+          ",XF86AudioPrev, exec, ${pkgs.playerctl}/bin/playerctl previous"
-        #: }}}
+          #: }}}
-
+        ]
-        # Workspaces
+        ++ (
-        "$mod, code:10, workspace, 1"
+          # workspaces
-        "$mod, code:11, workspace, 2"
+          # binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
-        "$mod, code:12, workspace, 3"
+          builtins.concatLists (
-        "$mod, code:13, workspace, 4"
+            builtins.genList (
-        "$mod, code:14, workspace, 5"
+              x:
-        "$mod, code:15, workspace, 6"
+              let
-        "$mod, code:16, workspace, 7"
+                ws =
-        "$mod, code:17, workspace, 8"
+                  let
-        "$mod, code:18, workspace, 9"
+                    c = (x + 1) / 10;
-        "$mod, code:19, workspace, 10"
+                  in
-
+                  builtins.toString (x + 1 - (c * 10));
-        # Send to Workspaces
+              in
-        "$mod SHIFT, code:10, movetoworkspace, 1"
+              [
-        "$mod SHIFT, code:11, movetoworkspace, 2"
+                "$mod, ${ws}, workspace, ${toString (x + 1)}"
-        "$mod SHIFT, code:12, movetoworkspace, 3"
+                "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}"
-        "$mod SHIFT, code:13, movetoworkspace, 4"
+              ]
-        "$mod SHIFT, code:14, movetoworkspace, 5"
+            ) 10
-        "$mod SHIFT, code:15, movetoworkspace, 6"
+          )
-        "$mod SHIFT, code:16, movetoworkspace, 7"
+        );
-        "$mod SHIFT, code:17, movetoworkspace, 8"
-        "$mod SHIFT, code:18, movetoworkspace, 9"
-        "$mod SHIFT, code:19, movetoworkspace, 10"
-      ];
     };
   };
 }

hosts/brontes/default.nix

@@ -26,14 +26,6 @@ in
     group = "wheel";
   };
 
-  virtualisation.docker = {
-    enable = true;
-    rootless = {
-      enable = true;
-      setSocketVariable = true;
-    };
-  };
-
   services.logind = {
     powerKey = "hibernate";
   };
@@ -45,10 +37,8 @@ in
 
   modules = {
     system = {
-      roles = {
+      roles.desktop.enable = true;
-        desktop.enable = true;
+      roles.gaming.enable = true;
-        gaming.enable = true;
-      };
 
       outputs = {
         "DP-2" = {

hosts/marr/default.nix

@@ -20,6 +20,7 @@
     system = {
       roles = {
         desktop.enable = true;
+        gaming.enable = true;
       };
 
       outputs = {

modules/system/mime.nix

@@ -3,7 +3,7 @@
     defaultApplications =
       let
         fileManager = "org.gnome.Nautilus.desktop";
-        browser = "firefox-esr.desktop";
+        browser = "firefox-beta.desktop";
       in
       {
         "inode/directory" = fileManager;

options/system/roles/gaming.nix

@@ -30,6 +30,7 @@ in
     programs.gamemode.enable = true;
 
     environment.systemPackages = with pkgs; [
+      lutris
       mangohud
       heroic
     ];