From 17ce01d6a3d6cbb0dd8a745712a5f6fdb8cdc8dc Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Tue, 10 Dec 2024 21:49:17 +0000 Subject: [PATCH] tweaks and stuff --- flake.nix | 2 +- hosts/common/default.nix | 11 - hosts/common/graphical/default.nix | 1 - users/configs/desktop/default.nix | 1 - users/configs/desktop/hyprland/default.nix | 220 ------------------ users/configs/desktop/hyprland/dingbox.conf | 7 - users/configs/desktop/hyprland/elderbug.conf | 7 - users/configs/desktop/hyprland/macchiato.conf | 30 --- users/configs/desktop/hyprland/pingbox.conf | 75 ------ users/configs/desktop/hyprland/sidon.conf | 10 - users/configs/desktop/sway/default.nix | 4 +- users/daniel/default.nix | 1 + 12 files changed, 5 insertions(+), 364 deletions(-) delete mode 100644 users/configs/desktop/hyprland/default.nix delete mode 100644 users/configs/desktop/hyprland/dingbox.conf delete mode 100644 users/configs/desktop/hyprland/elderbug.conf delete mode 100644 users/configs/desktop/hyprland/macchiato.conf delete mode 100644 users/configs/desktop/hyprland/pingbox.conf delete mode 100644 users/configs/desktop/hyprland/sidon.conf diff --git a/flake.nix b/flake.nix index ec7911e..ff1eb4e 100644 --- a/flake.nix +++ b/flake.nix @@ -160,7 +160,7 @@ scripts = { tidy.exec = '' - alejandra -e ./users/configs/desktop/hyprland/default.nix . + alejandra . ''; }; } diff --git a/hosts/common/default.nix b/hosts/common/default.nix index e9e5e65..234e5cd 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -33,17 +33,6 @@ in { experimental-features = nix-command flakes warn-dirty = false ''; - - settings = { - substituters = [ - "https://hyprland.cachix.org" - ]; - trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; - trusted-users = [ - "root" - "daniel" - ]; - }; }; # Set time zone. diff --git a/hosts/common/graphical/default.nix b/hosts/common/graphical/default.nix index e398161..35a88b0 100644 --- a/hosts/common/graphical/default.nix +++ b/hosts/common/graphical/default.nix @@ -51,7 +51,6 @@ }; programs = { - hyprland.enable = true; sway.enable = true; steam = { diff --git a/users/configs/desktop/default.nix b/users/configs/desktop/default.nix index a4f7f97..d816671 100644 --- a/users/configs/desktop/default.nix +++ b/users/configs/desktop/default.nix @@ -3,7 +3,6 @@ # ./i3 # ./i3status-rust # ./polybar - ./hyprland ./river ./sway ./tofi diff --git a/users/configs/desktop/hyprland/default.nix b/users/configs/desktop/hyprland/default.nix deleted file mode 100644 index 7433d46..0000000 --- a/users/configs/desktop/hyprland/default.nix +++ /dev/null @@ -1,220 +0,0 @@ -{ - config, - lib, - pkgs, - hostname, - ... -}: let - closer = pkgs.writeShellApplication { - name = "closer"; - - runtimeInputs = with pkgs; [jq xdotool]; - - text = '' - if [ "$(hyprctl activewindow -j | jq -r ".class")" = "Steam" ]; then - xdotool getactivewindow windowunmap - else - hyprctl dispatch killactive "" - fi - ''; - }; -in { - home.packages = with pkgs; [ - swaybg - ]; - - home.file = { - ".config/hypr/macchiato.conf" = { - source = ./macchiato.conf; - }; - }; - - services.blueman-applet.enable = true; - - wayland.windowManager.hyprland = { - enable = true; - package = pkgs.hyprland; - xwayland = { - enable = true; - }; - extraConfig = - (builtins.readFile ./${hostname}.conf) - + '' - # See https://wiki.hyprland.org/Configuring/Keywords/ for more - - # Execute your favorite apps at launch - exec-once = waybar - exec-once = swaybg -i ~/wallpapers/wallpaper.jpg - - # Source a file (multi-file configs) - # source = ~/.config/hypr/myColors.conf - source = ./macchiato.conf - - # For all categories, see https://wiki.hyprland.org/Configuring/Variables/ - input { - kb_layout = gb - kb_variant = - kb_model = - kb_options = caps:escape - kb_rules = - - follow_mouse = 2 - - touchpad { - natural_scroll = yes - middle_button_emulation = yes - scroll_factor = 0.5 - } - - accel_profile = flat - sensitivity = 0.5 # -1.0 - 1.0, 0 means no modification. - } - - general { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - - gaps_in = 5 - gaps_out = 10 - border_size = 2 - col.active_border = $green - col.inactive_border = rgba(595959aa) - - layout = dwindle - } - - decoration { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - - rounding = 10 - blur { - enabled = true - size = 3 - passes = 1 - } - - drop_shadow = yes - shadow_range = 4 - shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) - - dim_inactive = true - dim_strength = 0.1 - } - - animations { - enabled = yes - - # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more - - bezier = myBezier, 0.05, 0.9, 0.1, 1.05 - - animation = windows, 1, 1, myBezier - animation = windowsOut, 1, 2, default, popin 80% - animation = border, 0, 2, default - animation = borderangle, 0, 2, default - animation = fade, 0, 2, default - animation = workspaces, 1, 1, default - } - - dwindle { - # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more - pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below - preserve_split = yes # you probably want this - } - - master { - # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more - new_is_master = true - } - - gestures { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - workspace_swipe = true - workspace_swipe_fingers = 4 - } - - misc { - disable_hyprland_logo = true - } - - xwayland { - force_zero_scaling = true - } - - # Example windowrule v1 - # windowrule = float, ^(kitty)$ - # Example windowrule v2 - # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ - # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more - - # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more - bind = $mainMod, return, exec, kitty - bind = $mainMod, Q, exec, ${closer}/bin/closer - bind = $mainMod, D, exec, tofi-drun --drun-launch=true - bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" - - bind = $mainMod SHIFT, P, exit - - # Move focus with mainMod + vim keys - bind = $mainMod, H, movefocus, l - bind = $mainMod, L, movefocus, r - bind = $mainMod, K, movefocus, u - bind = $mainMod, J, movefocus, d - - # Move focus with mainMod + vim keys - bind = $mainMod, left, movewindow, l - bind = $mainMod, right, movewindow, r - bind = $mainMod, up, movewindow, u - bind = $mainMod, down, movewindow, d - - # Switch workspaces with mainMod + [0-9] - bind = $mainMod, 1, workspace, 1 - bind = $mainMod, 2, workspace, 2 - bind = $mainMod, 3, workspace, 3 - bind = $mainMod, 4, workspace, 4 - bind = $mainMod, 5, workspace, 5 - bind = $mainMod, 6, workspace, 6 - bind = $mainMod, 7, workspace, 7 - bind = $mainMod, 8, workspace, 8 - bind = $mainMod, 9, workspace, 9 - bind = $mainMod, 0, workspace, 10 - - # Move active window to a workspace with mainMod + SHIFT + [0-9] - bind = $mainMod SHIFT, 1, movetoworkspace, 1 - bind = $mainMod SHIFT, 2, movetoworkspace, 2 - bind = $mainMod SHIFT, 3, movetoworkspace, 3 - bind = $mainMod SHIFT, 4, movetoworkspace, 4 - bind = $mainMod SHIFT, 5, movetoworkspace, 5 - bind = $mainMod SHIFT, 6, movetoworkspace, 6 - bind = $mainMod SHIFT, 7, movetoworkspace, 7 - bind = $mainMod SHIFT, 8, movetoworkspace, 8 - bind = $mainMod SHIFT, 9, movetoworkspace, 9 - bind = $mainMod SHIFT, 0, movetoworkspace, 10 - - bind = $mainMod, U, movetoworkspace, -1 - bind = $mainMod, I, movetoworkspace, +1 - - bind = $mainMod SHIFT, space, togglefloating, - - bind = $mainMod, F, fullscreen, - - bind=$mainMod, escape, exec, swaylock -i ~/wallpapers/lock.png - - binde=, XF86AudioLowerVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%- - bind=, XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle - binde=, XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%+ - - binde=, XF86MonBrightnessUp, exec, xbacklight -inc 10 - binde=, XF86MonBrightnessDown, exec, xbacklight -dec 10 - - # Move/resize windows with mainMod + LMB/RMB and dragging - bindm = $mainMod, mouse:272, movewindow - bindm = $mainMod, mouse:273, resizewindow - bind = $mainMod, mouse:274, togglefloating - ''; - }; - - services.mako = { - enable = true; - }; -} diff --git a/users/configs/desktop/hyprland/dingbox.conf b/users/configs/desktop/hyprland/dingbox.conf deleted file mode 100644 index 1e26a0a..0000000 --- a/users/configs/desktop/hyprland/dingbox.conf +++ /dev/null @@ -1,7 +0,0 @@ -monitor=,preferred,auto,1.25 - -$mainMod = CTRL + SHIFT + ALT - -bind = $mainMod + SUPER, Q, exit, -bind = $mainMod, M, workspace, -1 -bind = $mainMod, comma, workspace, +1 diff --git a/users/configs/desktop/hyprland/elderbug.conf b/users/configs/desktop/hyprland/elderbug.conf deleted file mode 100644 index 1e26a0a..0000000 --- a/users/configs/desktop/hyprland/elderbug.conf +++ /dev/null @@ -1,7 +0,0 @@ -monitor=,preferred,auto,1.25 - -$mainMod = CTRL + SHIFT + ALT - -bind = $mainMod + SUPER, Q, exit, -bind = $mainMod, M, workspace, -1 -bind = $mainMod, comma, workspace, +1 diff --git a/users/configs/desktop/hyprland/macchiato.conf b/users/configs/desktop/hyprland/macchiato.conf deleted file mode 100644 index 480559f..0000000 --- a/users/configs/desktop/hyprland/macchiato.conf +++ /dev/null @@ -1,30 +0,0 @@ -$rosewater = 0xfff4dbd6 -$flamingo = 0xfff0c6c6 -$pink = 0xfff5bde6 -$mauve = 0xffc6a0f6 -$red = 0xffed8796 -$maroon = 0xffee99a0 -$peach = 0xfff5a97f -$yellow = 0xffeed49f -$green = 0xffa6da95 -$teal = 0xff8bd5ca -$sky = 0xff91d7e3 -$sapphire = 0xff7dc4e4 -$blue = 0xff8aadf4 -$lavender = 0xffb7bdf8 - -$text = 0xffcad3f5 -$subtext1 = 0xffb8c0e0 -$subtext0 = 0xffa5adcb - -$overlay2 = 0xff939ab7 -$overlay1 = 0xff8087a2 -$overlay0 = 0xff6e738d - -$surface2 = 0xff5b6078 -$surface1 = 0xff494d64 -$surface0 = 0xff363a4f - -$base = 0xff24273a -$mantle = 0xff1e2030 -$crust = 0xff181926 diff --git a/users/configs/desktop/hyprland/pingbox.conf b/users/configs/desktop/hyprland/pingbox.conf deleted file mode 100644 index 49a2203..0000000 --- a/users/configs/desktop/hyprland/pingbox.conf +++ /dev/null @@ -1,75 +0,0 @@ -monitor=eDP-1,preferred,auto,1.33 -monitor=,preferred,auto,1.25 - -$mainMod = SUPER - -bind = $mainMod + SHIFT + CTRL, Q, exit, -bind = $mainMod + CTRL, H, workspace, -1 -bind = $mainMod + CTRL, L, workspace, +1 -bind = $mainMod + SHIFT, H, movetoworkspace, -1 -bind = $mainMod + SHIFT, L, movetoworkspace, +1 - -# Add super as an alternative mainMod for when I plug in a keyboard -$altMod = CTRL + SHIFT + ALT - -bind = $altMod + SUPER, Q, exit, -bind = $altMod, M, workspace, -1 -bind = $altMod, comma, workspace, +1 - -# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more -bind = $altMod, return, exec, kitty -bind = $altMod, Q, exec, ${closer}/bin/closer -bind = $altMod, D, exec, tofi-drun --drun-launch=true -bind = $altMod SHIFT, S, exec, grim -g "$(slurp)" - -# Move focus with altMod + vim keys -bind = $altMod, H, movefocus, l -bind = $altMod, L, movefocus, r -bind = $altMod, K, movefocus, u -bind = $altMod, J, movefocus, d - -# Move focus with altMod + vim keys -bind = $altMod, left, movewindow, l -bind = $altMod, right, movewindow, r -bind = $altMod, up, movewindow, u -bind = $altMod, down, movewindow, d - -# Switch workspaces with altMod + [0-9] -bind = $altMod, 1, workspace, 1 -bind = $altMod, 2, workspace, 2 -bind = $altMod, 3, workspace, 3 -bind = $altMod, 4, workspace, 4 -bind = $altMod, 5, workspace, 5 -bind = $altMod, 6, workspace, 6 -bind = $altMod, 7, workspace, 7 -bind = $altMod, 8, workspace, 8 -bind = $altMod, 9, workspace, 9 -bind = $altMod, 0, workspace, 10 - -# Move active window to a workspace with altMod + SHIFT + [0-9] -bind = $altMod SHIFT, 1, movetoworkspace, 1 -bind = $altMod SHIFT, 2, movetoworkspace, 2 -bind = $altMod SHIFT, 3, movetoworkspace, 3 -bind = $altMod SHIFT, 4, movetoworkspace, 4 -bind = $altMod SHIFT, 5, movetoworkspace, 5 -bind = $altMod SHIFT, 6, movetoworkspace, 6 -bind = $altMod SHIFT, 7, movetoworkspace, 7 -bind = $altMod SHIFT, 8, movetoworkspace, 8 -bind = $altMod SHIFT, 9, movetoworkspace, 9 -bind = $altMod SHIFT, 0, movetoworkspace, 10 - -bind = $altMod, U, movetoworkspace, -1 -bind = $altMod, I, movetoworkspace, +1 - -bind = $altMod SHIFT, space, togglefloating, - -bind=$altMod, escape, exec, swaylock -i ~/wallpapers/lock.png - -# Move/resize windows with altMod + LMB/RMB and dragging -bindm = $altMod, mouse:272, movewindow -bindm = $altMod, mouse:273, resizewindow - -general { - gaps_out = 5 -} - diff --git a/users/configs/desktop/hyprland/sidon.conf b/users/configs/desktop/hyprland/sidon.conf deleted file mode 100644 index 31a7ccb..0000000 --- a/users/configs/desktop/hyprland/sidon.conf +++ /dev/null @@ -1,10 +0,0 @@ -monitor=HDMI-A-2,3840x2160@60.0,3072x0,1.25 -monitor=DP-3,3840x2160@59.997002,0x0,1.25 - -workspace=1,monitor:DP-3 - -$mainMod = CTRL + SHIFT + ALT - -bind = $mainMod + SUPER, Q, exit, -bind = $mainMod, M, workspace, -1 -bind = $mainMod, comma, workspace, +1 diff --git a/users/configs/desktop/sway/default.nix b/users/configs/desktop/sway/default.nix index c06421c..b70b898 100644 --- a/users/configs/desktop/sway/default.nix +++ b/users/configs/desktop/sway/default.nix @@ -36,7 +36,7 @@ in { }; "type:pointer" = { accel_profile = "flat"; - pointer_accel = "-0.2"; + pointer_accel = "0.1"; }; }; output = { @@ -64,7 +64,9 @@ in { "${mod}+Shift+s" = "exec grim -g \"$(slurp)\""; "${mod}+Shift+Space" = "floating toggle"; + "${hyper}+Shift+Space" = "floating toggle"; "${mod}+Space" = "focus mode_toggle"; + # "${hyper}+Space" = "focus mode_toggle"; "${mod}+h" = "focus left"; "${mod}+j" = "focus down"; diff --git a/users/daniel/default.nix b/users/daniel/default.nix index 3c5f03e..a7a9557 100644 --- a/users/daniel/default.nix +++ b/users/daniel/default.nix @@ -31,6 +31,7 @@ gnumake go gopls + jujutsu lua-language-server minisign nb