From 77d6f4cdd222369fb845ab6221b5449486bf31c4 Mon Sep 17 00:00:00 2001 From: Dragyx <66752602+Dragyx@users.noreply.github.com> Date: Sun, 14 Apr 2024 18:53:25 +0200 Subject: [PATCH] move personal hyprland settings to dragyx/flocke --- hosts/dragyx/common/configuration.nix | 6 ++ hosts/dragyx/common/default.nix | 9 ++ hosts/dragyx/common/hyprland.nix | 143 ++++++++++++++++++++++++++ hosts/dragyx/flocke/configuration.nix | 7 +- hosts/dragyx/flocke/packages.nix | 3 - modules/gui/WM/hyprland.nix | 123 +--------------------- 6 files changed, 164 insertions(+), 127 deletions(-) create mode 100644 hosts/dragyx/common/configuration.nix create mode 100644 hosts/dragyx/common/default.nix create mode 100644 hosts/dragyx/common/hyprland.nix diff --git a/hosts/dragyx/common/configuration.nix b/hosts/dragyx/common/configuration.nix new file mode 100644 index 0000000..f632a09 --- /dev/null +++ b/hosts/dragyx/common/configuration.nix @@ -0,0 +1,6 @@ +{ config, pkgs, ... }: + +{ + + +} diff --git a/hosts/dragyx/common/default.nix b/hosts/dragyx/common/default.nix new file mode 100644 index 0000000..1bbad98 --- /dev/null +++ b/hosts/dragyx/common/default.nix @@ -0,0 +1,9 @@ +_: { + imports = [ + ./configuration.nix + ./packages.nix + ./hyprland.nix + ]; + + +} diff --git a/hosts/dragyx/common/hyprland.nix b/hosts/dragyx/common/hyprland.nix new file mode 100644 index 0000000..66701dd --- /dev/null +++ b/hosts/dragyx/common/hyprland.nix @@ -0,0 +1,143 @@ +{ config, pkgs, ... }: + +with lib; +let + username = config.modules.other.system.username; + cfg = config.modules.WM.hyprland; + +{ + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + rofi + waybar + hyprpaper + hyprlock + hyprland + hyprshade + lxqt.lxqt-openssh-askpass + + dunst + # wireplumber + pciutils # lspci is needed by hyprland + dunst + swww + flameshot + ]; + + # hyprland settings + home-manager.users.${username} = { + + + programs.hyprland.settings = { + input = { + kb_layout = "us"; + natural_scroll = true; + sensitivity = 0; + }; + general = { + gaps_in = 2; + gaps_out = 1; + border_size = 1; + "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg"; + "col.inactive_border" = "rgba(595959aa)"; + layout = "dwindle"; + }; + decoration.rounding = 5; + misc.disable_hyprland_logo = true; + animations = { + enabled = true; + # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more + + bezier = ["myBezier, 0.05, 0.9, 0.1, 1.05"]; + + animation = [ + "windowsOut, 1, 7, default, popin 80%" + "border, 1, 10, default" + "borderangle, 1, 8, default" + "fade, 1, 7, default" + "workspaces, 1, 6, default" + "windows, 1, 7, myBezier" + ]; + }; + gestures.workspace_swipe = true; + debug.enable_stdout_logs = true; + bind = [ + # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more + "SUPER, RETURN, exec, alacritty" + "SUPER SHIFT, RETURN, exec, rofi -show drun" + "SUPER SHIFT, Q, killactive," + "SUPER, M, exit, " + "SUPER, B, exec, firefox" + "SUPER, f, fullscreen" + "SUPER, E, exec, nautilus --new-window " + "SUPER, V, togglefloating, " + "SUPER, P, pseudo, # dwindle" + "SUPER, S, togglesplit, # dwindle" + "SUPER, C, exec, /home/vali/.config/wallpaper/colorscheme-setter" + ",PRINT, exec, flameshot" + + + # Move focus with mainMod + arrow keys" + "SUPER, h, movefocus, l" + "SUPER, l, movefocus, r" + "SUPER, k, movefocus, u" + "SUPER, j, movefocus, d" + + # move window to next / previous workspace" + "SUPER CTRL, h, movetoworkspace, -1" + "SUPER CTRL, l, movetoworkspace, +1" + + # move to next / previous workspace" + "SUPER CTRL, h, workspace, -1" + "SUPER CTRL, l, workspace, +1" + + + # Switch workspaces with mainMod + [0-9]" + "SUPER, 1, workspace, 1" + "SUPER, 2, workspace, 2" + "SUPER, 3, workspace, 3" + "SUPER, 4, workspace, 4" + "SUPER, 5, workspace, 5" + "SUPER, 6, workspace, 6" + "SUPER, 7, workspace, 7" + "SUPER, 8, workspace, 8" + "SUPER, 9, workspace, 9" + "SUPER, 0, workspace, 10" + + # Move active window to a workspace with mainMod + SHIFT + [0-9]" + "SUPER SHIFT, 1, movetoworkspace, 1" + "SUPER SHIFT, 2, movetoworkspace, 2" + "SUPER SHIFT, 3, movetoworkspace, 3" + "SUPER SHIFT, 4, movetoworkspace, 4" + "SUPER SHIFT, 5, movetoworkspace, 5" + "SUPER SHIFT, 6, movetoworkspace, 6" + "SUPER SHIFT, 7, movetoworkspace, 7" + "SUPER SHIFT, 8, movetoworkspace, 8" + "SUPER SHIFT, 9, movetoworkspace, 9" + "SUPER SHIFT, 0, movetoworkspace, 10" + + # Scroll through existing workspaces with mainMod + scroll" + "SUPER, mouse_down, workspace, e+1" + "SUPER, mouse_up, workspace, e-1" + + # Move/resize windows with mainMod + LMB/RMB and dragging + "SUPER, mouse:272, movewindow" + # "bindm = SUPER, mouse:273, resizewindow" + ]; + binde = [ + ",XF86MonBrightnessUp, exec, brightnessctl set 10%+" + ",XF86MonBrightnessDown, exec, brightnessctl set 10%-" + # Example volume button that allows press and hold, volume limited to 150%" + ",XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+" + # Example volume button that will activate even while an input inhibitor is active" + ",XF86AudioLowerVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%-" + ",XF86AudioMute, exec, $ wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" + ]; + }; + }; + + + }; + +} diff --git a/hosts/dragyx/flocke/configuration.nix b/hosts/dragyx/flocke/configuration.nix index c626128..f898d40 100644 --- a/hosts/dragyx/flocke/configuration.nix +++ b/hosts/dragyx/flocke/configuration.nix @@ -2,6 +2,7 @@ { imports = [ + ../configuration.nix ../../../options/common/pin-registry.nix ../../../options/common/preserve-system.nix ../../../options/desktop/fonts.nix @@ -106,6 +107,7 @@ # services.xserver.enable = pkgs.lib.mkForce false; security.polkit.enable = true; + home-manager.users."dragyx".home.packages = with pkgs; [ vesktop ]; modules = { other = { @@ -132,11 +134,12 @@ }; }; programs = { - vesktop.enable = true; + vesktop.enable = false; btop.enable = true; mpv.enable = true; schizofox.enable = true; obs.enable = true; + vivado.enable = true; # neovim.enable = true; git = { enable = true; @@ -149,7 +152,7 @@ enable = true; profiling = false; }; - # badneovim.enable = true; + neovim-old.enable = true; }; services = { pipewire.enable = true; diff --git a/hosts/dragyx/flocke/packages.nix b/hosts/dragyx/flocke/packages.nix index 4c43613..ac72b0c 100644 --- a/hosts/dragyx/flocke/packages.nix +++ b/hosts/dragyx/flocke/packages.nix @@ -11,9 +11,6 @@ let in { - imports = [ - ../common/packages.nix - ]; # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ diff --git a/modules/gui/WM/hyprland.nix b/modules/gui/WM/hyprland.nix index a3a45ae..8bcbc06 100644 --- a/modules/gui/WM/hyprland.nix +++ b/modules/gui/WM/hyprland.nix @@ -35,21 +35,6 @@ in home-manager.users.${username} = { home.packages = with pkgs; [ - rofi - waybar - hyprpaper - hyprlock - hyprland - hyprshade - lxqt.lxqt-openssh-askpass - - dunst - # wireplumber - xwayland - pciutils # lspci is needed by hyprland - dunst - swww - flameshot bluetuith brightnessctl # needed for wayland copy / paste support in neovim @@ -61,117 +46,11 @@ in systemd.enable = true; xwayland.enable = true; settings = { - exec-once = [ - "waybar" - ] ++ (if cfg.gnome-keyring then ["${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"] + exec-once = if cfg.gnome-keyring then ["${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"] else []); monitor = map ( m: "${m.device},${builtins.toString m.resolution.x}x${builtins.toString m.resolution.y}@${builtins.toString m.refresh_rate},${builtins.toString m.position.x}x${builtins.toString m.position.y},${builtins.toString m.scale},transform,${builtins.toString m.transform}" ) monitors; #TODO: default value - input = { - kb_layout = "us"; - natural_scroll = true; - sensitivity = 0; - }; - general = { - gaps_in = 2; - gaps_out = 1; - border_size = 1; - "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg"; - "col.inactive_border" = "rgba(595959aa)"; - layout = "dwindle"; - }; - decoration.rounding = 5; - misc.disable_hyprland_logo = true; - animations = { - enabled = true; - # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more - - bezier = ["myBezier, 0.05, 0.9, 0.1, 1.05"]; - - animation = [ - "windowsOut, 1, 7, default, popin 80%" - "border, 1, 10, default" - "borderangle, 1, 8, default" - "fade, 1, 7, default" - "workspaces, 1, 6, default" - "windows, 1, 7, myBezier" - ]; - }; - gestures.workspace_swipe = true; - debug.enable_stdout_logs = true; - bind = [ - # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more - "SUPER, RETURN, exec, alacritty" - "SUPER SHIFT, RETURN, exec, rofi -show drun" - "SUPER SHIFT, Q, killactive," - "SUPER, M, exit, " - "SUPER, B, exec, firefox" - "SUPER, f, fullscreen" - "SUPER, E, exec, nautilus --new-window " - "SUPER, V, togglefloating, " - "SUPER, P, pseudo, # dwindle" - "SUPER, S, togglesplit, # dwindle" - "SUPER, C, exec, /home/vali/.config/wallpaper/colorscheme-setter" - ",PRINT, exec, flameshot" - - - # Move focus with mainMod + arrow keys" - "SUPER, h, movefocus, l" - "SUPER, l, movefocus, r" - "SUPER, k, movefocus, u" - "SUPER, j, movefocus, d" - - # move window to next / previous workspace" - "SUPER CTRL, h, movetoworkspace, -1" - "SUPER CTRL, l, movetoworkspace, +1" - - # move to next / previous workspace" - "SUPER CTRL, h, workspace, -1" - "SUPER CTRL, l, workspace, +1" - - - # Switch workspaces with mainMod + [0-9]" - "SUPER, 1, workspace, 1" - "SUPER, 2, workspace, 2" - "SUPER, 3, workspace, 3" - "SUPER, 4, workspace, 4" - "SUPER, 5, workspace, 5" - "SUPER, 6, workspace, 6" - "SUPER, 7, workspace, 7" - "SUPER, 8, workspace, 8" - "SUPER, 9, workspace, 9" - "SUPER, 0, workspace, 10" - - # Move active window to a workspace with mainMod + SHIFT + [0-9]" - "SUPER SHIFT, 1, movetoworkspace, 1" - "SUPER SHIFT, 2, movetoworkspace, 2" - "SUPER SHIFT, 3, movetoworkspace, 3" - "SUPER SHIFT, 4, movetoworkspace, 4" - "SUPER SHIFT, 5, movetoworkspace, 5" - "SUPER SHIFT, 6, movetoworkspace, 6" - "SUPER SHIFT, 7, movetoworkspace, 7" - "SUPER SHIFT, 8, movetoworkspace, 8" - "SUPER SHIFT, 9, movetoworkspace, 9" - "SUPER SHIFT, 0, movetoworkspace, 10" - - # Scroll through existing workspaces with mainMod + scroll" - "SUPER, mouse_down, workspace, e+1" - "SUPER, mouse_up, workspace, e-1" - - # Move/resize windows with mainMod + LMB/RMB and dragging - "SUPER, mouse:272, movewindow" - # "bindm = SUPER, mouse:273, resizewindow" - ]; - binde = [ - ",XF86MonBrightnessUp, exec, brightnessctl set 10%+" - ",XF86MonBrightnessDown, exec, brightnessctl set 10%-" - # Example volume button that allows press and hold, volume limited to 150%" - ",XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+" - # Example volume button that will activate even while an input inhibitor is active" - ",XF86AudioLowerVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%-" - ",XF86AudioMute, exec, $ wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" - ]; }; }; };