From abf98d16a74dc1971bd1067322d18fb8dd1f66bf Mon Sep 17 00:00:00 2001 From: Tyler Kelley Date: Thu, 29 Feb 2024 12:19:53 -0600 Subject: [PATCH] Updated Waybar Themes & Add Health Checks To Wallsetter --- config/home/files/wlogout/hibernate.png | Bin 0 -> 4687 bytes config/home/files/wlogout/lock.png | Bin 0 -> 2983 bytes config/home/hyprland.nix | 2 + config/home/kitty.nix | 2 +- config/home/waybar.nix | 252 +++++++++++++----------- config/home/wlogout.nix | 22 +++ config/scripts/wallsetter.nix | 14 +- options.nix | 4 +- 8 files changed, 179 insertions(+), 117 deletions(-) create mode 100644 config/home/files/wlogout/hibernate.png create mode 100644 config/home/files/wlogout/lock.png diff --git a/config/home/files/wlogout/hibernate.png b/config/home/files/wlogout/hibernate.png new file mode 100644 index 0000000000000000000000000000000000000000..bf2b0010414af5077f0a63d61a9b04c839038e9f GIT binary patch literal 4687 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 literal 0 HcmV?d00001 diff --git a/config/home/files/wlogout/lock.png b/config/home/files/wlogout/lock.png new file mode 100644 index 0000000000000000000000000000000000000000..da59b10e1133cad9b2ff39bfb0e5148fd9d552a4 GIT binary patch literal 2983 zcmdT`X;c*16@FDz(?ugtEe#UZ>W&ITM*%@W1d68FMnF^;mvLd5umubtD2NUe%_=b1 z4$2~i=}}@55fF_6L8VzWj5;WS8?u@p(+G_*0kMU74aURC;UpRVr(UF{6U$q7rPgJ@ubIR6|Htdm!xY_f~_n!87|e0@xEYf`CYO8I49bpGq!EX7UQzh)wba+ zR%N|;^%mlL+wyCDV)QIm3e^@1%*@Wxyol7WPR}Z_$l=E;FilcA#pzV zt}jVm_xTEYyZ&X2Gt}Gc!6P}qsE#ThuyVV|1d@nuOBQH2Fy=^*tGF^8)I(0QU zTb6!q1SznW_T_PlFRgeJ#(KO`p6J$lLUk%KdDNz|ddktqgkE|;rykMNOulCrR9PJ# z7ZMXWQ}Tz22^EIV{{A$Nz&!X~RD~Pe1<=FojZ0k;bZSu^J7VA~e5l+JzFBcRB$=_E z-mc6cH63+p`?9rFu~2r_Q{e0u|Kw%&yA>aLoDhG?PF{sA1t`KCD}O~#8L6q#m1m;hmBA2*$( zGmV81zTl?gByPgb1fqFR&Q1L%`>(K(3AMZdMx$2uAn5$as6gZ7dBkA;oqLCLolC}t z3F+nHXGN9ljTXqM>8Oy%^6e{d$>bN>mlH3T+});_(MI9DJ zf3#y?x7-olrEi=pTyy?;eKjFOn~iE;>`3X7*yy!7rKNwxys4^9j$Ye0x;?M!m#i^R z^=G*(TAS}h*L3JQ$~dyvH9d%MYlCGAmRa|!V(YH*1K}uEjOW@cr@CFA=2YdD2Wpd# ztfMq7kb#QFt=TsFyo*7DTmNZVjfiVoyHjQ$JG^IlnO?-ASf@?=Oi11w2)Q13eN&q~ z6`^VyR|ullMX0nqss4vI9iSqu6@Z5HqcK@v|JUvm?cf3$O8dGS4a4tqqfA3mnr-?| zSs)^Hqal3+GvM8|GpKaQ2rxXB5RqErw(IB1DL_zBA=x(4LD~0Qy{5B91|}6t9%ic% z03*8Z2)#+V_?7KVw~Q;v0PQ=s6GUf>nFV}B(m?)Pqrj!Tz+Go_B-*Gp*NX-uT@%g- zS4EoLR7v`+ya(;x@Hh}tCW?~>XmDv@(WH^@(w-6Wx6$tCFKchih1fF)3asxGNqOvWEd&GqwNU{1X!~&c{|4xtJNQ=pO4q3lmIbNj|G7=zoBEtS z1Q!YbLyIB;QL_Xf)YGB*Rfxvl1C|L*xG{VuL8`?s=td@)x*6d(0&WgVB1h!0c;rm_ z08_e%eeGqjnh98wCeM%LC4$?!4gI~80u)+`njCjcfU1T|4hP*f3(fE1ni2B zv7bK64-e*lGTo1xeF4926xedkNt*=AsjVb1@Aw9;nc5O_f<7@k<_BB}diOw_A^e7l z^}oBkH-Lo&{C#+Ai<0jgjI*P8xU_BDUULi}9vVaTdn4d@%kbDskVS$Ot(6;RbpsDS zQR+S&m+4b%Ea2qi0WArRUgRs%F<%TRbVzJM%|zg~Vg0uVhYx}m_3lGB&LBAZz0c|` zpXKr1KqX(2tMq(O!s_KHeSfy5gh27Vu^^40CeNstrGmyKMidt#ZoB|lT>3=|)0aT7 gO~92+jjWntK4Oj7R%IN&0sr8Dr>l>kf*&CI5yMTGd;kCd literal 0 HcmV?d00001 diff --git a/config/home/hyprland.nix b/config/home/hyprland.nix index 0a94a14..c61f8cc 100644 --- a/config/home/hyprland.nix +++ b/config/home/hyprland.nix @@ -24,6 +24,8 @@ in with lib; { windowrule = float, ^(steam)$ windowrule = size 1080 900, ^(steam)$ windowrule = center, ^(steam)$ + windowrule = fullscreen, ^(wlogout)$ + windowrule = animation fade,^(wlogout)$ general { gaps_in = 6 gaps_out = 8 diff --git a/config/home/kitty.nix b/config/home/kitty.nix index 72ebcd2..406948d 100644 --- a/config/home/kitty.nix +++ b/config/home/kitty.nix @@ -14,7 +14,7 @@ in lib.mkIf (wezterm == false && alacritty == false settings = { scrollback_lines = 2000; wheel_scroll_min_lines = 1; - window_padding_width = 0; + window_padding_width = 4; confirm_os_window_close = 0; background_opacity = "0.85"; }; diff --git a/config/home/waybar.nix b/config/home/waybar.nix index bc53ba0..fc0a5a4 100644 --- a/config/home/waybar.nix +++ b/config/home/waybar.nix @@ -2,6 +2,7 @@ let palette = config.colorScheme.palette; + betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)"; inherit (import ../../options.nix) slickbar bar-number simplebar clock24h; in with lib; { # Configure & Theme Waybar @@ -14,7 +15,7 @@ in with lib; { modules-center = [ "hyprland/workspaces" ] ; modules-left = [ "custom/startmenu" "hyprland/window" "pulseaudio" "cpu" "memory"]; - modules-right = [ "custom/hyprbindings" "custom/exit" "idle_inhibitor" "custom/themeselector" "custom/notification" "pulseaudio" "clock" "tray" ]; + modules-right = [ "custom/hyprbindings" "custom/exit" "idle_inhibitor" "custom/themeselector" "custom/notification" "clock" "tray" ]; "hyprland/workspaces" = { format = if bar-number == true then "{name}" else "{icon}"; @@ -102,8 +103,8 @@ in with lib; { "idle_inhibitor" = { format = "{icon}"; format-icons = { - activated = " "; - deactivated = " "; + activated = ""; + deactivated = ""; }; tooltip = "true"; }; @@ -146,16 +147,11 @@ in with lib; { font-weight: bold; } window#waybar { - ${if slickbar == true then '' + ${if slickbar == true || simplebar == true then '' background-color: rgba(26,27,38,0); border-bottom: 1px solid rgba(26,27,38,0); border-radius: 0px; color: #${palette.base0F}; - '' else if simplebar == true then '' - color: #${config.colorScheme.colors.base05}; - background-color: #${palette.base00}; - border-radius: 0px; - border-bottom: 1px solid rgba(26,27,38,0); '' else '' background-color: #${palette.base00}; border-bottom: 1px solid #${palette.base00}; @@ -165,7 +161,7 @@ in with lib; { } #workspaces { ${if slickbar == true then '' - background: linear-gradient(180deg, #${palette.base00}, #${palette.base01}); + background: #${palette.base00}; margin: 5px; padding: 0px 1px; border-radius: 15px; @@ -173,13 +169,14 @@ in with lib; { font-style: normal; color: #${palette.base00}; '' else if simplebar == true then '' - color: #${config.colorScheme.colors.base05}; + color: #${palette.base00}; background: transparent; + margin: 4px; border-radius: 0px; border: 0px; font-style: normal; '' else '' - background: linear-gradient(45deg, #${palette.base01}, #${palette.base01}); + background: #${palette.base01}; margin: 4px; padding: 0px 1px; border-radius: 10px; @@ -195,24 +192,28 @@ in with lib; { border-radius: 15px; border: 0px; color: #${palette.base00}; - background: linear-gradient(45deg, #${palette.base0D}, #${palette.base0E}); + background: linear-gradient(45deg, #${palette.base0C}, #${palette.base0D}, #${palette.base0E}); opacity: 0.5; - transition: all 0.3s ease-in-out; + transition: ${betterTransition}; '' else if simplebar == true then '' - color: #${config.colorScheme.colors.base05}; - background: transparent; - opacity: 0.3; + color: #${config.colorScheme.colors.base03}; + background: #${palette.base00}; + margin: 4px 3px; + opacity: 1; border: 0px; - transition: all 0.3s ease-in-out; + border-radius: 15px; + transition: ${betterTransition}; '' else '' padding: 0px 5px; margin: 4px 3px; border-radius: 10px; border: 0px; color: #${palette.base00}; - background: linear-gradient(45deg, #${palette.base06}, #${palette.base0E}); + background: linear-gradient(45deg, #${palette.base0E}, #${palette.base0F}, #${palette.base0D}, #${palette.base09}); + background-size: 300% 300%; + animation: gradient_horizontal 15s ease infinite; opacity: 0.5; - transition: all 0.3s ease-in-out; + transition: ${betterTransition}; ''} } #workspaces button.active { @@ -225,23 +226,30 @@ in with lib; { background: linear-gradient(45deg, #${palette.base0D}, #${palette.base0E}); opacity: 1.0; min-width: 40px; - transition: all 0.3s ease-in-out; + transition: ${betterTransition}; '' else if simplebar == true then '' - color: #${config.colorScheme.colors.base05}; - background: transparent; + color: #${palette.base00}; + background: linear-gradient(118deg, #${palette.base0D} 5%, #${palette.base0F} 5%, #${palette.base0F} 20%, #${palette.base0D} 20%, #${palette.base0D} 40%, #${palette.base0F} 40%, #${palette.base0F} 60%, #${palette.base0D} 60%, #${palette.base0D} 80%, #${palette.base0F} 80%, #${palette.base0F} 95%, #${palette.base0D} 95%); + background-size: 300% 300%; + animation: swiping 15s linear infinite; + border-radius: 15px; + margin: 4px 3px; opacity: 1.0; border: 0px; - transition: all 0.3s ease-in-out; + min-width: 45px; + transition: ${betterTransition}; '' else '' padding: 0px 5px; margin: 4px 3px; border-radius: 10px; border: 0px; color: #${palette.base00}; - background: linear-gradient(45deg, #${palette.base06}, #${palette.base0E}); + background: linear-gradient(45deg, #${palette.base0E}, #${palette.base0F}, #${palette.base0D}, #${palette.base09}); + background-size: 300% 300%; + animation: gradient_horizontal 15s ease infinite; + transition: ${betterTransition}; opacity: 1.0; min-width: 40px; - transition: all 0.3s ease-in-out; ''} } #workspaces button:hover { @@ -250,19 +258,41 @@ in with lib; { color: #${palette.base00}; background: linear-gradient(45deg, #${palette.base0D}, #${palette.base0E}); opacity: 0.8; + transition: ${betterTransition}; '' else if simplebar == true then '' color: #${config.colorScheme.colors.base05}; - background: transparent; - opacity: 0.8; border: 0px; - transition: all 0.3s ease-in-out; + border-radius: 15px; + transition: ${betterTransition}; '' else '' border-radius: 10px; color: #${palette.base00}; - background: linear-gradient(45deg, #${palette.base06}, #${palette.base0E}); + background: linear-gradient(45deg, #${palette.base0E}, #${palette.base0F}, #${palette.base0D}, #${palette.base09}); + background-size: 300% 300%; + animation: gradient_horizontal 15s ease infinite; opacity: 0.8; + transition: ${betterTransition}; ''} } + @keyframes gradient_horizontal { + 0% { + background-position: 0% 50%; + } + 50% { + background-position: 100% 50%; + } + 100% { + background-position: 0% 50%; + } + } + @keyframes swiping { + 0% { + background-position: 0% 200%; + } + 100% { + background-position: 200% 200%; + } + } tooltip { background: #${palette.base00}; border: 1px solid #${palette.base0E}; @@ -279,9 +309,11 @@ in with lib; { margin: 5px; padding: 2px 20px; '' else if simplebar == true then '' - color: #${config.colorScheme.colors.base05}; - background: transparent; - margin: 4px; + color: #${palette.base03}; + background: #${palette.base00}; + margin: 6px 4px; + border-radius: 15px; + padding: 0px 10px; '' else '' margin: 4px; padding: 2px 10px; @@ -294,13 +326,14 @@ in with lib; { color: #${palette.base0F}; ${if slickbar == true then '' background: #${palette.base00}; - border-radius: 15px 50px 15px 50px; + border-radius: 50px 15px 50px 15px; margin: 5px; padding: 2px 20px; '' else if simplebar == true then '' - color: #${config.colorScheme.colors.base05}; - background: transparent; - margin: 4px; + background: #${palette.base00}; + margin: 6px 4px; + padding: 0px 10px; + border-radius: 15px; '' else '' background: #${palette.base01}; margin: 4px; @@ -316,27 +349,10 @@ in with lib; { margin: 5px; padding: 2px 20px; '' else if simplebar == true then '' - color: #${config.colorScheme.colors.base05}; - background: transparent; - margin: 4px; - '' else '' - background: #${palette.base01}; - margin: 4px; - padding: 2px 10px; - border-radius: 10px; - ''} - } - #idle_inhibitor { - color: #${palette.base0A}; - ${if slickbar == true then '' background: #${palette.base00}; - border-radius: 50px 15px 50px 15px; - margin: 5px; - padding: 2px 20px; - '' else if simplebar == true then '' - color: #${config.colorScheme.colors.base05}; - background: transparent; - margin: 4px; + margin: 6px 4px; + padding: 0px 10px; + border-radius: 15px; '' else '' background: #${palette.base01}; margin: 4px; @@ -352,9 +368,10 @@ in with lib; { margin: 5px; padding: 2px 20px; '' else if simplebar == true then '' - color: #${config.colorScheme.colors.base05}; - background: transparent; - margin: 4px; + background: #${palette.base00}; + margin: 6px 4px; + padding: 0px 10px; + border-radius: 15px; '' else '' background: #${palette.base01}; margin: 4px; @@ -370,9 +387,10 @@ in with lib; { margin: 5px; padding: 2px 20px; '' else if simplebar == true then '' - color: #${config.colorScheme.colors.base05}; - background: transparent; - margin: 4px; + background: #${palette.base00}; + margin: 6px 4px; + padding: 0px 10px; + border-radius: 15px; '' else '' background: #${palette.base01}; margin: 4px; @@ -388,9 +406,10 @@ in with lib; { margin: 5px; padding: 2px 20px; '' else if simplebar == true then '' - color: #${config.colorScheme.colors.base05}; - background: transparent; - margin: 4px; + background: #${palette.base00}; + margin: 6px 4px; + padding: 0px 10px; + border-radius: 15px; '' else '' background: #${palette.base01}; margin: 4px; @@ -406,9 +425,10 @@ in with lib; { margin: 5px; padding: 2px 20px; '' else if simplebar == true then '' - color: #${config.colorScheme.colors.base05}; - background: transparent; - margin: 4px; + background: #${palette.base00}; + margin: 6px 4px; + padding: 0px 10px; + border-radius: 15px; '' else '' background: #${palette.base01}; margin: 4px; @@ -420,13 +440,14 @@ in with lib; { color: #${palette.base0E}; ${if slickbar == true then '' background: #${palette.base00}; - border-radius: 50px 15px 50px 15px; + border-radius: 15px 50px 15px 50px; margin: 5px; padding: 2px 20px; '' else if simplebar == true then '' - color: #${config.colorScheme.colors.base05}; - background: transparent; - margin: 4px; + background: #${palette.base00}; + margin: 6px 4px; + padding: 0px 10px; + border-radius: 15px; '' else '' background: #${palette.base01}; margin: 4px; @@ -442,9 +463,10 @@ in with lib; { margin: 5px 0px 5px 5px; padding: 2px 20px; '' else if simplebar == true then '' - color: #${config.colorScheme.colors.base05}; - background: transparent; - margin: 4px; + background: #${palette.base00}; + margin: 6px 4px; + padding: 0px 10px; + border-radius: 15px; '' else '' background: #${palette.base01}; margin: 4px; @@ -460,9 +482,10 @@ in with lib; { margin: 5px; padding: 2px 20px; '' else if simplebar == true then '' - color: #${config.colorScheme.colors.base05}; - background: transparent; - margin: 4px; + background: #${palette.base00}; + margin: 6px 4px; + padding: 0px 10px; + border-radius: 15px; '' else '' background: #${palette.base01}; margin: 4px; @@ -478,9 +501,10 @@ in with lib; { margin: 5px; padding: 2px 20px; '' else if simplebar == true then '' - color: #${config.colorScheme.colors.base05}; - background: transparent; - margin: 4px; + background: #${palette.base00}; + margin: 6px 4px; + padding: 0px 10px; + border-radius: 15px; '' else '' background: #${palette.base01}; margin: 4px; @@ -492,18 +516,19 @@ in with lib; { color: #${palette.base0D}; ${if slickbar == true then '' background: #${palette.base00}; - border-radius: 15px 50px 15px 50px; - margin: 5px; - padding: 2px 20px; + border-radius: 0px 50px 15px 0px; + margin: 5px 0px; + padding: 2px 15px 2px 5px; '' else if simplebar == true then '' - color: #${config.colorScheme.colors.base05}; - background: transparent; - margin: 4px; + background: #${palette.base00}; + margin: 6px 4px 6px 0px; + padding: 0px 10px 0px 5px; + border-radius: 0px 15px 15px 0px; '' else '' background: #${palette.base01}; - margin: 4px; - padding: 2px 10px; - border-radius: 10px; + margin: 4px 0px; + padding: 2px 10px 2px 5px; + border-radius: 0px 10px 10px 0px; ''} } #custom-startmenu { @@ -514,9 +539,10 @@ in with lib; { margin: 5px 5px 5px 0px; padding: 2px 20px; '' else if simplebar == true then '' - color: #${config.colorScheme.colors.base05}; - background: transparent; - margin: 4px; + background: #${palette.base00}; + margin: 6px 4px; + padding: 0px 8px 0px 10px; + border-radius: 15px; '' else '' background: #${palette.base01}; margin: 4px; @@ -528,36 +554,38 @@ in with lib; { color: #${palette.base09}; ${if slickbar == true then '' background: #${palette.base00}; - border-radius: 15px 50px 15px 50px; - margin: 5px; - padding: 2px 20px; + border-radius: 0px; + margin: 5px 0px; + padding: 2px 14px; '' else if simplebar == true then '' - color: #${config.colorScheme.colors.base05}; - background: transparent; - margin: 4px; + background: #${palette.base00}; + margin: 6px 0px; + padding: 0px 14px; + border-radius: 0px; '' else '' background: #${palette.base01}; - margin: 4px; - padding: 2px 10px; - border-radius: 10px; + margin: 4px 0px; + padding: 2px 14px; + border-radius: 0px; ''} } #custom-exit { color: #${palette.base0E}; ${if slickbar == true then '' background: #${palette.base00}; - border-radius: 15px 50px 15px 50px; - margin: 5px; - padding: 2px 20px; + border-radius: 15px 0px 0px 50px; + margin: 5px 0px; + padding: 2px 5px 2px 15px; '' else if simplebar == true then '' - color: #${config.colorScheme.colors.base05}; - background: transparent; - margin: 4px; + background: #${palette.base00}; + margin: 6px 0px 6px 4px; + padding: 0px 5px 0px 10px; + border-radius: 15px 0px 0px 15px; '' else '' background: #${palette.base01}; - margin: 4px; - padding: 2px 10px; - border-radius: 10px; + margin: 4px 0px; + padding: 2px 5px 2px 10px; + border-radius: 10px 0px 0px 10px; ''} } '' ]; diff --git a/config/home/wlogout.nix b/config/home/wlogout.nix index 61dbb04..17fc33c 100644 --- a/config/home/wlogout.nix +++ b/config/home/wlogout.nix @@ -30,6 +30,18 @@ in { "text" = "Suspend"; "keybind" = "u"; } + { + "label" = "lock"; + "action" = "sleep 1; hyprlock"; + "text" = "Lock"; + "keybind" = "l"; + } + { + "label" = "hibernate"; + "action" = "sleep 1; systemctl hibernate"; + "text" = "Hibernate"; + "keybind" = "h"; + } ]; style = '' * { @@ -78,6 +90,16 @@ in { border-radius: 20px; background-image: image(url("icons/reboot.png")); } + #lock { + margin: 10px; + border-radius: 20px; + background-image: image(url("icons/lock.png")); + } + #hibernate { + margin: 10px; + border-radius: 20px; + background-image: image(url("icons/hibernate.png")); + } ''; }; } diff --git a/config/scripts/wallsetter.nix b/config/scripts/wallsetter.nix index ad11338..f1d0760 100644 --- a/config/scripts/wallsetter.nix +++ b/config/scripts/wallsetter.nix @@ -10,8 +10,18 @@ pkgs.writeShellScriptBin "wallsetter" '' WALLPAPER=$(find ${wallpaperDir} -name '*' | awk '!/.git/' | tail -n +2 | shuf -n 1) PREVIOUS=$WALLPAPER if [ -d ${wallpaperDir} ]; then - cd ${wallpaperDir} - git pull + num_files=$(ls -1 ${wallpaperDir} | wc -l) + + if [ "$num_files" -eq 0 ]; then + notify-send "The wallpaper folder is empty. Exiting Wallsetter." + exit + elif [ "$num_files" -eq 1 ]; then + notify-send "The wallpaper folder has only one file. Exiting Wallsetter." + exit + else + cd ${wallpaperDir} + git pull + fi else ${pkgs.git}/bin/git clone ${wallpaperGit} ${wallpaperDir} chown -R ${username}:users ${wallpaperDir} diff --git a/options.nix b/options.nix index eaca6f8..3607206 100644 --- a/options.nix +++ b/options.nix @@ -8,7 +8,7 @@ let hostname = "hyprnix"; userHome = "/home/${username}"; flakeDir = "${userHome}/zaneyos"; - waybarStyle = "default"; # simplebar, slickbar, or default + waybarStyle = "simplebar"; # simplebar, slickbar, or default in { # User Variables username = "${username}"; @@ -18,7 +18,7 @@ in { theme = "gigavolt"; slickbar = if waybarStyle == "slickbar" then true else false; simplebar = if waybarStyle == "simplebar" then true else false; - bar-number = false; # Enable / Disable Workspace Numbers In Waybar + bar-number = true; # Enable / Disable Workspace Numbers In Waybar borderAnim = true; browser = "firefox"; wallpaperGit = "https://gitlab.com/Zaney/my-wallpapers.git"; # This will give you my wallpapers