From e93772d8625023babdaedd5fb58c70495390aa40 Mon Sep 17 00:00:00 2001 From: iFargle Date: Sun, 19 Nov 2023 20:57:34 +0900 Subject: [PATCH] Update themes --- .../common/desktops/hyprland/default.nix | 1 - .../hyprland/themes/green/default.nix | 1 + .../hyprland/themes/green/hyprland-conf.nix | 199 ++++++++++++++++++ .../hyprland/themes/green/mako-conf.nix | 6 +- .../hyprland/themes/green/rofi-conf.nix | 56 ++--- .../hyprland/themes/green/swaylock-conf.nix | 22 +- .../hyprland/themes/green/waybar-conf.nix | 34 +-- .../hyprland/themes/green/wlogout-conf.nix | 8 +- .../hyprland/themes/gruvbox/default.nix | 1 + .../hyprland/themes/gruvbox/hyprland-conf.nix | 199 ++++++++++++++++++ .../hyprland/themes/gruvbox/swaylock-conf.nix | 2 +- .../common/software/cli/themes/green/btop.nix | 2 +- .../cli/themes/green/doom-emacs.d/config.el | 2 +- .../cli/themes/green/doom-emacs.d/packages.el | 1 + .../software/gui/themes/green/kitty-theme.nix | 24 ++- 15 files changed, 489 insertions(+), 69 deletions(-) create mode 100644 home-manager/common/desktops/hyprland/themes/green/hyprland-conf.nix create mode 100644 home-manager/common/desktops/hyprland/themes/gruvbox/hyprland-conf.nix diff --git a/home-manager/common/desktops/hyprland/default.nix b/home-manager/common/desktops/hyprland/default.nix index 52d3f71e..591de5ea 100644 --- a/home-manager/common/desktops/hyprland/default.nix +++ b/home-manager/common/desktops/hyprland/default.nix @@ -5,6 +5,5 @@ # Theme agnostic configs ./common/swayosd/swayosd-conf.nix ./common/waybar/scripts.nix - ./common/hyprland/hyprland-conf.nix ]; } \ No newline at end of file diff --git a/home-manager/common/desktops/hyprland/themes/green/default.nix b/home-manager/common/desktops/hyprland/themes/green/default.nix index 854b8988..06e3ad1a 100644 --- a/home-manager/common/desktops/hyprland/themes/green/default.nix +++ b/home-manager/common/desktops/hyprland/themes/green/default.nix @@ -5,5 +5,6 @@ ./swaylock-conf.nix ./waybar-conf.nix ./wlogout-conf.nix + ./hyprland-conf.nix ]; } \ No newline at end of file diff --git a/home-manager/common/desktops/hyprland/themes/green/hyprland-conf.nix b/home-manager/common/desktops/hyprland/themes/green/hyprland-conf.nix new file mode 100644 index 00000000..2b7263d4 --- /dev/null +++ b/home-manager/common/desktops/hyprland/themes/green/hyprland-conf.nix @@ -0,0 +1,199 @@ +{ theme, ... }: { + home.file = { + ".config/hypr/hyprland.conf" = { + enable = true; + text = '' + # https://wiki.hyprland.org/Configuring/Variables/ + env = GDK_SCALE,1 + env = XCURSOR_SIZE,22 + + # unscale XWayland + xwayland { + force_zero_scaling = true + } + + layerrule = blur, waybar + + # nVidia Speficic Settings: + # https://wiki.hyprland.org/Nvidia/ + # env = LIBVA_DRIVER_NAME,nvidia + # env = XDG_SESSION_TYPE,wayland + # env = GBM_BACKEND,nvidia-drm + # env = __GLX_VENDOR_LIBRARY_NAME,nvidia + env = WLR_NO_HARDWARE_CURSORS,1 + + general { + gaps_in = 5 + gaps_out = 15 + border_size = 3 + # First six are color, last 2 are opacity + col.active_border = rgba(2a9b34bb) # Gruvbox fg2, opacity bb + col.inactive_border = rgba(207427dd) # Gruvbox bg2, opacity aa + resize_on_border = true + extend_border_grab_area = 15 + layout = dwindle + } + input { + kb_layout = us + follow_mouse = 1 + touchpad { + natural_scroll = true + disable_while_typing = true + tap-to-click = true + clickfinger_behavior = true + drag_lock = true + } + sensitivity = 0 + } + gestures { + # https://wiki.hyprland.org/0.24.1/Configuring/Keywords/#gestures + workspace_swipe = true + workspace_swipe_fingers = 3 + workspace_swipe_numbered = false + } + misc { + disable_hyprland_logo = true + mouse_move_enables_dpms = true + key_press_enables_dpms = true + } + decoration { + rounding = 5 + active_opacity = 0.9 + inactive_opacity = 0.7 + fullscreen_opacity = 0.9 + drop_shadow = true + shadow_range = 4 + shadow_render_power = 3 + col.shadow = rgba(242627ee) + blur { + size = 8 + passes = 3 + ignore_opacity = true + } + + } + animations { + # https://wiki.hyprland.org/Configuring/Animations/ + enabled = true + 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 = true # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below + preserve_split = true # you probably want this + no_gaps_when_only = 1 + + } + master { + # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more + new_is_master = true + } + + # See https://wiki.hyprland.org/Configuring/Keywords/ for more + + # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more + bind = $mainMod, Q, exec, kitty + bind = $mainMod, C, killactive, + bind = $mainMod, M, exit, + bind = $mainMod, V, togglefloating, + # bind = $mainMod, R, exec, wofi --show drun + bind = $mainMod, P, pseudo, # dwindle + bind = $mainMod, J, togglesplit, # dwindle + + # Move focus with mainMod + arrow keys + bind = SUPER_ALT, left, movefocus, l + bind = SUPER_ALT, right, movefocus, r + bind = SUPER_ALT, up, movefocus, u + bind = SUPER_ALT, down, movefocus, d + + bind = SUPER_ALT, H, movefocus, l + bind = SUPER_ALT, L, movefocus, r + bind = SUPER_ALT, K, movefocus, u + bind = SUPER_ALT, J, 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 + + ############################################################################# + # Custom keybinds + # Show Rofi on SUPER-SPACE + bind = $mainMod, space, exec, rofi -show combi -show-icons + # bind = $mainMod, space, exec, rofi -show drun -show-icons + # Take a screenshot with the Print key + bind = , Print, exec, grim -g "$(slurp)" | wl-copy -t image/png + + # Move to the previous / next workspace with SUPER-LEFT and SUPER-RIGHT + bind = $mainMod , right, workspace, e+1 + bind = $mainMod , left , workspace, e-1 + bind = $mainMod SHIFT, right, movetoworkspace, e+1 + bind = $mainMod SHIFT, left , movetoworkspace, e-1 + bind = SHIFT ALT, L, workspace, e+1 + bind = SHIFT ALT, H, workspace, e-1 + + # Launch various applications + bind = $mainMod, R, exec, ranger + bind = $mainMod, S, exec, steam + + # Lock the screen, send to swaylock and pause music + bind = $mainMod, L, exec, playerctl pause && sleep 0.5 && swaylock + + # to switch between windows in a floating workspace + bind = $mainMod ,Tab, cyclenext, # change focus to another window + bind = $mainMod ,Tab, bringactivetotop, # bring it to the top + + # Resize + bind = $mainMod, R, exec, notify-send "Entered resize mode. Press ESC to quit." + bind = $mainMod, R, submap, resize + submap = resize + binde = , H, resizeactive,-50 0 + binde = , L, resizeactive,50 0 + binde = , K, resizeactive,0 -50 + binde = , J, resizeactive,0 50 + binde = , left, resizeactive,-50 0 + binde = , right, resizeactive,50 0 + binde = , up, resizeactive,0 -50 + binde = , down, resizeactive,0 50 + bind = , escape, submap, reset + submap = reset + + # Start the config: + exec-once=bash ~/.config/hypr/start.sh + ''; + }; + }; +} diff --git a/home-manager/common/desktops/hyprland/themes/green/mako-conf.nix b/home-manager/common/desktops/hyprland/themes/green/mako-conf.nix index 5ce25966..3b9c064a 100644 --- a/home-manager/common/desktops/hyprland/themes/green/mako-conf.nix +++ b/home-manager/common/desktops/hyprland/themes/green/mako-conf.nix @@ -7,9 +7,9 @@ on-button-left=dismiss on-button-right=dismiss-all font=JetbrainsMono Regular -background-color=#252423 -border-color=#d5c4a1bb -text-color=#e2cca9 +background-color=#3a3c3e +border-color=#2a9b34 +text-color=#d9eed2 width=300 height=100 margin=10 diff --git a/home-manager/common/desktops/hyprland/themes/green/rofi-conf.nix b/home-manager/common/desktops/hyprland/themes/green/rofi-conf.nix index ea37ad72..ea469a53 100644 --- a/home-manager/common/desktops/hyprland/themes/green/rofi-conf.nix +++ b/home-manager/common/desktops/hyprland/themes/green/rofi-conf.nix @@ -8,12 +8,12 @@ text = '' configuration { } - @theme "gruvbox-dark" + @theme "dark" ''; }; # Rofi theme - ".config/rofi/themes/gruvbox-dark.rasi" = { + ".config/rofi/themes/dark.rasi" = { enable = true; executable = false; text = '' @@ -23,10 +23,10 @@ Based on the Gruvbox color scheme for Vim by morhetz https://github.com/morhetz/gruvbox - File: gruvbox-dark.rasi + File: dark.rasi Desc: Gruvbox dark color theme for Rofi Author: bardisty - Source: https://github.com/bardisty/gruvbox-rofi + Source: https://github.com/bardisty/rofi Modified: Mon Feb 12 2018 04:08:43 PST -0800 ========================================================================== */ @@ -36,61 +36,61 @@ scrollbar: true; /* Gruvbox dark colors */ - gruvbox-dark-bg0: #282828; - gruvbox-dark-bg0-soft: #32302f; - gruvbox-dark-bg3: #665c54; - gruvbox-dark-fg0: #fbf1c7; - gruvbox-dark-fg1: #ebdbb2; - gruvbox-dark-red-dark: #cc241d; - gruvbox-dark-red-light: #fb4934; - gruvbox-dark-yellow-dark: #d79921; - gruvbox-dark-yellow-light: #fabd2f; - gruvbox-dark-gray: #a89984; + dark-bg0: #282828; + dark-bg0-soft: #32302f; + dark-bg3: #665c54; + dark-fg0: #d9eed2; + dark-fg1: #d9eed2; + dark-red-dark: #fb0029; + dark-red-light: #fb4934; + dark-yellow-dark: #7a6640; + dark-yellow-light: #7a6640; + dark-gray: #a89984; /* Theme colors */ - background: @gruvbox-dark-bg0; + background: @dark-bg0; background-color: @background; - foreground: @gruvbox-dark-fg1; - border-color: @gruvbox-dark-gray; + foreground: @dark-fg1; + border-color: @dark-gray; separatorcolor: @border-color; scrollbar-handle: @border-color; normal-background: @background; normal-foreground: @foreground; - alternate-normal-background: @gruvbox-dark-bg0-soft; + alternate-normal-background: @dark-bg0-soft; alternate-normal-foreground: @foreground; - selected-normal-background: @gruvbox-dark-bg3; - selected-normal-foreground: @gruvbox-dark-fg0; + selected-normal-background: @dark-bg3; + selected-normal-foreground: @dark-fg0; - active-background: @gruvbox-dark-yellow-dark; + active-background: @dark-yellow-dark; active-foreground: @background; alternate-active-background: @active-background; alternate-active-foreground: @active-foreground; - selected-active-background: @gruvbox-dark-yellow-light; + selected-active-background: @dark-yellow-light; selected-active-foreground: @active-foreground; - urgent-background: @gruvbox-dark-red-dark; + urgent-background: @dark-red-dark; urgent-foreground: @background; alternate-urgent-background: @urgent-background; alternate-urgent-foreground: @urgent-foreground; - selected-urgent-background: @gruvbox-dark-red-light; + selected-urgent-background: @dark-red-light; selected-urgent-foreground: @urgent-foreground; } -@import "gruvbox-common" +@import "common" ''; }; # Rofi theme - ".config/rofi/themes/gruvbox-common.rasi" = { + ".config/rofi/themes/common.rasi" = { enable = true; executable = false; text = '' /* ========================================================================== - File: gruvbox-common.rasi + File: common.rasi Desc: Shared rules between all gruvbox themes Author: bardisty - Source: https://github.com/bardisty/gruvbox-rofi + Source: https://github.com/bardisty/rofi Modified: Mon Feb 12 2018 06:06:47 PST -0800 ========================================================================== */ diff --git a/home-manager/common/desktops/hyprland/themes/green/swaylock-conf.nix b/home-manager/common/desktops/hyprland/themes/green/swaylock-conf.nix index 69e34675..813015d3 100644 --- a/home-manager/common/desktops/hyprland/themes/green/swaylock-conf.nix +++ b/home-manager/common/desktops/hyprland/themes/green/swaylock-conf.nix @@ -20,37 +20,37 @@ indicator-radius = "130"; indicator-thickness = "12"; indicator-caps-lock = true; - disable-caps-lock-text = true; + disable-caps-lock-text = false; # OTHER key-hl-color = "b8bb26"; #b8bb26 # Sets the color of the key press highlight segments. separator-color = "ebdbb200"; #ebdbb200 # Sets the color of the lines that separate highlight segments. bs-hl-color = "d79921"; #d79921 # Sets the color of backspace highlight segments. # DEFAULT - ring-color = "d65d0e"; #d65d0e # Sets the color of the ring of the indicator. + ring-color = "2a9b34"; #2a9b34 # Sets the color of the ring of the indicator. line-color = "ebdbb200"; #ebdbb200 # Sets the color of the line between the inside and ring. text-color = "83a598"; #83a598 # Sets the color of the text. inside-color = "1d202199"; #1d202199 # Sets the color of the inside of the indicator. # VERIFYING - ring-ver-color = "fe8019"; #fe8019 # Sets the color of the ring of the indicator when verifying. + ring-ver-color = "41ff58"; #41ff58 # Sets the color of the ring of the indicator when verifying. line-ver-color = "ebdbb200"; #ebdbb200 # Sets the color of the line between the inside and ring when verifying. text-ver-color = "83a59800"; #83a59800 # Sets the color of the text when verifying. - inside-ver-color = "3c383699"; #3c383699 # Sets the color of the inside of the indicator when verifying. + inside-ver-color = "1e1e1e99"; #1e1e1e99 # Sets the color of the inside of the indicator when verifying. # WRONG - ring-wrong-color = "fb4934"; #fb4934 # Sets the color of the ring of the indicator when invalid. + ring-wrong-color = "fb0029"; #fb0029 # Sets the color of the ring of the indicator when invalid. line-wrong-color = "ebdbb200"; #ebdbb200 # Sets the color of the line between the inside and ring when invalid. text-wrong-color = "83a59800"; #83a59800 # Sets the color of the text when invalid. - inside-wrong-color = "3c383699"; #3c383699 # Sets the color of the inside of the indicator when invalid. + inside-wrong-color = "1e1e1e99"; #1e1e1e99 # Sets the color of the inside of the indicator when invalid. # CAPS-LOCK - ring-caps-lock-color = "d65d0e"; #d65d0e # Sets the color of the ring of the indicator when Caps Lock is active. - line-caps-lock-color = "d65d0e00"; #d65d0e00 # Sets the color of the line between the inside and ring when Caps Lock is active. - text-caps-lock-color = "d65d0e00"; #d65d0e00 # Sets the color of the text when Caps Lock is active. - inside-caps-lock-color = "3c383699"; #3c383699 # Sets the color of the inside of the indicator when Caps Lock is active. + ring-caps-lock-color = "2a9b34"; #2a9b34 # Sets the color of the ring of the indicator when Caps Lock is active. + line-caps-lock-color = "2a9b3400"; #2a9b3400 # Sets the color of the line between the inside and ring when Caps Lock is active. + text-caps-lock-color = "2a9b3400"; #2a9b3400 # Sets the color of the text when Caps Lock is active. + inside-caps-lock-color = "1e1e1e99"; #1e1e1e99 # Sets the color of the inside of the indicator when Caps Lock is active. # CLEAR ring-clear-color = "bdae93"; #bdae93 # Sets the color of the ring of the indicator when cleared. line-clear-color = "92837400"; #92837400 # Sets the color of the line between the inside and ring when cleared. text-clear-color = "92837400"; #92837400 # Sets the color of the text when cleared. - inside-clear-color = "3c383699"; #3c383699 # Sets the color of the inside of the indicator when cleared. + inside-clear-color = "1e1e1e99"; #1e1e1e99 # Sets the color of the inside of the indicator when cleared. }; }; diff --git a/home-manager/common/desktops/hyprland/themes/green/waybar-conf.nix b/home-manager/common/desktops/hyprland/themes/green/waybar-conf.nix index d1c4debb..6bf05e91 100644 --- a/home-manager/common/desktops/hyprland/themes/green/waybar-conf.nix +++ b/home-manager/common/desktops/hyprland/themes/green/waybar-conf.nix @@ -85,11 +85,11 @@ "weeks-pos" : "left", "on-scroll" : 1, "format": { - "months": "{}", - "days": "{}", - "weeks": "W{}", - "weekdays": "{}", - "today": "{}" + "months": "{}", + "days": "{}", + "weeks": "W{}", + "weekdays": "{}", + "today": "{}" } }, "actions": { @@ -103,10 +103,10 @@ "pulseaudio": { "scroll-step": 1, "format": "{icon} {format_source}", - "format-bluetooth": "{volume}% {icon} {format_source}", + "format-bluetooth": "{volume}% {icon} {format_source}", "format-bluetooth-muted": " ", "format-muted": "󰝟 {format_source}", - "format-source": " ", + "format-source": " ", "format-source-muted": " ", "format-icons": { "headphone": " ", @@ -174,7 +174,7 @@ #workspaces button.active { padding: 0px 15px; - background-color: #a89984; + background-color: #7A7740; color: rgba(0, 0, 0, 0.5); } @@ -182,7 +182,7 @@ #workspaces button.focused:hover, #workspaces button.visible:hover { color: rgba(0, 0, 0, 0.5); - background-color: #d5c4a1; + background-color: #649a25; } #workspaces button.urgent { @@ -212,8 +212,8 @@ padding: 0px 10px; margin: 5px; border-radius: 5px; - color: rgba(50, 48, 47, 0.8); - background-color: #a89984; + color: rgba(58,60,62, 0.6); + background-color: #649a25; font-weight: bold; } @@ -235,14 +235,14 @@ #custom-tailscale button:hover, #custom-wlogout button:hover, #window button:hover{ - background-color: #d5c4a1; + background-color: #d9eed2; } /* * Warning plugins state */ #battery.warning { - background-color: #e9b143; + background-color: #d1ff6d; } /* @@ -252,11 +252,11 @@ #battery.critical, #custom-tailscale.Stopped, #network.disconnected { - color: #e2cca9; - background-color: #cc241d; + color: #d9eed2; + background-color: #fb0029; } #battery.charging { - background-color: #98971a; + background-color: #2a9b34; } #battery.plugged { background-color: #458588; @@ -265,7 +265,7 @@ background-color: #458588; } tooltip { - color: #e2cca9; + color: #d9eed2; font-size: 14px; } ''; diff --git a/home-manager/common/desktops/hyprland/themes/green/wlogout-conf.nix b/home-manager/common/desktops/hyprland/themes/green/wlogout-conf.nix index 19e8f399..e624c766 100644 --- a/home-manager/common/desktops/hyprland/themes/green/wlogout-conf.nix +++ b/home-manager/common/desktops/hyprland/themes/green/wlogout-conf.nix @@ -7,14 +7,14 @@ background-image: none; } window { - background-color: rgba(50, 48, 47, 0.8); + background-color: rgba(58,60,62, 0.6); } button { - color: #d5c4a1; + color: #d9eed2; font-size: 0px; border-radius: 5000px; margin: 25px; - background-color: #1E1E1E; + background-color: #3a3c3e; border-style: solid; border-width: 3px; background-repeat: no-repeat; @@ -23,7 +23,7 @@ } button:active, button:hover { - background-color: #504945; + background-color: #2a9b34; outline-style: none; } diff --git a/home-manager/common/desktops/hyprland/themes/gruvbox/default.nix b/home-manager/common/desktops/hyprland/themes/gruvbox/default.nix index 854b8988..06e3ad1a 100644 --- a/home-manager/common/desktops/hyprland/themes/gruvbox/default.nix +++ b/home-manager/common/desktops/hyprland/themes/gruvbox/default.nix @@ -5,5 +5,6 @@ ./swaylock-conf.nix ./waybar-conf.nix ./wlogout-conf.nix + ./hyprland-conf.nix ]; } \ No newline at end of file diff --git a/home-manager/common/desktops/hyprland/themes/gruvbox/hyprland-conf.nix b/home-manager/common/desktops/hyprland/themes/gruvbox/hyprland-conf.nix new file mode 100644 index 00000000..c2d46ca7 --- /dev/null +++ b/home-manager/common/desktops/hyprland/themes/gruvbox/hyprland-conf.nix @@ -0,0 +1,199 @@ +{ theme, ... }: { + home.file = { + ".config/hypr/hyprland.conf" = { + enable = true; + text = '' + # https://wiki.hyprland.org/Configuring/Variables/ + env = GDK_SCALE,1 + env = XCURSOR_SIZE,22 + + # unscale XWayland + xwayland { + force_zero_scaling = true + } + + layerrule = blur, waybar + + # nVidia Speficic Settings: + # https://wiki.hyprland.org/Nvidia/ + # env = LIBVA_DRIVER_NAME,nvidia + # env = XDG_SESSION_TYPE,wayland + # env = GBM_BACKEND,nvidia-drm + # env = __GLX_VENDOR_LIBRARY_NAME,nvidia + env = WLR_NO_HARDWARE_CURSORS,1 + + general { + gaps_in = 5 + gaps_out = 15 + border_size = 3 + # First six are color, last 2 are opacity + col.active_border = rgba(d5c4a1bb) # Gruvbox fg2, opacity bb + col.inactive_border = rgba(504945dd) # Gruvbox bg2, opacity aa + resize_on_border = true + extend_border_grab_area = 15 + layout = dwindle + } + input { + kb_layout = us + follow_mouse = 1 + touchpad { + natural_scroll = true + disable_while_typing = true + tap-to-click = true + clickfinger_behavior = true + drag_lock = true + } + sensitivity = 0 + } + gestures { + # https://wiki.hyprland.org/0.24.1/Configuring/Keywords/#gestures + workspace_swipe = true + workspace_swipe_fingers = 3 + workspace_swipe_numbered = false + } + misc { + disable_hyprland_logo = true + mouse_move_enables_dpms = true + key_press_enables_dpms = true + } + decoration { + rounding = 5 + active_opacity = 0.9 + inactive_opacity = 0.7 + fullscreen_opacity = 0.9 + drop_shadow = true + shadow_range = 4 + shadow_render_power = 3 + col.shadow = rgba(1a1a1aee) + blur { + size = 8 + passes = 3 + ignore_opacity = true + } + + } + animations { + # https://wiki.hyprland.org/Configuring/Animations/ + enabled = true + 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 = true # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below + preserve_split = true # you probably want this + no_gaps_when_only = 1 + + } + master { + # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more + new_is_master = true + } + + # See https://wiki.hyprland.org/Configuring/Keywords/ for more + + # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more + bind = $mainMod, Q, exec, kitty + bind = $mainMod, C, killactive, + bind = $mainMod, M, exit, + bind = $mainMod, V, togglefloating, + # bind = $mainMod, R, exec, wofi --show drun + bind = $mainMod, P, pseudo, # dwindle + bind = $mainMod, J, togglesplit, # dwindle + + # Move focus with mainMod + arrow keys + bind = SUPER_ALT, left, movefocus, l + bind = SUPER_ALT, right, movefocus, r + bind = SUPER_ALT, up, movefocus, u + bind = SUPER_ALT, down, movefocus, d + + bind = SUPER_ALT, H, movefocus, l + bind = SUPER_ALT, L, movefocus, r + bind = SUPER_ALT, K, movefocus, u + bind = SUPER_ALT, J, 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 + + ############################################################################# + # Custom keybinds + # Show Rofi on SUPER-SPACE + bind = $mainMod, space, exec, rofi -show combi -show-icons + # bind = $mainMod, space, exec, rofi -show drun -show-icons + # Take a screenshot with the Print key + bind = , Print, exec, grim -g "$(slurp)" | wl-copy -t image/png + + # Move to the previous / next workspace with SUPER-LEFT and SUPER-RIGHT + bind = $mainMod , right, workspace, e+1 + bind = $mainMod , left , workspace, e-1 + bind = $mainMod SHIFT, right, movetoworkspace, e+1 + bind = $mainMod SHIFT, left , movetoworkspace, e-1 + bind = SHIFT ALT, L, workspace, e+1 + bind = SHIFT ALT, H, workspace, e-1 + + # Launch various applications + bind = $mainMod, R, exec, ranger + bind = $mainMod, S, exec, steam + + # Lock the screen, send to swaylock and pause music + bind = $mainMod, L, exec, playerctl pause && sleep 0.5 && swaylock + + # to switch between windows in a floating workspace + bind = $mainMod ,Tab, cyclenext, # change focus to another window + bind = $mainMod ,Tab, bringactivetotop, # bring it to the top + + # Resize + bind = $mainMod, R, exec, notify-send "Entered resize mode. Press ESC to quit." + bind = $mainMod, R, submap, resize + submap = resize + binde = , H, resizeactive,-50 0 + binde = , L, resizeactive,50 0 + binde = , K, resizeactive,0 -50 + binde = , J, resizeactive,0 50 + binde = , left, resizeactive,-50 0 + binde = , right, resizeactive,50 0 + binde = , up, resizeactive,0 -50 + binde = , down, resizeactive,0 50 + bind = , escape, submap, reset + submap = reset + + # Start the config: + exec-once=bash ~/.config/hypr/start.sh + ''; + }; + }; +} diff --git a/home-manager/common/desktops/hyprland/themes/gruvbox/swaylock-conf.nix b/home-manager/common/desktops/hyprland/themes/gruvbox/swaylock-conf.nix index 69e34675..b26e9b83 100644 --- a/home-manager/common/desktops/hyprland/themes/gruvbox/swaylock-conf.nix +++ b/home-manager/common/desktops/hyprland/themes/gruvbox/swaylock-conf.nix @@ -20,7 +20,7 @@ indicator-radius = "130"; indicator-thickness = "12"; indicator-caps-lock = true; - disable-caps-lock-text = true; + disable-caps-lock-text = false; # OTHER key-hl-color = "b8bb26"; #b8bb26 # Sets the color of the key press highlight segments. diff --git a/home-manager/common/software/cli/themes/green/btop.nix b/home-manager/common/software/cli/themes/green/btop.nix index 78d36685..b7b818d9 100644 --- a/home-manager/common/software/cli/themes/green/btop.nix +++ b/home-manager/common/software/cli/themes/green/btop.nix @@ -1,7 +1,7 @@ { ... }: { home.file.".config/btop/btop.conf".text = '' #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes" -color_theme = "gruvbox_dark_v2" +color_theme = "everforest-dark-hard" theme_background = True truecolor = True force_tty = False diff --git a/home-manager/common/software/cli/themes/green/doom-emacs.d/config.el b/home-manager/common/software/cli/themes/green/doom-emacs.d/config.el index a92e1e6e..64dffa3a 100644 --- a/home-manager/common/software/cli/themes/green/doom-emacs.d/config.el +++ b/home-manager/common/software/cli/themes/green/doom-emacs.d/config.el @@ -1,5 +1,5 @@ ;; Themes -(setq doom-theme 'gruvbox-dark-hard) +(setq doom-theme 'doom-pine) (setq doom-themes-treemacs-theme "doom-colors") ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/home-manager/common/software/cli/themes/green/doom-emacs.d/packages.el b/home-manager/common/software/cli/themes/green/doom-emacs.d/packages.el index 2a768ff9..8c73f7bf 100644 --- a/home-manager/common/software/cli/themes/green/doom-emacs.d/packages.el +++ b/home-manager/common/software/cli/themes/green/doom-emacs.d/packages.el @@ -1,2 +1,3 @@ ;; Themes - Test (package! gruvbox-theme) +(package! doom-pine) diff --git a/home-manager/common/software/gui/themes/green/kitty-theme.nix b/home-manager/common/software/gui/themes/green/kitty-theme.nix index 9ab2453f..a584d160 100644 --- a/home-manager/common/software/gui/themes/green/kitty-theme.nix +++ b/home-manager/common/software/gui/themes/green/kitty-theme.nix @@ -3,8 +3,28 @@ ## name: Gruvbox Dark ## author: Pavel Pertsev ## license: MIT/X11 -## upstream: https://raw.githubusercontent.com/gruvbox-community/gruvbox-contrib/master/kitty/gruvbox-dark.conf - +## upstream: https://github.com/dexpota/kitty-themes/blob/master/themes/Hipster_Green.conf +background #3a3c3e +foreground #d9eed2 +cursor #41ff58 +selection_background #2a9b34 +color0 #1e1e1e +color8 #03260f +color1 #fb0029 +color9 #a6ff3e +color2 #329b24 +color10 #9fff6d +color3 #649a25 +color11 #d1ff6d +color4 #149b45 +color12 #72ffb5 +color5 #53b82b +color13 #50ff3d +color6 #2bb767 +color14 #22ff71 +color7 #dffeee +color15 #daeed0 +selection_foreground #3a3c3e ''; }