From 8173478b1e2b798793bf7b791efec57bf4edfef1 Mon Sep 17 00:00:00 2001 From: poslop Date: Fri, 7 Nov 2025 15:47:28 -0600 Subject: [PATCH] reorg hyprland and start config --- flake.lock | 25 +-- flake.nix | 1 + hosts/nixos-vm2/configuration.nix | 3 - modules/core/packages.nix | 18 +- modules/core/zsh/zsh.nix | 4 - modules/home/hyprland/default.nix | 2 +- modules/home/hyprland/hypr/hyprland.conf | 238 +++++++++++++++++++++++ modules/home/hyprland/hyprland.nix | 11 +- modules/home/hyprland/monitor.nix | 1 - modules/home/packages.nix | 9 - 10 files changed, 264 insertions(+), 48 deletions(-) create mode 100644 modules/home/hyprland/hypr/hyprland.conf delete mode 100644 modules/home/hyprland/monitor.nix diff --git a/flake.lock b/flake.lock index 26e2a75..d17fef7 100644 --- a/flake.lock +++ b/flake.lock @@ -144,7 +144,9 @@ }, "hjem-rum": { "inputs": { - "hjem": "hjem_2", + "hjem": [ + "hjem" + ], "ndg": "ndg", "nixpkgs": [ "nixpkgs" @@ -165,27 +167,6 @@ "type": "github" } }, - "hjem_2": { - "inputs": { - "nixpkgs": [ - "hjem-rum", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1746355589, - "narHash": "sha256-LguszqsDBTtdBxblQTtN7vOAYmfoe43aHkB8aK1dChE=", - "owner": "feel-co", - "repo": "hjem", - "rev": "77b37eeb583d43e1c723119a69c906235174ce57", - "type": "github" - }, - "original": { - "owner": "feel-co", - "repo": "hjem", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 9fc6f0a..3ed72b7 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,7 @@ hjem-rum = { url = "github:snugnug/hjem-rum"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.hjem.follows = "hjem"; }; zen-browser = { diff --git a/hosts/nixos-vm2/configuration.nix b/hosts/nixos-vm2/configuration.nix index beba577..866fe4e 100644 --- a/hosts/nixos-vm2/configuration.nix +++ b/hosts/nixos-vm2/configuration.nix @@ -8,9 +8,6 @@ ../../modules ]; - - programs.hyprland.enable = true; - boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/vda"; diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 2c7d6c8..1020c28 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -1,13 +1,17 @@ -{ pkgs, inputs, ... }: +{ pkgs, username, inputs, ... }: { environment.systemPackages = with pkgs; [ - wl-clipboard inputs.nix4nvchad.packages.${system}.nvchad - kitty - vim - wget - git - curl zsh ]; + + hjem.users.${username}.packages = with pkgs; [ + btop + curl + git + neofetch + statix + wget + wl-clipboard + ]; } diff --git a/modules/core/zsh/zsh.nix b/modules/core/zsh/zsh.nix index 3c56f2d..575fac4 100644 --- a/modules/core/zsh/zsh.nix +++ b/modules/core/zsh/zsh.nix @@ -1,8 +1,4 @@ { - # hj.rum.programs.zsh = { - # enable = true; - # }; - hj = { files = { ".zshrc".source = ./.zshrc; diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index 42d1c67..96e5300 100644 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -1,5 +1,5 @@ { imports = [ - #./monitor.nix + ./hyprland.nix ]; } diff --git a/modules/home/hyprland/hypr/hyprland.conf b/modules/home/hyprland/hypr/hyprland.conf new file mode 100644 index 0000000..9f28e6d --- /dev/null +++ b/modules/home/hyprland/hypr/hyprland.conf @@ -0,0 +1,238 @@ +monitor=,preferred,auto,auto + +$terminal = kitty +$fileManager = dolphin +$menu = wofi --show drun + +# exec-once = $terminal +# exec-once = nm-applet & +# exec-once = waybar & hyprpaper & firefox + +env = XCURSOR_SIZE,24 +env = HYPRCURSOR_SIZE,24 + +general { + gaps_in = 5 + gaps_out = 20 + + border_size = 2 + + # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors + col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg + col.inactive_border = rgba(595959aa) + + # Set to true enable resizing windows by clicking and dragging on borders and gaps + resize_on_border = false + + # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on + allow_tearing = false + + layout = dwindle +} + +# https://wiki.hyprland.org/Configuring/Variables/#decoration +decoration { + rounding = 10 + rounding_power = 2 + + # Change transparency of focused and unfocused windows + active_opacity = 1.0 + inactive_opacity = 1.0 + + shadow { + enabled = true + range = 4 + render_power = 3 + color = rgba(1a1a1aee) + } + + # https://wiki.hyprland.org/Configuring/Variables/#blur + blur { + enabled = true + size = 3 + passes = 1 + + vibrancy = 0.1696 + } +} + +# https://wiki.hyprland.org/Configuring/Variables/#animations +animations { + enabled = yes, please :) + + # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more + + bezier = easeOutQuint,0.23,1,0.32,1 + bezier = easeInOutCubic,0.65,0.05,0.36,1 + bezier = linear,0,0,1,1 + bezier = almostLinear,0.5,0.5,0.75,1.0 + bezier = quick,0.15,0,0.1,1 + + animation = global, 1, 10, default + animation = border, 1, 5.39, easeOutQuint + animation = windows, 1, 4.79, easeOutQuint + animation = windowsIn, 1, 4.1, easeOutQuint, popin 87% + animation = windowsOut, 1, 1.49, linear, popin 87% + animation = fadeIn, 1, 1.73, almostLinear + animation = fadeOut, 1, 1.46, almostLinear + animation = fade, 1, 3.03, quick + animation = layers, 1, 3.81, easeOutQuint + animation = layersIn, 1, 4, easeOutQuint, fade + animation = layersOut, 1, 1.5, linear, fade + animation = fadeLayersIn, 1, 1.79, almostLinear + animation = fadeLayersOut, 1, 1.39, almostLinear + animation = workspaces, 1, 1.94, almostLinear, fade + animation = workspacesIn, 1, 1.21, almostLinear, fade + animation = workspacesOut, 1, 1.94, almostLinear, fade +} + +# Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/ +# "Smart gaps" / "No gaps when only" +# uncomment all if you wish to use that. +# workspace = w[tv1], gapsout:0, gapsin:0 +# workspace = f[1], gapsout:0, gapsin:0 +# windowrule = bordersize 0, floating:0, onworkspace:w[tv1] +# windowrule = rounding 0, floating:0, onworkspace:w[tv1] +# windowrule = bordersize 0, floating:0, onworkspace:f[1] +# windowrule = rounding 0, floating:0, onworkspace:f[1] + +# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more +dwindle { + pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below + preserve_split = true # You probably want this +} + +# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more +master { + new_status = master +} + +# https://wiki.hyprland.org/Configuring/Variables/#misc +misc { + force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers + disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :( +} + + +############# +### INPUT ### +############# + +# https://wiki.hyprland.org/Configuring/Variables/#input +input { + kb_layout = us + kb_variant = + kb_model = + kb_options = + kb_rules = + + follow_mouse = 1 + + sensitivity = 0 # -1.0 - 1.0, 0 means no modification. + + touchpad { + natural_scroll = false + } +} + +# https://wiki.hyprland.org/Configuring/Variables/#gestures +gestures { + workspace_swipe = false +} + +# Example per-device config +# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more +device { + name = epic-mouse-v1 + sensitivity = -0.5 +} + + +################### +### KEYBINDINGS ### +################### + +# See https://wiki.hyprland.org/Configuring/Keywords/ +$mainMod = SUPER # Sets "Windows" key as main modifier + +# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more +bind = $mainMod, Return, exec, $terminal +bind = $mainMod, C, killactive, +bind = $mainMod, M, exit, +bind = $mainMod, E, exec, $fileManager +bind = $mainMod, V, togglefloating, +bind = $mainMod, R, exec, $menu +bind = $mainMod, P, pseudo, # dwindle +bind = $mainMod, J, togglesplit, # dwindle + +# 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 + +# Example special workspace (scratchpad) +bind = $mainMod, S, togglespecialworkspace, magic +bind = $mainMod SHIFT, S, movetoworkspace, special:magic + +# 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 + +# Laptop multimedia keys for volume and LCD brightness +bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+ +bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- +bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle +bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle +bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 10%+ +bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 10%- + +# Requires playerctl +bindl = , XF86AudioNext, exec, playerctl next +bindl = , XF86AudioPause, exec, playerctl play-pause +bindl = , XF86AudioPlay, exec, playerctl play-pause +bindl = , XF86AudioPrev, exec, playerctl previous + +############################## +### WINDOWS AND WORKSPACES ### +############################## + +# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more +# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules + +# Example windowrule +# windowrule = float,class:^(kitty)$,title:^(kitty)$ + +# Ignore maximize requests from apps. You'll probably like this. +windowrule = suppressevent maximize, class:.* + +# Fix some dragging issues with XWayland +windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0 diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index b147fd1..9de7508 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -1 +1,10 @@ -{ programs.hyprland.enable = true; } +{ + programs.hyprland.enable = true; + hj = { + rum.programs.hyprland.enable = true; + + files = { + ".config/hypr".source = ./hypr; + }; + }; +} diff --git a/modules/home/hyprland/monitor.nix b/modules/home/hyprland/monitor.nix deleted file mode 100644 index 53a9002..0000000 --- a/modules/home/hyprland/monitor.nix +++ /dev/null @@ -1 +0,0 @@ -{ config.me.rum.programs.hyprland.settings.monitor = [ ", 1920x1080@60, auto, 1" ]; } diff --git a/modules/home/packages.nix b/modules/home/packages.nix index 5e5da14..e6c19f2 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -8,16 +8,7 @@ { hjem.users.${username}.packages = with pkgs; [ inputs.zen-browser.packages."${system}".default - statix - git - zsh - neofetch - btop - wl-clipboard kitty - vim - wget - curl foot ]; }