From 45b7136e4dfc854240a5e1368ac25ea6be9aa5b8 Mon Sep 17 00:00:00 2001 From: Yoru Date: Thu, 5 Dec 2024 16:54:13 +0100 Subject: [PATCH] feat: moving stuff from home.nix to split modules (not really for now...) --- dotfiles/hyprland.conf | 263 +++++++++++++++++++++++++++++++++ hosts/home/home.nix | 216 ++------------------------- modules/home-manager/helix.nix | 27 ++++ modules/home-manager/kitty.nix | 26 ++++ modules/nixos/gaming.nix | 1 + 5 files changed, 329 insertions(+), 204 deletions(-) create mode 100644 dotfiles/hyprland.conf create mode 100644 modules/home-manager/helix.nix create mode 100644 modules/home-manager/kitty.nix diff --git a/dotfiles/hyprland.conf b/dotfiles/hyprland.conf new file mode 100644 index 0000000..a3f5c22 --- /dev/null +++ b/dotfiles/hyprland.conf @@ -0,0 +1,263 @@ +################ +### MONITORS ### +################ + +# See https://wiki.hyprland.org/Configuring/Monitors/ +monitor=,preferred,auto,auto + +################### +### MY PROGRAMS ### +################### + +# See https://wiki.hyprland.org/Configuring/Keywords/ +$terminal = kitty +$fileManager = dolphin +$menu = wofi --show drun + +################# +### AUTOSTART ### +################# + +# exec-once = $terminal +# exec-once = nm-applet & +# exec-once = waybar & hyprpaper & firefox +exec-once = waybar + +############################# +### ENVIRONMENT VARIABLES ### +############################# + +# See https://wiki.hyprland.org/Configuring/Environment-variables/ +env = XCURSOR_SIZE,24 +env = HYPRCURSOR_SIZE,24 + +##################### +### LOOK AND FEEL ### +##################### +# Refer to https://wiki.hyprland.org/Configuring/Variables/ +# https://wiki.hyprland.org/Configuring/Variables/#general +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 + + # 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 +# windowrulev2 = bordersize 0, floating:0, onworkspace:w[tv1] +# windowrulev2 = rounding 0, floating:0, onworkspace:w[tv1] +# windowrulev2 = bordersize 0, floating:0, onworkspace:f[1] +# windowrulev2 = 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_intl + 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 @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 v1 +# windowrule = float, ^(kitty)$ + +# Example windowrule v2 +# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ + +# Ignore maximize requests from apps. You'll probably like this. +windowrulev2 = suppressevent maximize, class:.* + +# Fix some dragging issues with XWayland +windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0 diff --git a/hosts/home/home.nix b/hosts/home/home.nix index 025a129..f244d82 100644 --- a/hosts/home/home.nix +++ b/hosts/home/home.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, outputs, ... }: { # Home Manager needs a bit of information about you and the paths it should @@ -6,6 +6,16 @@ home.username = "yoru"; home.homeDirectory = "/home/yoru"; + imports = [ + ../../modules/home-manager/helix.nix + ../../modules/home-manager/waybar.nix + ../../modules/home-manager/kitty.nix + ]; + + myHome.helix.enable = true; + myHome.waybar.enable = true; + myHome.kitty.enable = true; + # This value determines the Home Manager release that your configuration is # compatible with. This helps avoid breakage when a new Home Manager release # introduces backwards incompatible changes. @@ -19,28 +29,14 @@ # environment. home.packages = [ - # # Adds the 'hello' command to your environment. It prints a friendly - # # "Hello, world!" when run. - # pkgs.hello - pkgs.helix - pkgs.firefox - # pkgs.zsh - pkgs.bottles pkgs.neofetch pkgs.aoc-cli - # pkgs.steam - # pkgs.discord - - # # It is sometimes useful to fine-tune packages, for example, by applying - # # overrides. You can do that directly here, just don't forget the - # # parentheses. Maybe you want to install Nerd Fonts with a limited number of - # # fonts? - # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; }) ]; # Home Manager is pretty good at managing dotfiles. The primary way to manage # plain files is through 'home.file'. home.file = { + ".config/hypr/hyprland.conf".source = ../../dotfiles/hyprland.conf; # # Building this configuration will create a copy of 'dotfiles/screenrc' in # # the Nix store. Activating the configuration will then make '~/.screenrc' a # # symlink to the Nix store copy. @@ -53,194 +49,6 @@ # ''; }; - # Home Manager can also manage your environment variables through - # 'home.sessionVariables'. These will be explicitly sourced when using a - # shell provided by Home Manager. If you don't want to manage your shell - # through Home Manager then you have to manually source 'hm-session-vars.sh' - # located at either - # - # ~/.nix-profile/etc/profile.d/hm-session-vars.sh - # - # or - # - # ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh - # - # or - # - # /etc/profiles/per-user/yoru/etc/profile.d/hm-session-vars.sh - # - # home.sessionVariables = { - # EDITOR = "hx"; # EDITOR = "emacs"; - # }; - - # Let Home Manager install and manage itself. programs.home-manager.enable = true; - # programs.zsh.enable = true; programs.fish.enable = true; - programs.helix = { - enable = true; - defaultEditor = true; - settings = { - editor = { - lsp = { - enable = true; - display-messages = true; - display-inlay-hints = true; - }; - # "inline-diagnostics" = { - # cursor-line = "warning"; - # }; - }; - }; - }; - # programs.steam.enable = true; - programs.kitty = lib.mkForce { - enable = true; - settings = { - confirm_os_window_close = 0; - dynamic_background_opacity = true; - enable_audio_bell = false; - mouse_hide_wait = "-1.0"; - background_opacity = "0.5"; - background_blur = 5; - font_family = "Fira Code"; - }; - }; - programs.waybar = { - enable = true; - systemd = { - enable = false; - target = "graphical-session.target"; - }; - style = '' - * { - font-family: 'Fira Code', 'Symbols Nerd Font Mono'; - font-size: 16px; - min-height: 45px; - } - window#waybar { - background: transparent; - } - #workspaces, #clock, #pulseaudio, #network, #cpu, #memory, #backlight, #idle_inhibitor, #temperature, #custom-power { - border-radius: 10px; - background-color: rgba(10, 10, 10, 0.5); - margin-top: 1px; - padding-top: 5px; - padding-left: 15px; - padding-right: 10px; - padding-bottom: 5px; - } - #workspaces button.active { - color: #ebebeb; - } - ''; - settings = [{ - "layer" = "top"; - "position" = "top"; - modules-left = [ - "hyprland/workspaces" - "custom/media" - ]; - modules-center = [ - "hyprland/window" - ]; - modules-right = [ - "mpd" - "idle_inhibitor" - "pulseaudio" - "network" - "power-profiles-daemon" - "cpu" - "memory" - "temperature" - # "backlight" - "keyboard-state" - "clock" - "tray" - "custom/power" - ]; - "hyprland/workspaces" = { - "format" = "{icon}"; - "on-scroll-up" = "hyprctl dispatch workspace e+1"; - "on-scroll-down" = "hyprctl dispatch workspace e-1"; - }; - "idle_inhibitor" = { - "format" = "{icon}"; - "format-icons" = { - "activated" = ""; - "deactivated" = ""; - }; - }; - "tray" = { - "spacing" = 10; - }; - "cpu" = { - "format" = "{usage}% "; - "tooltip" = false; - }; - "memory" = { - "format" = "{}% "; - }; - "temperature" = { - # // "thermal-zone" = 2; - # // "hwmon-path" = "/sys/class/hwmon/hwmon2/temp1_input"; - "critical-threshold" = 80; - # // "format-critical" = "{temperatureC}°C {icon}"; - "format" = "{temperatureC}°C {icon}"; - "format-icons" = ["" "" ""]; - }; - "network" = { - # // "interface" = "wlp2*"; // (Optional) To force the use of this interface - "format-wifi" = "{essid} ({signalStrength}%) "; - "format-ethernet" = "{ipaddr}/{cidr} "; - "tooltip-format" = "{ifname} via {gwaddr} "; - "format-linked" = "{ifname} (No IP) "; - "format-disconnected" = "Disconnected ⚠"; - "format-alt" = "{ifname}: {ipaddr}/{cidr}"; - }; - "pulseaudio" = { - # // "scroll-step" = 1; // %, can be a float - "format" = "{volume}% {icon} {format_source}"; - "format-bluetooth" = "{volume}% {icon} {format_source}"; - "format-bluetooth-muted" = " {icon} {format_source}"; - "format-muted" = " {format_source}"; - "format-source" = "{volume}% "; - "format-source-muted" = ""; - "format-icons" = { - "headphone" = ""; - "hands-free" = ""; - "headset" = ""; - "phone" = ""; - "portable" = ""; - "car" = ""; - "default" = ["" "" ""]; - }; - "on-click" = "pavucontrol"; - }; - "custom/media" = { - "format" = "{icon} {text}"; - "return-type" = "json"; - "max-length" = 40; - "format-icons" = { - "spotify" = ""; - "default" = "🎜"; - }; - "escape" = true; - "exec" = "$HOME/.config/waybar/mediaplayer.py 2> /dev/null"; # // Script in resources folder - # // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name - }; - "custom/power" = { - "format" = "⏻ "; - "tooltip" = false; - "menu" = "on-click"; - "menu-file" = "$HOME/.config/waybar/power_menu.xml"; # // Menu file in resources folder - "menu-actions" = { - "shutdown" = "shutdown"; - "reboot" = "reboot"; - "suspend" = "systemctl suspend"; - "hibernate" = "systemctl hibernate"; - }; - }; - }]; - }; } diff --git a/modules/home-manager/helix.nix b/modules/home-manager/helix.nix new file mode 100644 index 0000000..c013980 --- /dev/null +++ b/modules/home-manager/helix.nix @@ -0,0 +1,27 @@ +{ + lib, + config, + ... +}: let + cfg = config.myHome.helix; +in { + options = { + myHome.helix.enable = lib.mkEnableOption "enables helix"; + }; + + config = lib.mkIf cfg.enable { + programs.helix = { + enable = true; + defaultEditor = true; + settings = { + editor = { + lsp = { + enable = true; + display-messages = true; + display-inlay-hints = true; + }; + }; + }; + }; + }; +} diff --git a/modules/home-manager/kitty.nix b/modules/home-manager/kitty.nix new file mode 100644 index 0000000..35a7af0 --- /dev/null +++ b/modules/home-manager/kitty.nix @@ -0,0 +1,26 @@ +{ + lib, + config, + ... +}: let + cfg = config.myHome.kitty; +in { + options = { + myHome.kitty.enable = lib.mkEnableOption "enables kitty"; + }; + + config = lib.mkIf cfg.enable { + programs.kitty = lib.mkForce { + enable = true; + settings = { + confirm_os_window_close = 0; + dynamic_background_opacity = true; + enable_audio_bell = false; + mouse_hide_wait = "-1.0"; + background_opacity = "0.5"; + background_blur = 5; + font_family = "Fira Code"; + }; + }; + }; +} diff --git a/modules/nixos/gaming.nix b/modules/nixos/gaming.nix index 0f28b1b..ecf3008 100644 --- a/modules/nixos/gaming.nix +++ b/modules/nixos/gaming.nix @@ -12,6 +12,7 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ + bottles steam discord ];