From: Andrew Date: Mon, 18 Aug 2025 23:17:30 +0000 (-0400) Subject: smart gaps X-Git-Url: http://git.skullheadx.com/index.css?a=commitdiff_plain;h=f0c9f39bd7a23927176fad4105dfa307ef82ef64;p=nixos.git smart gaps --- diff --git a/home.nix b/home.nix index 1de8ded..615f593 100644 --- a/home.nix +++ b/home.nix @@ -44,9 +44,8 @@ inter prismlauncher nixfmt-rfc-style - zip - unzip p7zip + github-desktop # # It is sometimes useful to fine-tune packages, for example, by applying # # overrides. You can do that directly here, just don't forget the @@ -130,21 +129,21 @@ userEmail = "admonty1@protonmail.com"; }; -programs.keepassxc = { - enable = true; -# settings = { -# Browser = { -# Enabled = true; -# UseCustomBrowser = true; -# CustomBrowserType = 1; -# -#}; -# GUI = { -# ShowTrayIcon = true; -# ApplicationTheme = "dark"; -# }; -# }; -}; + programs.keepassxc = { + enable = true; + # settings = { + # Browser = { + # Enabled = true; + # UseCustomBrowser = true; + # CustomBrowserType = 1; + # + #}; + # GUI = { + # ShowTrayIcon = true; + # ApplicationTheme = "dark"; + # }; + # }; + }; # Let Home Manager install and manage itself. programs.home-manager.enable = true; diff --git a/hyprland/binds.nix b/hyprland/binds.nix index fc089b6..9144795 100644 --- a/hyprland/binds.nix +++ b/hyprland/binds.nix @@ -1,35 +1,7 @@ -{ config, pkgs, ... }: - -{ - -imports = [ - ./binds.nix -]; - wayland.windowManager.hyprland = { - "$mod" = "SUPER"; - - bind = [ - "$mod, f, exec, ghostty" - "$mod, d, exec, brave" - "$mod, space, exec, pkill rofi || rofi -show drun" - ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ && notify-send 'Volume Up'" - ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- && notify-send 'Volume Down'" - ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && notify-send 'Mute Toggled'" - ", XF86AudioNext, exec, playerctl next && notify-send 'Next Song'" - ", XF86AudioPrev, exec, playerctl previous && notify-send 'Previous Song'" - ", XF86AudioPlay, exec, playerctl play-pause && notify-send 'Pause/Play Toggled'" - ", XF86AudioStop, exec, playerctl stop && notify-send 'Music Stopped'" - ", F10, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ && notify-send 'Volume Up'" - ", F11, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- && notify-send 'Volume Down'" - ", F9, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && notify-send 'Mute Toggled'" - ", F6, exec, playerctl next && notify-send 'Next Song'" - ", F5, exec, playerctl previous && notify-send 'Previous Song'" - ", F7, exec, playerctl play-pause && notify-send 'Pause/Play Toggled'" - ", F8, exec, playerctl stop && notify-send 'Music Stopped'" - ] - ++ ( +{lib, config, pkgs, ... }: +let # workspaces - builtins.concatLists ( + workspaces =builtins.concatLists ( builtins.genList ( i: let @@ -40,9 +12,71 @@ imports = [ "$mod SHIFT, code:1${toString i}, movetoWorkspace, ${toString ws}" ] ) 9 - ) - ); + ); +in +{ + wayland.windowManager.hyprland.settings = { + + "$mod" = "SUPER"; + + bindm = [ + "$mod, mouse:272, movewindow" + "$mod, mouse:273, resizewindow" + ]; + bind = [ + # compositor commands + "$mod SHIFT, E, exec, pkill Hyprland" + "$mod, W, killactive," + "$mod, Q, killactive," + "$mod, F, fullscreen," + #"$mod, G, togglegroup," + "$mod SHIFT, N, changegroupactive, f" + "$mod SHIFT, P, changegroupactive, b" + "$mod, R, togglesplit," + "$mod, T, togglefloating," + "$mod, P, pseudo," + "$mod ALT, ,resizeactive," + + "$mod, left, movefocus, l" + "$mod, right, movefocus, r" + "$mod, up, movefocus, u" + "$mod, down, movefocus, d" + "$mod, h, movefocus, l" + "$mod, l, movefocus, r" + "$mod, k, movefocus, u" + "$mod, j, movefocus, d" + + "$mod SHIFT, left, movewindow, l" + "$mod SHIFT, right, movewindow, r" + "$mod SHIFT, up, movewindow, u" + "$mod SHIFT, down, movewindow, d" + "$mod SHIFT, h, movewindow, l" + "$mod SHIFT, l, movewindow, r" + "$mod SHIFT, k, movewindow, u" + "$mod SHIFT, j, movewindow, d" + + "$mod, g, exec, ghostty" + "$mod, b, exec, brave" + "$mod, space, exec, pkill rofi || rofi -show drun" + ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ && notify-send 'Volume Up'" + ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- && notify-send 'Volume Down'" + ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && notify-send 'Mute Toggled'" + ", XF86AudioNext, exec, playerctl next && notify-send 'Next Song'" + ", XF86AudioPrev, exec, playerctl previous && notify-send 'Previous Song'" + ", XF86AudioPlay, exec, playerctl play-pause && notify-send 'Pause/Play Toggled'" + ", XF86AudioStop, exec, playerctl stop && notify-send 'Music Stopped'" + ", F10, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ && notify-send 'Volume Up'" + ", F11, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- && notify-send 'Volume Down'" + ", F9, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && notify-send 'Mute Toggled'" + ", F6, exec, playerctl next && notify-send 'Next Song'" + ", F5, exec, playerctl previous && notify-send 'Previous Song'" + ", F7, exec, playerctl play-pause && notify-send 'Pause/Play Toggled'" + ", F8, exec, playerctl stop && notify-send 'Music Stopped'" + ] +++ workspaces; + + }; - }; + } + -} diff --git a/hyprland/hyprland.nix b/hyprland/hyprland.nix index f44a62a..2a9e06f 100644 --- a/hyprland/hyprland.nix +++ b/hyprland/hyprland.nix @@ -1,10 +1,10 @@ { config, pkgs, ... }: { - -imports = [ - ./binds.nix -]; + + imports = [ + ./binds.nix + ]; wayland.windowManager.hyprland = { enable = true; settings = { @@ -31,6 +31,8 @@ imports = [ "8, monitor:DP-2" "9, monitor:DP-2" "0, monitor:DP-2" + "w[tv1], gapsout:0, gapsin:0" + "f[1], gapsout:0, gapsin:0" ]; exec-once = [ "xrandr --output DP-3 --primary" @@ -44,7 +46,13 @@ imports = [ windowrule = [ "workspace 7 silent, class:(discord)" "workspace 8 silent, class:(steam)" + "bordersize 0, floating:0, onworkspace:w[tv1]" + "rounding 0, floating:0, onworkspace:w[tv1]" + "bordersize 0, floating:0, onworkspace:f[1]" + "rounding 0, floating:0, onworkspace:f[1]" ]; + + }; }; diff --git a/mpd.nix b/mpd.nix index fa8f5e6..176600e 100644 --- a/mpd.nix +++ b/mpd.nix @@ -6,7 +6,6 @@ playlistDirectory = "${config.home.homeDirectory}/.playlists"; extraConfig = '' auto_update "yes" - restore_paused "yes" ''; }; }