further retroizatin of desktop

This commit is contained in:
thomasabishop 2024-03-26 09:45:54 +00:00
parent d1efc925e4
commit 8a684692cc
8 changed files with 281 additions and 307 deletions

View file

@ -58,14 +58,14 @@ input {
general {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
gaps_in = 3
gaps_out = 10
gaps_in = 1
gaps_out = 0
border_size = 2
# col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
# col.inactive_border = rgba(595959aa)
col.active_border = rgb(b8bb26)
col.active_border = rgb(458588)
#col.active_border = rgb(B8BB26)
col.inactive_border = rgb(504945)
col.inactive_border = rgb(a89984)
layout = dwindle
# Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
@ -93,7 +93,7 @@ decoration {
}
animations {
enabled = yes
enabled = no
# Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more

View file

@ -4,10 +4,10 @@ preload = ~/Pictures/wallpapers/shah-gruv-thinkpad.png
preload = ~/Pictures/wallpapers/gruv_city.jpg
preload = ~/Pictures/wallpapers/gruv_shroom.jpg
preload = ~/Pictures/wallpapers/gruv_woods.jpg
preload = ~/Pictures/grid-test.png
wallpaper = HDMI-A-1,~/Pictures/wallpapers/gruv_city.jpg
wallpaper = DP-2,~/Pictures/wallpapers/gruv_shroom.jpg
wallpaper = DP-2, ~/Pictures/wallpapers/gruv_city.jpg
wallpaper = eDP-1,~/Pictures/wallpapers/gruv_city.jpg
splash = false

View file

@ -1,26 +1,26 @@
[username]
style_user = 'green bold'
style_root = 'black bold'
format = '[$user]($style) '
disabled = false
show_always = true
# [username]
# style_user = 'green bold'
# style_root = 'black bold'
# format = '[$user]($style) '
# disabled = false
# show_always = true
[time]
format = '[$time]($style) '
disabled = false
# [time]
# format = '[$time]($style) '
# disabled = false
[os]
disabled = false
style = 'blue bold'
# [os]
# disabled = false
# style = 'blue bold'
[os.symbols]
Arch = " "
# [os.symbols]
# Arch = " "
[git_branch]
format = '[$symbol$branch]($style) '
# [git_branch]
# format = '[$symbol$branch]($style) '
[git_metrics]
disabled = false
[aws]
disabled = true
# [git_metrics]
# disabled = false
# [aws]
# disabled = true

View file

@ -8,7 +8,7 @@
@define-color noti-bg-focus rgba(68, 68, 68, 0.6);
@define-color noti-close-bg rgba(40,40, 40, 1);
@define-color noti-close-bg-hover rgba(255, 255, 255, 0.15);
@define-color text-color rgb(189, 174, 147);
@define-color text-color rgb(168, 153, 132);
@define-color text-color-disabled rgb(150, 150, 150);
@define-color bg-selected rgb(0, 128, 255);
@ -36,7 +36,7 @@
margin-top: 10px;
margin-right: 10px;
box-shadow: none;
border: 2px solid #504945;
border: 1px solid #504945;
min-width: 20px;
min-height: 20px;
}
@ -45,18 +45,18 @@
box-shadow: none;
background: #3c3836;
transition: background 0.15s ease-in-out;
border: 2px solid #504945;
border: 1px solid #504945;
}
.notification-row .notification-background .notification {
/* The actual notification */
border-radius: 0px;
border: 2px solid #504945;
padding: 0;
transition: background 0.15s ease-in-out;
background: #282828;
font-family: "Sys TT";
background-color: #3c3836;
border: 2px solid #a89984;
color: #a89984;
}
.notification-row .notification-background .notification.low {
@ -67,7 +67,9 @@
}
.notification-row .notification-background .notification.critical {
border: 2px solid #fb4934;
background-color: #3c1f1e;
border: 2px solid #cc241d;
color: #cc241d;
}
.notification-row .notification-background .notification .notification-action,
@ -371,9 +373,9 @@
background: rgba(40, 40, 40, 0.7);
color: @text-color;
border-radius: 0px;
margin-top: 12px;
margin-right: 12px;
margin-bottom: 12px;
/* margin-top: 0px; */
/* margin-right: 0px; */
/* margin-bottom: 0px; */
}
.control-center .control-center-list-placeholder {

View file

@ -172,7 +172,8 @@ z
height = 20%
# Window background color
background-color = #282828DB
background-color = #282828EF
# Width of the border outlines in pixels.
outline-width = 0
@ -214,7 +215,7 @@ z
#
# Supported values: top-left, top, top-right, right, bottom-right,
# bottom, bottom-left, left, center.
anchor = top
anchor = top-left
# Set the size of the exclusive zone.
#
@ -228,7 +229,7 @@ z
# Window offset from edge of screen. Only has an effect when anchored
# to the relevant edge. Can be pixels or a percentage.
margin-top = 60
margin-top = 38
margin-bottom = 0
margin-left = 0
margin-right = 0

View file

@ -1,36 +1,39 @@
{
"layer": "top",
"margin": "6 10 -3",
"height": 30,
"spacing": 4,
"margin": "0",
"height": 25,
"spacing": 0,
"modules-left": [
"custom/os",
"hyprland/workspaces",
],
"modules-center": [
"wlr/taskbar"
],
"modules-center": [
],
"modules-right": [
"network",
"bluetooth",
"cpu",
"memory",
"disk",
"custom/diskBackup",
"temperature",
"backlight",
"disk",
"custom/diskBackup",
"battery",
"custom/wakatime",
"clock",
"custom/timewarrior",
"custom/notification",
"idle_inhibitor",
"custom/logout"
],
"wlr/taskbar": {
"custom/lock",
"custom/restart",
"custom/shutdown",
"custom/notification",
],
"wlr/taskbar": {
"format": "{icon}",
"icon-size": 20,
"icon-theme": "Gruvbox Plus Dark",
"icon-theme": "Pop Extended",
"tooltip-format": "{title}",
"on-click": "activate",
"on-click-middle": "close",
@ -87,19 +90,19 @@
"spacing": 10
},
"clock": {
"format": "{:%H:%M }",
"format-alt": "{:%d/%m/%Y}"
"format": "󱑎 {:%H:%M}",
"format-alt": "󱑎 {:%d/%m/%Y}"
},
"cpu": {
"format": "cpu {usage}%",
"format": "󰛕 {usage}%",
"tooltip": false
},
"memory": {
"format": "mem {}%"
"format": " {}%",
},
"temperature": {
"critical-threshold": 80,
"format": "temp {temperatureC}°C",
"format": "{icon} {temperatureC}°C",
"format-icons": [
"󱩅",
"󱩅",
@ -108,7 +111,7 @@
},
"backlight": {
"device": "acpi_video1",
"format": "bl {percent}%",
"format": "{icon} {percent}%",
"format-icons": [
"󰪞 ",
"󰪟 ",
@ -124,9 +127,9 @@
"warning": 30,
"critical": 15
},
"format": "batt {capacity}%",
"format-charging": "batt (ch){capacity}%",
"format-plugged": "batt {capacity}%",
"format": "{icon} {capacity}%",
"format-charging": "{icon} {capacity}%",
"format-plugged": "{icon} {capacity}%",
"format-icons": [
"󰁻",
"󰁼",
@ -139,7 +142,7 @@
"bat": "BAT2"
},
"network": {
"format-wifi": "󰖩 {essid}",
"format-wifi": "󰖩 {essid}",
"format-ethernet": "{ipaddr}/{cidr}",
"tooltip-format": "{ifname} via {gwaddr}",
"format-linked": "{ifname} (No IP)",
@ -169,15 +172,15 @@
},
"disk": {
"interval": 30,
"format": "disk {percentage_used}%",
"format": "󰟸 {percentage_used}%",
"path": "/home"
},
"bluetooth": {
"controller": "bluetoothctl",
"format": " active",
"format-connected": " connected",
"format": " active",
"format-connected": " connected",
"format-alt": " {device_alias}",
"format-connected-battery": " {device_battery_percentage}%",
"format-connected-battery": " {device_battery_percentage}%",
"tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected",
"tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}",
"tooltip-format-enumerate-connected": "{device_alias}\t{device_address}",
@ -195,11 +198,11 @@
"exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null"
},
"custom/os": {
"format": " archbish",
"format": ""
},
"custom/wakatime": {
"exec": "source $HOME/dotfiles/.env && python3 $HOME/.config/waybar/resources/custom_modules/wakatime_waybar.py",
"format": "code {}",
"format": "󰲌 {}",
"return-type": "json",
"interval": 600
},
@ -220,28 +223,39 @@
"tooltip": false,
"format": "{icon}",
"format-icons": {
"notification": "<span foreground='#b8bb26'>󰂝</span>",
"notification": "<span color=\"#fabd2f\">󰂝</span>",
"none": "󰂚",
"dnd-notification": "<span foreground='#b8bb26'>󰂛</span>",
"dnd-notification": "󰂛",
"dnd-none": "󰂛",
"inhibited-notification": "<span foreground='#b8bb26'>󰂛</span>",
"inhibited-notification": "󰂛",
"inhibited-none": "󰂚",
"dnd-inhibited-notification": "<span foreground='#b8bb26'>󰂛</span>",
"dnd-inhibited-none": "󰂚"
"dnd-inhibited-notification": "󰂛",
"dnd-inhibited-none": "󰂚",
},
"return-type": "json",
"exec-if": "which swaync-client",
"exec": "swaync-client -swb",
"on-click": "sleep 0.1 && swaync-client -t -sw",
"on-click": "sleep 0.2 && swaync-client -t -sw",
"on-click-right": "swaync-client -d -sw",
"escape": true
},
"custom/diskBackup": {
"format": "bak {}",
"exec": "df -h /media/backups | awk 'NR==2{print $5}'",
"interval": 60,
}
"custom/diskBackup": {
"format": "󰠘 {}",
"exec": "df -h /media/backups | awk 'NR==2{print $5}'",
"interval": 60
},
"custom/lock": {
"format": "󰍁",
"on-click": "hyprlock"
},
"custom/shutdown": {
"format": "󱠡",
"on-click": "systemctl poweroff"
},
"custom/restart": {
"format": "󰑓",
"on-click": "systemctl reboot"
},
}

View file

@ -1,13 +1,21 @@
* {
font-size: 16px;
font-weight: 400;
}
window#waybar {
/* background-color: #282828; */
font-family: "Sys TT", "PragmataPro Mono Liga";
background-color: #458588;
border-bottom: 2px solid #282828;
/* background-color: rgba(40, 40, 40, 1); */
font-family: "PragmataPro Mono Liga";
/* border: 2px solid #504945; */
background-color: rgba(40, 40, 40, 0.9);
font-size: 16px;
}
button {
border-radius: 0;
/* box-shadow: inset 0 -3px transparent; */
border: none;
opacity: 1;
}
tooltip {
@ -16,277 +24,221 @@ tooltip {
font-weight: 400;
background-color: rgba(40, 40, 40, 0.8);
box-shadow: none;
font-family: "PragmataPro Mono";
padding: 20px;
}
tooltip label {
color: #ebdbb2;
}
button {
box-shadow: inset 0 -3px transparent;
border: none;
border-radius: 0;
opacity: 1;
/* Layout */
#taskbar {
margin-right: 10px;
}
#workspaces button.active {
color: #282828;
background-color: #98971a;
border: 2px solid #79740e;
#clock,
#custom-wakatime,
#custom-os,
#network,
#bluetooth,
#cpu,
#memory,
#temperature,
#backlight,
#disk,
#custom-diskBackup,
#battery {
padding: 0px 8px;
margin: 5px 0px 6px;
}
#workspaces button {
padding: 2px 3px;
/* color: #282828; */
color: #ebdbb2;
background-color: #3c3836;
margin-right: 5px;
margin-top: 6px;
margin-bottom: 6px;
border: 2px solid #504945;
}
#workspaces button.urgent {
background-color: #ea6962;
#taskbar button,
#workspaces button,
#custom-timewarrior,
#custom-notification,
#custom-lock,
#custom-shutdown,
#custom-restart,
#idle_inhibitor,
#custom-logout {
margin: 5px 0 6px;
font-size: 18px;
padding: 0px 8px;
/* margin: 8px 0 10px; */
}
#taskbar button {
/* color: #ebdbb2; */
/* background-color: #3c3836; */
padding: 3px 8px;
margin-top: 6px;
margin-bottom: 6px;
border-bottom: 2px solid #504945;
color: #282828;
background-color: #a89984;
border: 2px solid; /* Base border */
border-color: #ebdbb2 #665c54 #665c54 #ebdbb2;
}
#taskbar button.active {
border-bottom: 2px solid #98971a;
color: #98971a;
#workspaces button {
padding: 0;
padding-top: 3px;
/* padding-left: 2px; */
/* padding-right: 2px; */
/* margin-right: 5px; */
/* padding: 3px 10px;
margin-top: 6px;
margin-bottom: 6px; */
background-color: #665c54;
border: 2px solid; /* Base border */
border-color: #928374 #282828 #282828 #928374;
}
#battery,
#cpu,
#memory,
#disk,
#custom-diskBackup,
#temperature,
#backlight,
#network,
#pulseaudio,
#wireplumber,
#custom-media,
#tray,
#custom-spotify,
#mode,
#scratchpad,
#mpd,
#user,
#bluetooth,
#custom-wakatime {
font-weight: 400;
padding: 3px 8px;
margin-left: 4px;
margin-top: 6px;
margin-bottom: 6px;
}
/* #waybar .modules-left > *:first-child > * { */
/* margin-left: 25px; */
/* } */
#custom-logout,
#custom-timewarrior,
#custom-notification,
#idle_inhibitor {
font-weight: 400;
padding: 3px 10px;
margin-left: 4px;
margin-top: 6px;
margin-bottom: 6px;
}
#custom-logout {
color: #ebdbb2;
background-color: #3c3836;
margin-right: 8px;
border: 2px solid #504945;
#workspaces > *:last-child {
margin-right: 10px;
}
#custom-os {
font-weight: 400;
padding: 3px 10px;
margin-top: 6px;
margin-bottom: 6px;
margin-left: 8px;
margin-left: 5px;
}
#windowu,
#workspaces {
margin: 0 3px 0;
font-weight: 400;
#custom-notification {
margin-right: 5px;
}
/* Colours */
#taskbar button.active {
/* background-color: #98971a; */
/* border: 2px solid; /1* Base border *1/ */
/* border-color: #b8bb27 #79740e #79740e #b8bb27; */
background-color: #ebdbb2;
border: 2px solid; /* Base border */
border-color: #fbf1c7 #a89984 #a89984 #fbf1c7;
}
#battery,
#battery.charging,
#battery.plugged {
color: #282828;
background-color: #a89984;
border: 2px solid; /* Base border */
border-color: #ebdbb2 #665c54 #665c54 #ebdbb2;
}
#clock {
border: 1px solid #458588;
color: #458588;
font-weight: 400;
padding-top: 3px;
padding-bottom: 3px;
padding-left: 10px;
padding-right: 5px;
margin-left: 4px;
margin-right: 4px;
margin-top: 6px;
margin-bottom: 6px;
/* border-right: 1px solid #504945; */
/* color: #1d2021; */
color: #282828;
background-color: #a89984;
border: 2px solid; /* Base border */
border-color: #ebdbb2 #665c54 #665c54 #ebdbb2;
}
#cpu,
#memory,
#temperature,
#backlight {
color: #282828;
background-color: #a89984;
border: 2px solid; /* Base border */
border-color: #ebdbb2 #665c54 #665c54 #ebdbb2;
#bluetooth {
padding-right: 16px;
/* border-right: 1px solid #504945; */
color: #98971a;
border: 1px solid #98971a;
/* color: #282828; */
}
#battery {
border: 1px solid #458588;
color: #458588;
/* border-right: 1px solid #504945; */
padding-right: 14px;
/* color: #282828; */
}
#battery.charging,
#battery.plugged {
border: 1px solid #458588;
color: #458588;
/* color: #282828; */
}
#battery.critical:not(.charging) {
border: 1px solid #fb4934;
color: #fb4934;
animation-name: blink;
animation-duration: 0.5s;
animation-timing-function: linear;
animation-iteration-count: infinite;
animation-direction: alternate;
}
#cpu {
border: 1px solid #458588;
color: #458588;
/* color: #282828; */
/* color: #282828; */
}
#memory {
border: 1px solid #458588;
color: #458588;
/* color: #282828; */
color: #282828;
}
#disk,
#custom-diskBackup {
border: 1px solid #458588;
color: #458588;
/* color: #282828; */
}
#backlight {
border: 1px solid #458588;
color: #458588;
/* color: #282828; */
}
#network {
border: 1px solid #98971a;
color: #98971a;
/* color: #282828; */
}
#network.format.icons {
background-color: #fb4934;
}
#network.disconnected {
background-color: #fb4934;
}
#user {
background-color: #ea6962;
color: #282c34;
}
#custom-spotify {
background-color: #689d6a;
color: #282828;
background-color: #a89984;
border: 2px solid; /* Base border */
border-color: #ebdbb2 #665c54 #665c54 #ebdbb2;
}
#temperature {
border: 1px solid #458588;
color: #458588;
/* border-right: 1px solid #504945; */
padding-right: 14px;
#network,
#bluetooth {
color: #282828;
background-color: #a89984;
border: 2px solid; /* Base border */
border-color: #ebdbb2 #665c54 #665c54 #ebdbb2;
/* background-color: #c0c0c0; */
/* border: 2px solid; /1* Base border *1/ */
/* border-color: #ffffff #808080 #808080 #ffffff; */
/* color: #282828; */
}
#temperature.critical {
color: #282c34;
background-color: #fb4934;
}
#idle_inhibitor {
#workspaces button.urgent,
#temperature.critical,
#network.disconnected,
#battery.critical:not(.charging) {
color: #ebdbb2;
background-color: #3c3836;
padding-right: 14px;
border: 2px solid #504945;
}
#idle_inhibitor.activated {
background-color: #98971a;
color: #282828;
border: 2px solid #79740e;
}
#custom-os {
font-size: 16px;
background-color: #458588;
color: #f2e5bc;
border: 2px solid #076678;
background-color: #cc241d;
border-color: #fb4924 #9d0006 #9d0006 #fb4924;
}
#custom-wakatime {
color: #458588;
border: 1px solid #458588;
/* border-right: 1px solid #504945; */
padding-right: 14px;
color: #282828;
background-color: #a89984;
border: 2px solid; /* Base border */
border-color: #ebdbb2 #665c54 #665c54 #ebdbb2;
}
#custom-toggl {
#workspaces button.active {
color: #282828;
/* background-color: #98971a; */
/* border: 2px solid; /1* Base border *1/ */
/* border-color: #b8bb27 #79740e #79740e #b8bb27; */
background-color: #ebdbb2;
border: 2px solid; /* Base border */
border-color: #fbf1c7 #a89984 #a89984 #fbf1c7;
}
#custom-timewarrior.active {
background-color: #98971a;
color: #282828;
border: 2px solid #79740e;
background-color: #98971a;
border: 2px solid; /* Base border */
border-color: #b8bb27 #79740e #79740e #b8bb27;
}
#custom-notification,
#custom-lock,
#custom-shutdown,
#custom-restart,
#custom-notification,
#custom-timewarrior.inactive {
color: #ebdbb2;
background-color: #3c3836;
border: 2px solid #504945;
/* background-color: #282828; */
/* color: #ebdbb2; */
}
#custom-notification {
color: #ebdbb2;
background-color: #3c3836;
border: 2px solid #504945;
#custom-timewarrior {
margin-left: 10px;
}
/* Specific module styles */
#custom-os {
margin-right: 10px;
font-size: 18px;
padding-right: 14px;
/* background-color: #458588; */
/* border: 2px solid; /1* Base border *1/ */
/* border-color: #83a598 #076678 #076678 #83a598; */
color: #282828;
background-color: #a89984;
border: 2px solid; /* Base border */
border-color: #ebdbb2 #665c54 #665c54 #ebdbb2;
}
#custom-timewarrior,
#custom-notification,
#custom-lock,
#custom-shutdown,
#custom-restart,
#idle_inhibitor,
#custom-logout {
background-color: #665c54;
border: 2px solid; /* Base border */
border-color: #928374 #282828 #282828 #928374;
color: #ebdbb2;
/* color: #282828; */
/* background-color: #a89984; */
/* border: 2px solid; /1* Base border *1/ */
/* border-color: #ebdbb2 #665c54 #665c54 #ebdbb2; */
/* border: 2px solid #665c54; */
}

View file

@ -7,13 +7,15 @@ alias tw="timew"
alias z="cd /home/thomas/repos/eolas"
alias zn="/home/thomas/repos/eolas/scripts/new_zk_note.sh"
alias dot="cd /home/thomas/dotfiles"
alias gpt="chatgpt-cli"
# alias xhd="cd /run/media/thomas"
# alias cs-update="/home/thomas/repos/eolas/_scripts/auto_save.sh"
# alias cs-query="/home/thomas/repos/eolas/_scripts/query.sh"
# Set properties based on OS
ZSH_THEME=""
ZSH_THEME="risto"
plugins=(git npm fzf-tab zsh-autosuggestions zsh-syntax-highlighting)
# Search against /home/thomas/repos/computer_science
@ -37,4 +39,7 @@ eval "$(pyenv init --path)"
export PATH="$HOME/.local/bin:$PATH"
export OPENAI_API_KEY=${OPENAI_API_KEY}
eval "$(starship init zsh)"
# eval "$(starship init zsh)"
export PATH=$PATH:/home/thomas/.spicetify