1
1
mirror of https://github.com/nboughton/dotfiles synced 2024-11-22 14:51:56 +01:00
This commit is contained in:
Nick Boughton 2021-06-25 11:38:55 +01:00
parent b14544ea38
commit ab04500c27
18 changed files with 84 additions and 342 deletions

2
.gitignore vendored

@ -67,3 +67,5 @@ sqlitebrowser/
castero/ castero/
yapa/ yapa/
bpytop/ bpytop/
galculator/
obs-studio/

2
electron-flags.conf Normal file

@ -0,0 +1,2 @@
--enable-features=UseOzonePlatform
--ozone-platform=wayland

@ -1,3 +1,19 @@
decoration {
box-shadow: none;
}
decoration:backdrop {
box-shadow: none;
}
.titlebar,
.titlebar .background,
.window-frame,
.window-frame:backdrop {
border-radius: 0;
}
/*
.window-frame, .window-frame:backdrop { .window-frame, .window-frame:backdrop {
box-shadow: none; box-shadow: none;
border-style: none; border-style: none;
@ -20,4 +36,4 @@
background-color: #061921; background-color: #061921;
box-shadow: none; box-shadow: none;
} }
*/

@ -1,7 +1,7 @@
[Settings] [Settings]
gtk-application-prefer-dark-theme=0 gtk-application-prefer-dark-theme=0
gtk-theme-name=Materia-dark-compact gtk-theme-name=WhiteSur-dark-red
gtk-icon-theme-name=Tela-circle-blue-dark gtk-icon-theme-name=Tela-circle-red-dark
gtk-font-name=Roboto 10 gtk-font-name=Roboto 10
gtk-cursor-theme-name=Adwaita gtk-cursor-theme-name=Adwaita
gtk-cursor-theme-size=0 gtk-cursor-theme-size=0

