From 7eee9cd4d15e09803147cdc1e30aa6705143be1e Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Sun, 12 Nov 2023 20:54:48 +0100 Subject: [PATCH 1/3] Working on thor --- flake.nix | 2 ++ instances/thor/configuration.nix | 12 ++++++------ modules/nixos/hyprland.nix | 17 +++++++++++++++++ 3 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 modules/nixos/hyprland.nix diff --git a/flake.nix b/flake.nix index fb29d65..0af414d 100644 --- a/flake.nix +++ b/flake.nix @@ -133,6 +133,8 @@ ./modules/nixos/pro_audio.nix ./modules/nixos/kdeconnect.nix + + ./modules/nixos/hyprland.nix ] ++ homeManagerModules ++ [ { home-manager.users.bertof = import ./instances/thor/hm.nix; } ]; diff --git a/instances/thor/configuration.nix b/instances/thor/configuration.nix index 76df938..18b9a3d 100644 --- a/instances/thor/configuration.nix +++ b/instances/thor/configuration.nix @@ -194,12 +194,12 @@ with lib; { # plasma5 = { enable = true; runUsingSystemd = true; useQtScaling = true; }; }; windowManager.bspwm = { enable = true; }; - # displayManager.gdm = { enable = true; }; - displayManager.sddm = { - enable = true; - theme = - "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance"; - }; + displayManager.gdm = { enable = true; }; + # displayManager.sddm = { + # enable = true; + # theme = + # "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance"; + # }; videoDrivers = [ "nvidia" ]; layout = "us,it"; diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix new file mode 100644 index 0000000..29c3684 --- /dev/null +++ b/modules/nixos/hyprland.nix @@ -0,0 +1,17 @@ +{ config, ... }: { + programs.hyprland = { + enable = true; + nvidiaPatches = builtins.elem "nvidia" config.services.xserver.videoDrivers; + xwayland.enable = true; + }; + + environment.sessionVariables = { + WLR_NO_HARDWARE_CURSORS = "1"; + NIXOS_OZONE_WL = "1"; + }; + + hardware = { + opengl.enable = true; + nvidia.modesetting.enable = builtins.elem "nvidia" config.services.xserver.videoDrivers; + }; +} From a4043761de8dc94d6b569f7dfd55db9f6cef84a2 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Sun, 12 Nov 2023 22:49:59 +0100 Subject: [PATCH 2/3] Hyprland lockscreen and rice --- custom/way-lockscreen/default.nix | 36 ++++++ flake.nix | 6 + modules/hm/hyprland.nix | 207 ++++++++++++++++++++++++++++++ modules/nixos/hyprland.nix | 6 + 4 files changed, 255 insertions(+) create mode 100644 custom/way-lockscreen/default.nix create mode 100644 modules/hm/hyprland.nix diff --git a/custom/way-lockscreen/default.nix b/custom/way-lockscreen/default.nix new file mode 100644 index 0000000..e9b2477 --- /dev/null +++ b/custom/way-lockscreen/default.nix @@ -0,0 +1,36 @@ +{ lib +, rice +, roboto +, swaylock-effects +, writeScriptBin +, font ? { + package = roboto; + name = "Roboto"; + } +, palette ? rice.palette.palette { } +, ... +}: +let strPalette = lib.nix-rice.palette.toRgbaShortHex palette; +in writeScriptBin "way-lockscreen" '' + # Using font package ${font.package} + ${swaylock-effects}/bin/swaylock \ + --color="${strPalette.primary.background}" + --inside-ver-color="${strPalette.normal.green}" \ + --inside-wrong-color="${strPalette.normal.red}" \ + --inside-color="${strPalette.normal.black}" \ + --ring-ver-color="${strPalette.bright.green}" \ + --ring-wrong-color="${strPalette.bright.red}" \ + --ring-ver-color="${strPalette.bright.green}" \ + --ring-wrong-color="${strPalette.bright.red}" \ + --ring-color="${strPalette.bright.blue}" \ + --line-uses-ring \ + --key-hl-color="${strPalette.bright.red}" \ + --bs-hl-color="${strPalette.bright.red}" \ + --separator-color="${strPalette.normal.black}" \ + --indicator-radius=120 \ + --indicator-thickness=15 \ + --effect-blur 3x10 \ + --font="${font.name}" \ + --font-size="${toString font.size}" +'' + diff --git a/flake.nix b/flake.nix index 0af414d..1cb4543 100644 --- a/flake.nix +++ b/flake.nix @@ -43,6 +43,7 @@ clipedit = self.callPackage ./custom/clipedit { }; update-background = self.callPackage ./custom/update-background { backgrounds_directory = "$HOME/Immagini/Sfondi/1080+/1440+"; }; lockscreen = self.callPackage ./custom/lockscreen { palette = self.rice.colorPalette; font = self.rice.font.normal; }; + way-lockscreen = self.callPackage ./custom/way-lockscreen { palette = self.rice.colorPalette; font = self.rice.font.normal; }; sddm-theme-clairvoyance = self.callPackage ./custom/sddm-theme-clairvoyance { wallpaper = ./wallpapers/background.jpg; }; keyboard-switch = self.callPackage ./custom/keyboard-switch { }; sddm-sugar-dark = self.callPackage ./custom/sddm-sugar-dark { }; @@ -135,6 +136,11 @@ ./modules/nixos/kdeconnect.nix ./modules/nixos/hyprland.nix + { + home-manager.users.bertof.imports = [ + ./modules/hm/hyprland.nix + ]; + } ] ++ homeManagerModules ++ [ { home-manager.users.bertof = import ./instances/thor/hm.nix; } ]; diff --git a/modules/hm/hyprland.nix b/modules/hm/hyprland.nix new file mode 100644 index 0000000..d3c6834 --- /dev/null +++ b/modules/hm/hyprland.nix @@ -0,0 +1,207 @@ +{ pkgs, ... }: { + + imports = [ + ./kitty.nix + ./terminator.nix + ./nemo.nix + ./yazi.nix + ]; + + home.packages = builtins.attrValues { inherit (pkgs) wofi swaylock way-lockscreen wlogout; }; + + # wayland.windowManager.hyprland = { }; + + + xdg.configFile."hypr/hyprland.conf".text = + let + ya = pkgs.writeShellScript "ya" '' + tmp="$(mktemp -t "yazi-cwd.XXXXX")" + yazi --cwd-file="$tmp" + if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then + cd -- "$cwd" + fi + rm -f -- "$tmp" + ''; + in + '' + ######################################################################################## + AUTOGENERATED HYPR CONFIG. + PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT, + OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS. + ######################################################################################## + + # + # Please note not all available settings / options are set here. + # For a full list, see the wiki + # + + autogenerated = 0 # remove this line to remove the warning + + # See https://wiki.hyprland.org/Configuring/Monitors/ + # monitor=name,resolution,position,scale + monitor,preferred,auto,auto + monitor=DP-2,preferred,1080x420,1 + monitor=HDMI-A-1,preferred,auto,auto,transform,3 + + + # See https://wiki.hyprland.org/Configuring/Keywords/ for more + + # Execute your favorite apps at launch + # exec-once = waybar & hyprpaper & firefox + + # Source a file (multi-file configs) + # source = ~/.config/hypr/myColors.conf + + # Some default env vars. + env = XCURSOR_SIZE,24 + + # 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 = rgba(33ccffee) rgba(00ff99ee) 45deg + col.inactive_border = rgba(595959aa) + + layout = dwindle + } + + decoration { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + + rounding = 10 + blur = yes + blur_size = 3 + blur_passes = 1 + blur_new_optimizations = on + + drop_shadow = yes + shadow_range = 4 + shadow_render_power = 3 + col.shadow = rgba(1a1a1aee) + } + + 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, 7, myBezier + animation = windowsOut, 1, 7, default, popin 80% + animation = border, 1, 10, default + animation = borderangle, 1, 8, default + animation = fade, 1, 7, default + animation = workspaces, 1, 6, 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 per-device config + # See https://wiki.hyprland.org/Configuring/Keywords/#executing for more + device:epic-mouse-v1 { + sensitivity = -0.5 + } + + # 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 = SUPER, Q, exec, kitty + bind = SUPER, RETURN, exec, kitty + bind = SUPER, C, killactive, + bind = SUPER, M, exec, way-lockscreen + bind = SUPER_ALT_L, Q, exit, + bind = SUPER, E, exec, kitty -e bash ${ya} + bind = SUPER_SHIFT, E, exec, nemo + bind = SUPER, V, togglefloating, + bind = SUPER_SHIFT, R, exec, wofi --show drun --allow-images -D key_expand=Tab -M=fuzzy -i + bind = SUPER, SPACE, exec, wofi --show drun --allow-images -D key_expand=Tab -M=fuzzy -i + bind = SUPER, P, pseudo, # dwindle + bind = SUPER, J, togglesplit, # dwindle + + # Move focus to relative position + bind = SUPER, H, movefocus, l + bind = SUPER, L, movefocus, r + bind = SUPER, K, movefocus, u + bind = SUPER, J, movefocus, d + + # Move window to relative position + bind = SUPER_SHIFT, H, movewindow, l + bind = SUPER_SHIFT, L, movewindow, r + bind = SUPER_SHIFT, K, movewindow, u + bind = SUPER_SHIFT, J, movewindow, d + + # Switch workspaces with mainMod + [0-9] + bind = SUPER, 1, workspace, 1 + bind = SUPER, 2, workspace, 2 + bind = SUPER, 3, workspace, 3 + bind = SUPER, 4, workspace, 4 + bind = SUPER, 5, workspace, 5 + bind = SUPER, 6, workspace, 6 + bind = SUPER, 7, workspace, 7 + bind = SUPER, 8, workspace, 8 + bind = SUPER, 9, workspace, 9 + bind = SUPER, 0, workspace, 10 + + # Move active window to a workspace with mainMod + SHIFT + [0-9] + bind = SUPER SHIFT, 1, movetoworkspace, 1 + bind = SUPER SHIFT, 2, movetoworkspace, 2 + bind = SUPER SHIFT, 3, movetoworkspace, 3 + bind = SUPER SHIFT, 4, movetoworkspace, 4 + bind = SUPER SHIFT, 5, movetoworkspace, 5 + bind = SUPER SHIFT, 6, movetoworkspace, 6 + bind = SUPER SHIFT, 7, movetoworkspace, 7 + bind = SUPER SHIFT, 8, movetoworkspace, 8 + bind = SUPER SHIFT, 9, movetoworkspace, 9 + bind = SUPER SHIFT, 0, movetoworkspace, 10 + + # Scroll through existing workspaces with mainMod + scroll + bind = SUPER, mouse_down, workspace, e+1 + bind = SUPER, mouse_up, workspace, e-1 + + # Move/resize windows with mainMod + LMB/RMB and dragging + bindm = SUPER, mouse:272, movewindow + bindm = SUPER, mouse:273, resizewindow + ''; +} diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix index 29c3684..84565ba 100644 --- a/modules/nixos/hyprland.nix +++ b/modules/nixos/hyprland.nix @@ -14,4 +14,10 @@ opengl.enable = true; nvidia.modesetting.enable = builtins.elem "nvidia" config.services.xserver.videoDrivers; }; + + security.pam.services.swaylock = { + text = '' + auth include login + ''; + }; } From 8b7964a8b5906bdcfe3f03e9786e92f8320efe6c Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Sun, 12 Nov 2023 23:41:11 +0100 Subject: [PATCH 3/3] Hyprland: better gaps --- modules/hm/hyprland.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/modules/hm/hyprland.nix b/modules/hm/hyprland.nix index d3c6834..15c7b35 100644 --- a/modules/hm/hyprland.nix +++ b/modules/hm/hyprland.nix @@ -14,6 +14,7 @@ xdg.configFile."hypr/hyprland.conf".text = let + strPalette = pkgs.lib.nix-rice.palette.toRgbaShortHex pkgs.rice.colorPalette; ya = pkgs.writeShellScript "ya" '' tmp="$(mktemp -t "yazi-cwd.XXXXX")" yazi --cwd-file="$tmp" @@ -75,11 +76,11 @@ general { # See https://wiki.hyprland.org/Configuring/Variables/ for more - gaps_in = 5 - gaps_out = 20 + gaps_in = 4 + gaps_out = 8 border_size = 2 - col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg - col.inactive_border = rgba(595959aa) + col.active_border = rgba(${strPalette.normal.yellow}) rgba(${strPalette.normal.red}) 45deg + col.inactive_border = rgba(${strPalette.bright.black}) layout = dwindle } @@ -161,16 +162,16 @@ bind = SUPER, J, togglesplit, # dwindle # Move focus to relative position - bind = SUPER, H, movefocus, l - bind = SUPER, L, movefocus, r - bind = SUPER, K, movefocus, u - bind = SUPER, J, movefocus, d + bind = SUPER, left, movefocus, l + bind = SUPER, right, movefocus, r + bind = SUPER, up, movefocus, u + bind = SUPER, down, movefocus, d # Move window to relative position - bind = SUPER_SHIFT, H, movewindow, l - bind = SUPER_SHIFT, L, movewindow, r - bind = SUPER_SHIFT, K, movewindow, u - bind = SUPER_SHIFT, J, movewindow, d + bind = SUPER_SHIFT, left, movewindow, l + bind = SUPER_SHIFT, right, movewindow, r + bind = SUPER_SHIFT, up, movewindow, u + bind = SUPER_SHIFT, down, movewindow, d # Switch workspaces with mainMod + [0-9] bind = SUPER, 1, workspace, 1