From f6bacdedbbd5b32f1e4dbb2633ff6cb452277334 Mon Sep 17 00:00:00 2001 From: insert Date: Tue, 16 Apr 2024 17:20:55 -0400 Subject: [PATCH] Make hyprland config system indipendent I hear theres a home-manager module now, might switch to that --- flake.nix | 2 +- home-files.nix | 171 ------------------------------------- special/insertlaptop.nix | 172 ++++++++++++++++++++++++++++++++++++++ special/insertpclinux.nix | 172 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 345 insertions(+), 172 deletions(-) diff --git a/flake.nix b/flake.nix index f5e2824..c5df7d8 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,7 @@ modules = [ flatpaks.nixosModules.default ./configuration.nix - ./special/insertpclinux.nix + ./special/insertlaptop.nix agenix.nixosModules.default home-manager.nixosModules.home-manager { diff --git a/home-files.nix b/home-files.nix index 144df93..829450b 100644 --- a/home-files.nix +++ b/home-files.nix @@ -251,177 +251,6 @@ border-color=#ef9f76''; /*margin-right: 1rem; border-radius: 1rem;*/ }''; - }; - home.file.".config/hypr/hyprland.conf" = { - text = ''autogenerated = 0 # remove this line to remove the warning - -# See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=,1920x1080@60,auto,1 - - -# See https://wiki.hyprland.org/Configuring/Keywords/ for more - -# Execute your favorite apps at launch -# exec-once = waybar & hyprpaper & firefox -source=~/.config/hypr/frappe.conf -# Source a file (multi-file configs) -# source = ~/.config/hypr/myColors.conf - -# Some default env vars. -env = WLR_NO_HARDWARE_CURSORS,1 -env = NIXOS_OZONE_WL,1 -env = KUBECONFIG,/home/insert/Desktop/k3s.yaml -env = QT_QPA_PLATFORMTHEME,qt5ct -env = XCURSOR_THEME,Catppuccin-Frappe-Blue-Cursors -env = XCURSOR_SIZE,24 -exec-once = systemctl --user start polkit-gnome-authentication-agent-1 -#exec-once = hyprctl setcursor Catppuccin-Frappe-Blue-Cursors 24 -exec-once = watch waybar -exec-once = wayvnc 100.120.210.58 -exec-once = mako -exec-once = swww init -exec-once = sleep 5 & swww img /home/insert/Documents/cat-background/background.png -#exec-once = ln -sf $XDG_RUNTIME_DIR/{app/com.discordapp.Discord,}/discord-ipc-0 -exec-once = systemctl --user import-environment PATH -exec-once = systemctl --user restart xdg-desktop-portal.service -# For all categories, see https://wiki.hyprland.org/Configuring/Variables/ -input { - kb_layout = us - kb_variant = - kb_model = - kb_options = - kb_rules = - - follow_mouse = 1 - - touchpad { - natural_scroll = no - } - - sensitivity = 0 # -1.0 - 1.0, 0 means no modification. -} - -general { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - - gaps_in = 5 - gaps_out = 20 - border_size = 2 - #col.active_border = $overlay1 45deg - #col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg - #col.inactive_border = rgba(595959aa) - col.active_border=$pink $mauve 45deg - col.inactive_border=$surface2 - - 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 = $lavender -} - -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, 6, myBezier - animation = windowsOut, 1, 6, default, popin 80% - animation = border, 1, 10, default - animation = borderangle, 1, 8, default - animation = fade, 1, 5, default - animation = workspaces, 1, 4, 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 = off -} - - -# 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 - - -# See https://wiki.hyprland.org/Configuring/Keywords/ for more -$mainMod = ALT - -# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more -bind = $mainMod, Q, exec, kitty zsh -bind = $mainMod, C, killactive, -bind = $mainMod, M, exit, -bind = $mainMod, E, exec, kitty nnn -bind = $mainMod, V, togglefloating, -bind = $mainMod, R, exec, wofi --show drun --allow-images -bind = $mainMod, S, pseudo, # dwindle -bind = $mainMod, J, togglesplit, # dwindle -bind = $mainMod, P, exec, grim -g "$(slurp)" - | wl-copy -# Move focus with mainMod + arrow keys -bind = $mainMod, left, movefocus, l -bind = $mainMod, right, movefocus, r -bind = $mainMod, up, movefocus, u -bind = $mainMod, down, movefocus, 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 - -# Scroll through existing workspaces with mainMod + scroll -bind = $mainMod, mouse_down, workspace, e+1 -bind = $mainMod, mouse_up, workspace, e-1 - -# Move/resize windows with mainMod + LMB/RMB and dragging -bindm = $mainMod, mouse:272, movewindow -bindm = $mainMod, mouse:273, resizewindow''; }; home.file.".config/hypr/frappe.conf" = { text = ''$rosewaterAlpha = f2d5cf diff --git a/special/insertlaptop.nix b/special/insertlaptop.nix index 3bf2637..094902f 100644 --- a/special/insertlaptop.nix +++ b/special/insertlaptop.nix @@ -1,4 +1,176 @@ { inputs, config, lib, pkgs, ... }: { networking.hostName = "insertlaptop"; + + home-manager.users.insert.home.file.".config/hypr/hyprland.conf" = { + text = ''autogenerated = 0 # remove this line to remove the warning + +# See https://wiki.hyprland.org/Configuring/Monitors/ +monitor=,1536x1024,auto,1 + + +# See https://wiki.hyprland.org/Configuring/Keywords/ for more + +# Execute your favorite apps at launch +# exec-once = waybar & hyprpaper & firefox +source=~/.config/hypr/frappe.conf +# Source a file (multi-file configs) +# source = ~/.config/hypr/myColors.conf + +# Some default env vars. +env = WLR_NO_HARDWARE_CURSORS,1 +env = NIXOS_OZONE_WL,1 +env = KUBECONFIG,/home/insert/Desktop/k3s.yaml +env = QT_QPA_PLATFORMTHEME,qt5ct +env = XCURSOR_THEME,Catppuccin-Frappe-Blue-Cursors +env = XCURSOR_SIZE,24 +exec-once = systemctl --user start polkit-gnome-authentication-agent-1 +#exec-once = hyprctl setcursor Catppuccin-Frappe-Blue-Cursors 24 +exec-once = watch waybar +exec-once = wayvnc 100.120.210.58 +exec-once = mako +exec-once = swww init +exec-once = sleep 5 & swww img /home/insert/Documents/cat-background/background.png +#exec-once = ln -sf $XDG_RUNTIME_DIR/{app/com.discordapp.Discord,}/discord-ipc-0 +exec-once = systemctl --user import-environment PATH +exec-once = systemctl --user restart xdg-desktop-portal.service +# For all categories, see https://wiki.hyprland.org/Configuring/Variables/ +input { + kb_layout = us + kb_variant = + kb_model = + kb_options = + kb_rules = + + follow_mouse = 1 + + touchpad { + natural_scroll = no + } + + sensitivity = 0 # -1.0 - 1.0, 0 means no modification. +} + +general { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + + gaps_in = 5 + gaps_out = 20 + border_size = 2 + #col.active_border = $overlay1 45deg + #col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg + #col.inactive_border = rgba(595959aa) + col.active_border=$pink $mauve 45deg + col.inactive_border=$surface2 + + 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 = $lavender +} + +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, 6, myBezier + animation = windowsOut, 1, 6, default, popin 80% + animation = border, 1, 10, default + animation = borderangle, 1, 8, default + animation = fade, 1, 5, default + animation = workspaces, 1, 4, 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 = off +} + + +# 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 + + +# See https://wiki.hyprland.org/Configuring/Keywords/ for more +$mainMod = SUPER + +# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more +bind = $mainMod, Q, exec, kitty zsh +bind = $mainMod, C, killactive, +bind = $mainMod, M, exit, +bind = $mainMod, E, exec, kitty nnn +bind = $mainMod, V, togglefloating, +bind = $mainMod, R, exec, wofi --show drun --allow-images +bind = $mainMod, S, pseudo, # dwindle +bind = $mainMod, J, togglesplit, # dwindle +bind = $mainMod, P, exec, grim -g "$(slurp)" - | wl-copy +# Move focus with mainMod + arrow keys +bind = $mainMod, left, movefocus, l +bind = $mainMod, right, movefocus, r +bind = $mainMod, up, movefocus, u +bind = $mainMod, down, movefocus, 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 + +# Scroll through existing workspaces with mainMod + scroll +bind = $mainMod, mouse_down, workspace, e+1 +bind = $mainMod, mouse_up, workspace, e-1 + +# Move/resize windows with mainMod + LMB/RMB and dragging +bindm = $mainMod, mouse:272, movewindow +bindm = $mainMod, mouse:273, resizewindow''; + }; } \ No newline at end of file diff --git a/special/insertpclinux.nix b/special/insertpclinux.nix index 0caf08d..a6e677b 100644 --- a/special/insertpclinux.nix +++ b/special/insertpclinux.nix @@ -46,4 +46,176 @@ /home/insert/Documents/nextcloud/nextcloudinternal.pem /home/insert/Documents/personal-vaultwarden/cert.pem ]; + + home-manager.users.insert.home.file.".config/hypr/hyprland.conf" = { + text = ''autogenerated = 0 # remove this line to remove the warning + +# See https://wiki.hyprland.org/Configuring/Monitors/ +monitor=,1920x1080@60,auto,1 + + +# See https://wiki.hyprland.org/Configuring/Keywords/ for more + +# Execute your favorite apps at launch +# exec-once = waybar & hyprpaper & firefox +source=~/.config/hypr/frappe.conf +# Source a file (multi-file configs) +# source = ~/.config/hypr/myColors.conf + +# Some default env vars. +env = WLR_NO_HARDWARE_CURSORS,1 +env = NIXOS_OZONE_WL,1 +env = KUBECONFIG,/home/insert/Desktop/k3s.yaml +env = QT_QPA_PLATFORMTHEME,qt5ct +env = XCURSOR_THEME,Catppuccin-Frappe-Blue-Cursors +env = XCURSOR_SIZE,24 +exec-once = systemctl --user start polkit-gnome-authentication-agent-1 +#exec-once = hyprctl setcursor Catppuccin-Frappe-Blue-Cursors 24 +exec-once = watch waybar +exec-once = wayvnc 100.120.210.58 +exec-once = mako +exec-once = swww init +exec-once = sleep 5 & swww img /home/insert/Documents/cat-background/background.png +#exec-once = ln -sf $XDG_RUNTIME_DIR/{app/com.discordapp.Discord,}/discord-ipc-0 +exec-once = systemctl --user import-environment PATH +exec-once = systemctl --user restart xdg-desktop-portal.service +# For all categories, see https://wiki.hyprland.org/Configuring/Variables/ +input { + kb_layout = us + kb_variant = + kb_model = + kb_options = + kb_rules = + + follow_mouse = 1 + + touchpad { + natural_scroll = no + } + + sensitivity = 0 # -1.0 - 1.0, 0 means no modification. +} + +general { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + + gaps_in = 5 + gaps_out = 20 + border_size = 2 + #col.active_border = $overlay1 45deg + #col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg + #col.inactive_border = rgba(595959aa) + col.active_border=$pink $mauve 45deg + col.inactive_border=$surface2 + + 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 = $lavender +} + +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, 6, myBezier + animation = windowsOut, 1, 6, default, popin 80% + animation = border, 1, 10, default + animation = borderangle, 1, 8, default + animation = fade, 1, 5, default + animation = workspaces, 1, 4, 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 = off +} + + +# 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 + + +# See https://wiki.hyprland.org/Configuring/Keywords/ for more +$mainMod = ALT + +# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more +bind = $mainMod, Q, exec, kitty zsh +bind = $mainMod, C, killactive, +bind = $mainMod, M, exit, +bind = $mainMod, E, exec, kitty nnn +bind = $mainMod, V, togglefloating, +bind = $mainMod, R, exec, wofi --show drun --allow-images +bind = $mainMod, S, pseudo, # dwindle +bind = $mainMod, J, togglesplit, # dwindle +bind = $mainMod, P, exec, grim -g "$(slurp)" - | wl-copy +# Move focus with mainMod + arrow keys +bind = $mainMod, left, movefocus, l +bind = $mainMod, right, movefocus, r +bind = $mainMod, up, movefocus, u +bind = $mainMod, down, movefocus, 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 + +# Scroll through existing workspaces with mainMod + scroll +bind = $mainMod, mouse_down, workspace, e+1 +bind = $mainMod, mouse_up, workspace, e-1 + +# Move/resize windows with mainMod + LMB/RMB and dragging +bindm = $mainMod, mouse:272, movewindow +bindm = $mainMod, mouse:273, resizewindow''; + }; } \ No newline at end of file