leonv/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Many changes to make themes more OLED friendly

Browse source
This commit is contained in:
Leon Vatthauer 2024-05-18 14:38:28 +02:00
parent 6f1ffa4af2
commit 49583208f1
Signed by: leonv
SSH key fingerprint: SHA256:G4+ddwoZmhLPRB1agvXzZMXIzkVJ36dUYZXf5NxT+u8
8 changed files with 92 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
absol/eww/config/eww.scss
View file

@ -23,7 +23,7 @@ $overlay0: #6e738d;
$surface2: #5b6078; $surface2: #5b6078;
$surface1: #494d64; $surface1: #494d64;
$surface0: #363a4f; $surface0: #363a4f;
$base: #24273a; $base: #000000;//#24273a;
$mantle: #1e2030; $mantle: #1e2030;
$crust: #181926; $crust: #181926;
@ -32,11 +32,6 @@ $crust: #181926;
font-family: "monospace"; font-family: "monospace";
} }
// .bar {
// background-color: $base;
// border-radius: 16px;
// }
.container { .container {
background-color: $base; background-color: $base;
border-radius: 16px; border-radius: 16px;

19
absol/eww/config/eww.yuck
View file

@ -16,7 +16,6 @@
(centerbox (centerbox
:class "bar" :class "bar"
(left) (left)
; (center)
"" ""
(right) (right)
) )
@ -32,15 +31,15 @@
) )
) )
(defwidget center [] ; (defwidget center []
(box ; (box
:space-evenly false ; :space-evenly false
:halign "center" ; :halign "center"
:class "container" ; :class "container"
:visible {strlength(window) != 0} ; :visible {strlength(window) != 0}
(windowtitle) ; (windowtitle)
) ; )
) ; )
(defwidget right [] (defwidget right []
(box (box

31
absol/hypr/hypridle.conf
View file

@ -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. 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 { #listener {
# timeout = 150 # 2.5min. # timeout = 300 # 5min
# on-timeout = brightnessctl -s set 10 # set monitor backlight to minimum, avoid 0 on OLED monitor. # on-timeout = loginctl lock-session # lock screen when timeout has passed
# on-resume = brightnessctl -r # monitor backlight restore.
#} #}
# turn off keyboard backlight, comment out this section if you dont have a keyboard backlight. #listener {
#listener { # timeout = 330 # 5.5min
# timeout = 150 # 2.5min. # on-timeout = hyprctl dispatch dpms off # screen off when timeout has passed
# on-timeout = brightnessctl -sd rgb:kbd_backlight set 0 # turn off keyboard backlight. # on-resume = hyprctl dispatch dpms on # screen on when activity is detected after timeout has fired.
# on-resume = brightnessctl -rd rgb:kbd_backlight # turn on keyboard backlight.
#} #}
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 { listener {
timeout = 1800 # 30min timeout = 1800 # 30min
on-timeout = systemctl suspend # suspend pc on-timeout = systemctl suspend # suspend pc

103
absol/hypr/hyprland.nix
View file

@ -1,15 +1,21 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
services.hypridle.enable = true;
services.hyprpaper.enable = true;
programs.hyprlock.enable = true;
# hyprland setup # hyprland setup
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
xwayland.enable = true; xwayland.enable = true;
settings = { settings = {
xwayland."force_zero_scaling" = true;
env = [ env = [
"HYPRCURSOR_THEME,Bibata-Original-Classic" "HYPRCURSOR_THEME,Bibata-Original-Classic"
"HYPRCURSOR_SIZE,48" "HYPRCURSOR_SIZE,24"
"XCURSOR_THEME,Catppuccin-Macchiato-Red" #"XCURSOR_THEME,Catppuccin-Macchiato-Red"
"XCURSOR_SIZE,48" "XCURSOR_SIZE,24"
"GDK_SCALE,2"
]; ];
workspace = [ workspace = [
"1, monitor:eDP-1, default:true, persistent:true" "1, monitor:eDP-1, default:true, persistent:true"
@ -17,6 +23,7 @@
]; ];
monitor = [ monitor = [
"eDP-1, 2880x1800@120, 0x0, 2" "eDP-1, 2880x1800@120, 0x0, 2"
#"HDMI-A-1, 2560x1440@75, 0x1800, 1"
]; ];
input = { input = {
kb_layout = "de"; kb_layout = "de";
@ -26,30 +33,17 @@
"$mod" = "SUPER"; "$mod" = "SUPER";
"$modd" = "SUPER_SHIFT"; "$modd" = "SUPER_SHIFT";
general = { general = {
gaps_in = 8; gaps_in = 0;
gaps_out = 15; gaps_out = 0;
border_size = 3; border_size = 0;
resize_on_border = true; resize_on_border = true;
layout = "dwindle"; 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 = { decoration = {
blur = { blur.enabled = false;
new_optimizations = true; drop_shadow = false;
size = 1; rounding = 0;
passes = 1;
};
drop_shadow = true;
shadow_range = 100;
shadow_render_power = 5;
"col.shadow" = "0x33000000";
"col.shadow_inactive" = "0x22000000";
rounding = 15;
}; };
animations = { animations = {
enabled = 1; enabled = 1;
@ -63,6 +57,7 @@
}; };
misc = { misc = {
disable_hyprland_logo = true; disable_hyprland_logo = true;
vfr = true;
}; };
bind = [ bind = [
# opening programs # opening programs
@ -126,11 +121,13 @@
", XF86MonBrightnessDown, exec, brillo -q -U 5" ", XF86MonBrightnessDown, exec, brillo -q -U 5"
]; ];
exec-once = [ exec-once = [
"/home/leonv/Git/nixos/absol/hypr/killer.sh" #"/home/leonv/Git/nixos/absol/hypr/killer.sh"
"/home/leonv/Git/nixos/absol/hypr/start.sh" #"/home/leonv/Git/nixos/absol/hypr/start.sh"
"hyprctl setcursor Bibata-Original-Classic 48" #"hyprctl setcursor Bibata-Original-Classic 24"
"systemctl --user import-environment" #"systemctl --user import-environment"
"hypridle" #"hypridle"
#"hyprpaper"
"mako"
]; ];
}; };
}; };
@ -147,22 +144,30 @@
dpi-aware = "yes"; dpi-aware = "yes";
}; };
colors = { colors = {
foreground = "cad3f5"; foreground="cdd6f4";
background = "24273a"; background="000000";
regular0 = "494d64"; regular0="bac2de";
regular1 = "ed8796"; regular1="f38ba8";
regular3 = "eed49f"; regular2="a6e3a1";
regular4 = "8aadf4"; regular3="f9e2af";
regular5 = "f5bde6"; regular4="89b4fa";
regular6 = "8bd5ca"; regular5="f5c2e7";
regular7 = "b8c0e0"; regular6="94e2d5";
bright0 = "5b6078"; regular7="585b70";
bright1 = "ed8796"; bright0="a6adc8";
bright3 = "eed49f"; bright1="f38ba8";
bright4 = "8aadf4"; bright2="a6e3a1";
bright5 = "f5bde6"; bright3="f9e2af";
bright6 = "8bd5ca"; bright4="89b4fa";
bright7 = "a5adcb"; 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 = '' style = ''
window { window {
margin: 0px; margin: 0px;
border: 2px solid #b59dc3;
background-color: #282a36;
border-radius: 18px; border-radius: 18px;
} }
#input { #input {
@ -202,21 +203,21 @@
border: none; border: none;
color: #f8f8f2; color: #f8f8f2;
border-radius: 15px; border-radius: 15px;
background-color: #44475a; background-color: #000000;
} }
#inner-box { #inner-box {
margin: 5px; margin: 5px;
border: none; border: none;
border-radius: 15px; border-radius: 15px;
background-color: #282a36; background-color: #000000;
} }
#outer-box { #outer-box {
margin: 5px; margin: 5px;
border: none; border: none;
border-radius: 15px; border-radius: 15px;
background-color: #282a36; background-color: #000000;
} }
#scroll { #scroll {
@ -242,7 +243,7 @@
#entry:selected { #entry:selected {
border-radius: 15px; border-radius: 15px;
background-color: #44475a; background-color: #62AEEFFF;
} }
#entry:selected #text { #entry:selected #text {

2
absol/hypr/hyprlock.conf
View file

@ -39,7 +39,7 @@ label {
input-field { input-field {
monitor = monitor =
size = 200, 50 size = 400, 50
outline_thickness = 3 outline_thickness = 3
dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8 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 dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0

4
absol/hypr/hyprpaper.conf
View file

@ -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 #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

6
absol/hypr/start.sh
View file

@ -3,8 +3,8 @@
# init nmapplet # init nmapplet
# TODO add back once eww supports tray # TODO add back once eww supports tray
# nm-applet --indicator & # nm-applet --indicator &
swww init #swww init
swww img /home/leonv/Git/nixos/absol/hypr/wallpaper.jpg #swww img /home/leonv/Git/nixos/absol/hypr/wallpaper.jpg
# notification # notification
mako & #mako &

26
absol/leonv.nix
View file

@ -12,8 +12,7 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
brillo brillo
# theme for gtk applications synology-drive-client
orchis-theme
# stuff # stuff
jq jq
@ -58,18 +57,14 @@
mako mako
libnotify libnotify
pavucontrol pavucontrol
hyprpaper
qimgv qimgv
playerctl playerctl
hyprpicker hyprpicker
hypridle
hyprlock
wev wev
inputs.hyprland-contrib.packages.${pkgs.system}.grimblast inputs.hyprland-contrib.packages.${pkgs.system}.grimblast
bluez bluez
htop htop
archiver archiver
#gnome.file-roller
zip zip
unzip unzip
emacs emacs
@ -96,6 +91,7 @@
xdg.configHome = /home/leonv/.config; xdg.configHome = /home/leonv/.config;
xdg.configFile."hypr/hypridle.conf".source = ./hypr/hypridle.conf; xdg.configFile."hypr/hypridle.conf".source = ./hypr/hypridle.conf;
xdg.configFile."hypr/hyprlock.conf".source = ./hypr/hyprlock.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/init.el".source = ./doom/init.el;
xdg.configFile."doom/config.el".source = ./doom/config.el; xdg.configFile."doom/config.el".source = ./doom/config.el;
xdg.configFile."doom/packages.el".source = ./doom/packages.el; xdg.configFile."doom/packages.el".source = ./doom/packages.el;
@ -120,16 +116,18 @@
oh-my-zsh.enable = true; oh-my-zsh.enable = true;
}; };
home.pointerCursor = {
gtk.enable = true;
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";
size = 24;
};
gtk = { gtk = {
enable = true; enable = true;
theme = { theme = {
name = "Catppuccin-Macchiato-Compact-Flamingo-Dark"; name = "Orchis-Dark-Compact";
package = pkgs.catppuccin-gtk.override { package = pkgs.orchis-theme.overrideAttrs (finalAttrs: { tweaks = [ "dark" ]; });
accents = [ "flamingo" ];
size = "compact";
tweaks = [ "rimless" "black" ];
variant = "macchiato";
};
}; };
iconTheme = { iconTheme = {
name = "Dracula"; name = "Dracula";
@ -139,7 +137,7 @@
name = "NotoSans Nerd Font"; 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" ]; home.sessionPath = [ "$HOME/.config/emacs/bin" ];
services.mpris-proxy.enable = true; services.mpris-proxy.enable = true;