@ -198,7 +198,7 @@ mode "resize" {
bindsym $mod+r mode "resize" bindsym $mod+r mode "resize"
gaps inner 10 gaps inner 10
gaps top 40 gaps top 30
# #
# Titlebars # Titlebars

@ -5,6 +5,7 @@ shadow-offset-y = -20;
shadow-exclude = [ shadow-exclude = [
"name = 'Notification'", "name = 'Notification'",
"name = 'polybar-bottom_eDP-1'",
"class_g ?= 'Notify-osd'", "class_g ?= 'Notify-osd'",
"_GTK_FRAME_EXTENTS@:c", "_GTK_FRAME_EXTENTS@:c",
"class_g = 'i3-frame'", "class_g = 'i3-frame'",

@ -64,17 +64,17 @@ wrapping-scroll = false
; Only show workspaces on the same output as the bar ; Only show workspaces on the same output as the bar
;pin-workspaces = true ;pin-workspaces = true
label-mode-padding = 4 label-mode-padding = 3
label-mode-foreground = ${colors.foreground} label-mode-foreground = ${colors.foreground}
; focused = Active workspace on focused monitor ; focused = Active workspace on focused monitor
label-focused = %index% %icon% label-focused = %index% %icon%
label-focused-foreground = ${colors.primary} label-focused-foreground = ${colors.primary}
label-focused-padding = 4 label-focused-padding = 3
; unfocused = Inactive workspace on any monitor ; unfocused = Inactive workspace on any monitor
label-unfocused = %index% %icon% label-unfocused = %index% %icon%
label-unfocused-padding = 4 label-unfocused-padding = 3
; visible = Active workspace on unfocused monitor ; visible = Active workspace on unfocused monitor
label-visible = %index% %icon% label-visible = %index% %icon%
@ -84,7 +84,7 @@ label-visible-padding = ${self.label-focused-padding}
; urgent = Workspace with urgency hint set ; urgent = Workspace with urgency hint set
label-urgent = %index% %icon% label-urgent = %index% %icon%
label-urgent-foreground = ${colors.alert} label-urgent-foreground = ${colors.alert}
label-urgent-padding = 4 label-urgent-padding = 3
; Separator in between workspaces ; Separator in between workspaces
; label-separator = | ; label-separator = |
@ -210,11 +210,11 @@ screenchange-reload = true
[bar/top] [bar/top]
monitor = ${env:MONITOR:} monitor = ${env:MONITOR:}
width = 1900 width = 1900
height = 30 height = 24
override-redirect = true override-redirect = true
wm-restack = i3 wm-restack = i3
offset-x = 10 offset-x = 10
offset-y = 10 offset-y = 5
radius = 4.0 radius = 4.0
fixed-center = true fixed-center = true
@ -227,67 +227,45 @@ line-color = ${colors.foreground}
border-size = 0 border-size = 0
border-color = ${colors.primary} border-color = ${colors.primary}
padding-left = 3 padding-left = 2
padding-right = 3 padding-right = 2
module-margin-left = 4 module-margin-left = 2
module-margin-right = 4 module-margin-right = 2
font-1 = Font Awesome 5 Free:style=Solid:pixelsize=8;2 font-1 = Font Awesome 5 Free:style=Solid:pixelsize=8;2
font-2 = Font Awesome 5 Free:style=Regular:pixelsize=8;2 font-2 = Font Awesome 5 Free:style=Regular:pixelsize=8;2
font-3 = Font Awesome 5 Brands:pixelsize=8;2 font-3 = Font Awesome 5 Brands:pixelsize=8;2
font-4 = Font Awesome 5 Regular:pixelsize=8;2 font-4 = Font Awesome 5 Regular:pixelsize=8;2
font-0 = Kanit Medium:size=8;2 font-5 = Noto Color Emoji:style=Regular:scale=12;2
font-0 = Source Code Pro Medium:weight=700:size=8;2
modules-left = battery root_storage home_storage memory swap cpu modules-left = date battery root_storage home_storage memory swap cpu
modules-center = i3 modules-center = i3
modules-right = covid weather updates my-updates backlight-acpi pulseaudio date modules-right = covid weather updates my-updates backlight-acpi pulseaudio powermenu
cursor-click = pointer cursor-click = pointer
cursor-scroll = ns-resize cursor-scroll = ns-resize
tray-position = left [bar/bottom]
tray-padding = 2 monitor = ${env:MONITOR:}
;tray-offset-x = 100 bottom = true
;tray-background = #00000000 override-redirect = true
wm-restack = i3
radius = 4.0
fixed-center = true
;[bar/bottom] background = none
;bottom = true foreground = ${colors.foreground}
;width = 300
;height = 30
;override-redirect = true
;wm-restack = i3
;offset-x = 10
;offset-y = 10
;radius = 4.0
;fixed-center = true
;background = ${colors.background} line-size = 3
;foreground = ${colors.foreground} line-color = ${colors.foreground}
;line-size = 3 modules-right = powermenu
;line-color = ${colors.foreground}
;border-size = 0 tray-position = right
;border-color = ${colors.primary} tray-padding = 5
tray-scale = 1.5
;padding-left = 2 tray-offset-y = -10
;padding-right = 2
;module-margin-left = 2
;module-margin-right = 2
;font-1 = Font Awesome 5 Free:style=Solid:pixelsize=8;2
;font-2 = Font Awesome 5 Free:style=Regular:pixelsize=8;2
;font-3 = Font Awesome 5 Brands:pixelsize=8;2
;font-4 = Font Awesome 5 Regular:pixelsize=8;2
;font-0 = Fira Code:style=Medium:size=8;2
;modules-left =
;modules-center =
;modules-right = powermenu
;tray-position = center
;tray-padding = 2
; vim:ft=dosini ; vim:ft=dosini

@ -11,10 +11,10 @@ if type "xrandr"; then
for m in $(xrandr --query | grep " connected" | cut -d" " -f1); do for m in $(xrandr --query | grep " connected" | cut -d" " -f1); do
MONITOR=$m polybar --reload top & MONITOR=$m polybar --reload top &
done done
#polybar --reload bottom & MONITOR="eDP-1" polybar --reload bottom &
else else
polybar --reload top & polybar --reload top &
#polybar --reload bottom & polybar --reload bottom &
fi fi

Binary file not shown.

Before

Width:  |  Height:  |  Size: 647 KiB

After

Width:  |  Height:  |  Size: 1.6 MiB

@ -23,8 +23,8 @@ xwayland enable
### Gnome settings ### Gnome settings
set $gnome-schema org.gnome.desktop.interface set $gnome-schema org.gnome.desktop.interface
exec_always { exec_always {
gsettings set $gnome-schema gtk-theme 'Materia-dark-compact' gsettings set $gnome-schema gtk-theme 'WhiteSur-dark-red'
gsettings set $gnome-schema icon-theme 'Tela-circle-blue-dark' gsettings set $gnome-schema icon-theme 'Tela-circle-red-dark'
gsettings set $gnome-schema font-name 'Roboto Regular 10' gsettings set $gnome-schema font-name 'Roboto Regular 10'
gsettings set $gnome-schema monospace-font-name 'Roboto Regular 10' gsettings set $gnome-schema monospace-font-name 'Roboto Regular 10'
gsettings set $gnome-schema document-font-name 'Roboto Regular 10' gsettings set $gnome-schema document-font-name 'Roboto Regular 10'
@ -60,6 +60,7 @@ for_window [app_id=aptus-upgrade] floating enable
# filemanagers # filemanagers
for_window [app_id=Thunar] floating enable for_window [app_id=Thunar] floating enable
for_window [app_id=thunar] floating enable
for_window [app_id=ranger] floating enable for_window [app_id=ranger] floating enable
for_window [title="Catfish"] floating enable for_window [title="Catfish"] floating enable

@ -30,7 +30,7 @@
# the top and down respectively. # the top and down respectively.
# The width can be negative. In this case the actual width is the # The width can be negative. In this case the actual width is the
# screen width minus the width defined in within the geometry option. # screen width minus the width defined in within the geometry option.
geometry = "300x5-30+70" geometry = "300x5-30+60"
# Show how many messages are currently hidden (because of geometry). # Show how many messages are currently hidden (because of geometry).
indicate_hidden = yes indicate_hidden = yes

Binary file not shown.

Before

Width:  |  Height:  |  Size: 610 KiB

After

Width:  |  Height:  |  Size: 258 KiB

@ -12,9 +12,9 @@
{ {
"position": "top", "position": "top",
"layer": "bottom", "layer": "bottom",
"margin-top": 5, "margin-top": 0,
"margin-right": 10, "margin-right": 0,
"margin-left": 10, "margin-left": 0,
"modules-center": [ "modules-center": [
"sway/workspaces", "sway/workspaces",
], ],
@ -30,10 +30,10 @@
"custom/swap", "custom/swap",
"custom/separator", "custom/separator",
"cpu", "cpu",
"custom/separator",
"idle_inhibitor",
], ],
"modules-right": [ "modules-right": [
"idle_inhibitor",
"custom/separator",
"custom/covid", "custom/covid",
"custom/separator", "custom/separator",
"custom/weather", "custom/weather",
@ -71,14 +71,14 @@
} }
}, },
"backlight": { "backlight": {
"format": "{icon} {percent}%", "format": " {percent}%",
"format-icons": ["", ""], "format-icons": ["", "", ""],
"on-scroll-up": "brightnessctl set +5%", "on-scroll-up": "brightnessctl set +5%",
"on-scroll-down": "brightnessctl set 5%-" "on-scroll-down": "brightnessctl set 5%-"
}, },
"clock": { "clock": {
"format": "{:%a %d %b %H:%M}", "format": "{:%a %d %b %H:%M}",
"tooltip": true "tooltip": false
}, },
"pulseaudio": { "pulseaudio": {
"format": "{icon} {volume}% {format_source}", "format": "{icon} {volume}% {format_source}",
@ -169,7 +169,7 @@
"rotate": 90 "rotate": 90
}, },
"tray": { "tray": {
"icon-size": 14, "icon-size": 12,
"spacing": 10 "spacing": 10
}, },
"custom/updates": { "custom/updates": {

@ -1,234 +0,0 @@
// -*- mode: json -*-
[
{
"layer": "bottom",
"position": "left",
"margin-top": 0,
"margin-left": 0,
"margin-bottom": 0,
"modules-left": ["wlr/taskbar"],
//"modules-center": ["sway/window"],
"modules-right": ["tray"],
"wlr/taskbar": {
"all-outputs": false,
"format": "{icon}",
"icon-theme": "Zafiro",
"icon-size": 16,
"on-click": "activate",
"on-middle-click": "close",
"on-right-click": "minimize"
},
"sway/window": {
"rotate": 90
},
"tray": {
"icon-size": 14,
"spacing": 10
}
},
{
"layer": "bottom",
"position": "top",
"margin-top": 0,
"margin-right": 0,
"margin-left": 0,
"modules-left": [
"sway/workspaces",
"custom/separator",
"idle_inhibitor",
"custom/separator",
"sway/mode"
],
"modules-center": [
"cpu",
"custom/separator",
"memory",
"custom/swap",
"custom/separator",
"clock",
"custom/separator",
"disk#1",
"disk#2",
"custom/separator",
"battery"
],
"modules-right": [
"custom/covid",
"custom/separator",
"custom/weather",
"custom/separator",
"custom/updates",
"custom/auroch",
"custom/separator",
"backlight",
"custom/separator",
"pulseaudio",
"custom/separator",
//"tray",
//"custom/separator",
"custom/reboot",
"custom/shutdown"
],
"sway/workspaces": {
"disable-scroll": true,
"all-outputs": true,
"format": "{name} {icon}",
"format-icons": {
"1": "",
"2": "",
"3": "",
"4": "",
"urgent": "",
"focused": "",
"default": ""
}
},
"idle_inhibitor": {
"format": "{icon}",
"format-icons": {
"activated": "",
"deactivated": ""
}
},
"sway/mode": {
"format": "{}"
},
"backlight": {
"format": "{icon} {percent}%",
"format-icons": ["", ""],
"on-scroll-up": "brightnessctl set +5%",
"on-scroll-down": "brightnessctl set 5%-"
},
"clock": {
"format": "{:%a %d %b %H:%M}",
"tooltip": true
},
"pulseaudio": {
"format": "{icon} {volume}% {format_source}",
"format-bluetooth": "{icon} {volume}% {format_source}",
"format-bluetooth-muted": " {icon} {format_source}",
"format-muted": " {format_source}",
"format-source": " {volume}%",
"format-source-muted": " -",
"format-icons": {
"headphone": "",
"headset": "",
"default": [
"",
"",
""
]
},
"on-click": "pavucontrol"
},
"memory": {
"states": {
"good": 0,
"warning": 60,
"critical": 80
},
"interval": 5,
"format": " {}%"
},
"cpu": {
"states": {
"good": 0,
"warning": 70,
"critical": 95
},
"interval": 1,
"format": " {usage:2}%"
},
"battery": {
"states": {
"good": 100,
"warning": 30,
"critical": 15
},
"format": "{icon} {capacity}%",
"format-icons": [
"",
"",
"",
"",
""
]
},
"disk#1": {
"states": {
"good": 0,
"warning": 70,
"critical": 95
},
"interval": 5,
"format": " {percentage_used:2}%",
"path": "/"
},
"disk#2": {
"states": {
"good": 0,
"warning": 70,
"critical": 95
},
"interval": 5,
"format": " {percentage_used:2}%",
"path": "/home"
},
"custom/updates": {
"format": " {}",
"return-type": "json",
"interval": 5,
"exec": "cat ~/tmp/updates.json",
"exec-if": "file ~/tmp/updates.json",
"on-click": "kitty --class aptus-upgrade ~/.config/waybar/modules/updates/updates.sh; systemctl --user start updates.service",
"tooltip": true
},
"custom/auroch": {
"format": " {}",
"return-type": "json",
"exec": "cat ~/tmp/auroch.json",
"exec-if": "file ~/tmp/auroch.json",
"on-click": "systemctl --user start auroch.service",
"interval": 5,
"tooltip": true
},
"custom/swap": {
"format": " {}",
"interval": 5,
"exec": "free -h | grep Swap | awk '{print $3}'"
},
"custom/separator": {
"format": "",
"tooltip": false
},
"custom/shutdown": {
"format": "",
"on-click": "~/.config/waybar/modules/shutdown.sh",
"tooltip": false
},
"custom/reboot": {
"format": "",
"on-click": "~/.config/waybar/modules/reboot.sh",
"tooltip": false
},
"custom/weather": {
"format": "{}",
"exec": "~/.config/waybar/modules/weather.sh",
"interval": 3600
},
"custom/spotify": {
"interval": 1,
"return-type": "json",
"exec": "~/.config/waybar/modules/spotify.sh",
"exec-if": "pgrep spotify",
"escape": true
},
"custom/covid": {
"interval": 3600,
"exec": "~/.config/waybar/modules/covid/covid-checker ltla E07000012",
"return-type": "json",
"format": "{icon} {}",
"format-icons": ["", ""]
}
}
]

@ -95,11 +95,13 @@ func main() {
if p.UpstreamType == npm { if p.UpstreamType == npm {
if err = p.getNpmVer(); err != nil { if err = p.getNpmVer(); err != nil {
class = errClass class = errClass
log.Println(err)
break break
} }
} else if p.UpstreamType == ghub { } else if p.UpstreamType == ghub {
if err = p.getGithubVer(); err != nil { if err = p.getGithubVer(); err != nil {
class = errClass class = errClass
log.Println(err)
break break
} }
} }

@ -1,11 +0,0 @@
#!/bin/bash
zenity --question \
--text "Are you sure you want to reboot?" \
--window-icon "warning" \
--height 100 \
--width 200
if [[ $? -eq 0 ]]; then
shutdown -r now
fi

@ -1,11 +0,0 @@
#!/bin/bash
zenity --question \
--text "Are you sure you want to shutdown?" \
--window-icon "warning" \
--height 100 \
--width 200
if [[ $? -eq 0 ]]; then
shutdown -h now
fi

@ -3,9 +3,9 @@
/* Colorz/haishoku generally work well */ /* Colorz/haishoku generally work well */
@define-color text @foreground; @define-color text @foreground;
@define-color warn @color5; @define-color warn @color5;
@define-color crit @color6; @define-color crit @color4;
@define-color accent @color4; @define-color accent @color6;
@define-color hilight @color5; @define-color hilight @color6;
/* Nord /* Nord
@define-color text @foreground; @define-color text @foreground;
@ -24,22 +24,18 @@
*/ */
* { * {
font-size: 10px; font-size: 12px;
font-family: "Source Code Pro Medium", "Font Awesome 5 Free"; font-family: "Source Code Pro Medium", "Font Awesome 5 Free";
font-weight: bold; font-weight: bold;
border-radius: 20px;
} }
window#waybar { window#waybar {
color: @text; color: @text;
background: @background; text-shadow: 1px 1px 1px @background;
} background: none;
/*background: rgba(0, 0, 0, 0.5);
.modules-left, border-bottom-left-radius: 20px;
.modules-center, border-bottom-right-radius: 20px;*/
.modules-right {
margin: 0;
padding: 0;
} }
/* Base styling for modules */ /* Base styling for modules */
@ -61,7 +57,7 @@ window#waybar {
#custom-powermenu, #custom-powermenu,
#custom-covid, #custom-covid,
#tray { #tray {
padding: 6px 10px 5px 10px; padding: 5px 10px 0px 10px;
} }
#custom-separator { #custom-separator {
@ -75,7 +71,7 @@ window#waybar {
#workspaces button { #workspaces button {
color: @text; color: @text;
margin: 0; margin: 0;
padding: 0px 10px 0px 10px; padding: 2px 10px 0px 10px;
border-radius: 0px; border-radius: 0px;
} }
#workspaces button.focused { #workspaces button.focused {