From 49583208f1752a9d6da0a49b1c9c0d9590919fea Mon Sep 17 00:00:00 2001 From: Leon Vatthauer Date: Sat, 18 May 2024 14:38:28 +0200 Subject: [PATCH] Many changes to make themes more OLED friendly --- absol/eww/config/eww.scss | 7 +-- absol/eww/config/eww.yuck | 19 ++++--- absol/hypr/hypridle.conf | 31 +++++------- absol/hypr/hyprland.nix | 103 +++++++++++++++++++------------------- absol/hypr/hyprlock.conf | 2 +- absol/hypr/hyprpaper.conf | 4 +- absol/hypr/start.sh | 6 +-- absol/leonv.nix | 26 +++++----- 8 files changed, 92 insertions(+), 106 deletions(-) diff --git a/absol/eww/config/eww.scss b/absol/eww/config/eww.scss index d506ee5..fdf32cc 100644 --- a/absol/eww/config/eww.scss +++ b/absol/eww/config/eww.scss @@ -23,7 +23,7 @@ $overlay0: #6e738d; $surface2: #5b6078; $surface1: #494d64; $surface0: #363a4f; -$base: #24273a; +$base: #000000;//#24273a; $mantle: #1e2030; $crust: #181926; @@ -32,11 +32,6 @@ $crust: #181926; font-family: "monospace"; } -// .bar { -// background-color: $base; -// border-radius: 16px; -// } - .container { background-color: $base; border-radius: 16px; diff --git a/absol/eww/config/eww.yuck b/absol/eww/config/eww.yuck index 76561ca..7dc9286 100644 --- a/absol/eww/config/eww.yuck +++ b/absol/eww/config/eww.yuck @@ -16,7 +16,6 @@ (centerbox :class "bar" (left) -; (center) "" (right) ) @@ -32,15 +31,15 @@ ) ) -(defwidget center [] - (box - :space-evenly false - :halign "center" - :class "container" - :visible {strlength(window) != 0} - (windowtitle) - ) -) +; (defwidget center [] + ; (box + ; :space-evenly false + ; :halign "center" + ; :class "container" + ; :visible {strlength(window) != 0} + ; (windowtitle) + ; ) +; ) (defwidget right [] (box diff --git a/absol/hypr/hypridle.conf b/absol/hypr/hypridle.conf index f040781..bd7dd01 100644 --- a/absol/hypr/hypridle.conf +++ b/absol/hypr/hypridle.conf @@ -4,30 +4,23 @@ general { after_sleep_cmd = hyprctl dispatch dpms on # to avoid having to press a key twice to turn on the display. } +listener { + timeout = 150 # 2.5min. + on-timeout = brillo -O && brillo -S 10 # set monitor backlight to minimum, avoid 0 on OLED monitor. + on-resume = brillo -I # monitor backlight restore. +} + #listener { -# timeout = 150 # 2.5min. -# on-timeout = brightnessctl -s set 10 # set monitor backlight to minimum, avoid 0 on OLED monitor. -# on-resume = brightnessctl -r # monitor backlight restore. +# timeout = 300 # 5min +# on-timeout = loginctl lock-session # lock screen when timeout has passed #} -# turn off keyboard backlight, comment out this section if you dont have a keyboard backlight. -#listener { -# timeout = 150 # 2.5min. -# on-timeout = brightnessctl -sd rgb:kbd_backlight set 0 # turn off keyboard backlight. -# on-resume = brightnessctl -rd rgb:kbd_backlight # turn on keyboard backlight. +#listener { +# timeout = 330 # 5.5min +# on-timeout = hyprctl dispatch dpms off # screen off when timeout has passed +# on-resume = hyprctl dispatch dpms on # screen on when activity is detected after timeout has fired. #} -listener { - timeout = 300 # 5min - on-timeout = loginctl lock-session # lock screen when timeout has passed -} - -listener { - timeout = 330 # 5.5min - on-timeout = hyprctl dispatch dpms off # screen off when timeout has passed - on-resume = hyprctl dispatch dpms on # screen on when activity is detected after timeout has fired. -} - listener { timeout = 1800 # 30min on-timeout = systemctl suspend # suspend pc diff --git a/absol/hypr/hyprland.nix b/absol/hypr/hyprland.nix index 92fcbda..53b441c 100644 --- a/absol/hypr/hyprland.nix +++ b/absol/hypr/hyprland.nix @@ -1,15 +1,21 @@ { pkgs, ... }: { + services.hypridle.enable = true; + services.hyprpaper.enable = true; + programs.hyprlock.enable = true; + # hyprland setup wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; settings = { + xwayland."force_zero_scaling" = true; env = [ "HYPRCURSOR_THEME,Bibata-Original-Classic" - "HYPRCURSOR_SIZE,48" - "XCURSOR_THEME,Catppuccin-Macchiato-Red" - "XCURSOR_SIZE,48" + "HYPRCURSOR_SIZE,24" + #"XCURSOR_THEME,Catppuccin-Macchiato-Red" + "XCURSOR_SIZE,24" + "GDK_SCALE,2" ]; workspace = [ "1, monitor:eDP-1, default:true, persistent:true" @@ -17,6 +23,7 @@ ]; monitor = [ "eDP-1, 2880x1800@120, 0x0, 2" + #"HDMI-A-1, 2560x1440@75, 0x1800, 1" ]; input = { kb_layout = "de"; @@ -26,30 +33,17 @@ "$mod" = "SUPER"; "$modd" = "SUPER_SHIFT"; general = { - gaps_in = 8; - gaps_out = 15; - border_size = 3; + gaps_in = 0; + gaps_out = 0; + border_size = 0; resize_on_border = true; layout = "dwindle"; - - "col.active_border" = "rgba(cba6f7ff) rgba(89b4faff) rgba(94e2d5ff) 10deg"; - "col.inactive_border" = "0xff45475a"; - "col.nogroup_border" = "0xff89dceb"; - "col.nogroup_border_active" = "0xfff9e2af"; }; decoration = { - blur = { - new_optimizations = true; - size = 1; - passes = 1; - }; - drop_shadow = true; - shadow_range = 100; - shadow_render_power = 5; - "col.shadow" = "0x33000000"; - "col.shadow_inactive" = "0x22000000"; - rounding = 15; + blur.enabled = false; + drop_shadow = false; + rounding = 0; }; animations = { enabled = 1; @@ -63,6 +57,7 @@ }; misc = { disable_hyprland_logo = true; + vfr = true; }; bind = [ # opening programs @@ -126,11 +121,13 @@ ", XF86MonBrightnessDown, exec, brillo -q -U 5" ]; exec-once = [ - "/home/leonv/Git/nixos/absol/hypr/killer.sh" - "/home/leonv/Git/nixos/absol/hypr/start.sh" - "hyprctl setcursor Bibata-Original-Classic 48" - "systemctl --user import-environment" - "hypridle" + #"/home/leonv/Git/nixos/absol/hypr/killer.sh" + #"/home/leonv/Git/nixos/absol/hypr/start.sh" + #"hyprctl setcursor Bibata-Original-Classic 24" + #"systemctl --user import-environment" + #"hypridle" + #"hyprpaper" + "mako" ]; }; }; @@ -147,22 +144,30 @@ dpi-aware = "yes"; }; colors = { - foreground = "cad3f5"; - background = "24273a"; - regular0 = "494d64"; - regular1 = "ed8796"; - regular3 = "eed49f"; - regular4 = "8aadf4"; - regular5 = "f5bde6"; - regular6 = "8bd5ca"; - regular7 = "b8c0e0"; - bright0 = "5b6078"; - bright1 = "ed8796"; - bright3 = "eed49f"; - bright4 = "8aadf4"; - bright5 = "f5bde6"; - bright6 = "8bd5ca"; - bright7 = "a5adcb"; + foreground="cdd6f4"; + background="000000"; + regular0="bac2de"; + regular1="f38ba8"; + regular2="a6e3a1"; + regular3="f9e2af"; + regular4="89b4fa"; + regular5="f5c2e7"; + regular6="94e2d5"; + regular7="585b70"; + bright0="a6adc8"; + bright1="f38ba8"; + bright2="a6e3a1"; + bright3="f9e2af"; + bright4="89b4fa"; + bright5="f5c2e7"; + bright6="94e2d5"; + bright7="45475a"; + selection-foreground="cdd6f4"; + selection-background="414356"; + search-box-no-match="11111b f38ba8"; + search-box-match="cdd6f4 313244"; + jump-labels="11111b fab387"; + urls="89b4fa"; }; }; }; @@ -190,11 +195,7 @@ style = '' window { margin: 0px; - border: 2px solid #b59dc3; - background-color: #282a36; border-radius: 18px; - - } #input { @@ -202,21 +203,21 @@ border: none; color: #f8f8f2; border-radius: 15px; - background-color: #44475a; + background-color: #000000; } #inner-box { margin: 5px; border: none; border-radius: 15px; - background-color: #282a36; + background-color: #000000; } #outer-box { margin: 5px; border: none; border-radius: 15px; - background-color: #282a36; + background-color: #000000; } #scroll { @@ -242,7 +243,7 @@ #entry:selected { border-radius: 15px; - background-color: #44475a; + background-color: #62AEEFFF; } #entry:selected #text { diff --git a/absol/hypr/hyprlock.conf b/absol/hypr/hyprlock.conf index 1bc2625..2ee0c46 100644 --- a/absol/hypr/hyprlock.conf +++ b/absol/hypr/hyprlock.conf @@ -39,7 +39,7 @@ label { input-field { monitor = - size = 200, 50 + size = 400, 50 outline_thickness = 3 dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8 dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0 diff --git a/absol/hypr/hyprpaper.conf b/absol/hypr/hyprpaper.conf index c2bcb79..b289d86 100644 --- a/absol/hypr/hyprpaper.conf +++ b/absol/hypr/hyprpaper.conf @@ -1,4 +1,4 @@ -preload = ~/Git/nixos/absol/hypr/wallpaper.jpg +preload = /home/leonv/Git/nixos/absol/hypr/wallpaper.jpg #set the default wallpaper(s) seen on inital workspace(s) --depending on the number of monitors used -wallpaper = monitor1,~/Git/nixos/absol/hypr/wallpaper.jpg +wallpaper = ,/home/leonv/Git/nixos/absol/hypr/wallpaper.jpg diff --git a/absol/hypr/start.sh b/absol/hypr/start.sh index fada238..fce9fc7 100755 --- a/absol/hypr/start.sh +++ b/absol/hypr/start.sh @@ -3,8 +3,8 @@ # init nmapplet # TODO add back once eww supports tray # nm-applet --indicator & -swww init -swww img /home/leonv/Git/nixos/absol/hypr/wallpaper.jpg +#swww init +#swww img /home/leonv/Git/nixos/absol/hypr/wallpaper.jpg # notification -mako & +#mako & diff --git a/absol/leonv.nix b/absol/leonv.nix index 250a3d4..79f9d85 100755 --- a/absol/leonv.nix +++ b/absol/leonv.nix @@ -12,8 +12,7 @@ home.packages = with pkgs; [ brillo - # theme for gtk applications - orchis-theme + synology-drive-client # stuff jq @@ -58,18 +57,14 @@ mako libnotify pavucontrol - hyprpaper qimgv playerctl hyprpicker - hypridle - hyprlock wev inputs.hyprland-contrib.packages.${pkgs.system}.grimblast bluez htop archiver - #gnome.file-roller zip unzip emacs @@ -96,6 +91,7 @@ xdg.configHome = /home/leonv/.config; xdg.configFile."hypr/hypridle.conf".source = ./hypr/hypridle.conf; xdg.configFile."hypr/hyprlock.conf".source = ./hypr/hyprlock.conf; + xdg.configFile."hypr/hyprpaper.conf".source = ./hypr/hyprpaper.conf; xdg.configFile."doom/init.el".source = ./doom/init.el; xdg.configFile."doom/config.el".source = ./doom/config.el; xdg.configFile."doom/packages.el".source = ./doom/packages.el; @@ -120,16 +116,18 @@ oh-my-zsh.enable = true; }; + home.pointerCursor = { + gtk.enable = true; + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Classic"; + size = 24; + }; + gtk = { enable = true; theme = { - name = "Catppuccin-Macchiato-Compact-Flamingo-Dark"; - package = pkgs.catppuccin-gtk.override { - accents = [ "flamingo" ]; - size = "compact"; - tweaks = [ "rimless" "black" ]; - variant = "macchiato"; - }; + name = "Orchis-Dark-Compact"; + package = pkgs.orchis-theme.overrideAttrs (finalAttrs: { tweaks = [ "dark" ]; }); }; iconTheme = { name = "Dracula"; @@ -139,7 +137,7 @@ name = "NotoSans Nerd Font"; }; }; - home.sessionVariables.GTK_THEME = "Catppuccin-Macchiato-Compact-Flamingo-Dark"; + home.sessionVariables.GTK_THEME = "Orchis-Dark-Compact"; home.sessionPath = [ "$HOME/.config/emacs/bin" ]; services.mpris-proxy.enable = true;