mirror of
https://github.com/mitchell/dotfiles.git
synced 2025-12-17 12:27:22 +00:00
Make bspwm work with vnc displays; and general updates/cleanups
- Set fish colors to more gruvbox accurate theme - Fix nvim transparency - Remove conky, qutebrowser, and taskrc configs - Update fish greeting - Update toglpulse script
This commit is contained in:
parent
81e8b0c49c
commit
503fb8bff6
15 changed files with 83 additions and 638 deletions
|
|
@ -1,30 +1,39 @@
|
|||
#!/usr/bin/fish
|
||||
|
||||
if ! test -e ~/.bspwm_no_lock
|
||||
slock &
|
||||
touch ~/.bspwm_no_lock
|
||||
#if ! test -e ~/.bspwm_no_lock
|
||||
# slock &
|
||||
# touch ~/.bspwm_no_lock
|
||||
#end
|
||||
|
||||
if test $DISPLAY = ":0"
|
||||
setxkbmap -option ctrl:swapcaps
|
||||
setxkbmap -option altwin:swap_alt_win
|
||||
xset s off -dpms
|
||||
xinput set-prop 'MSFT0001:00 04F3:317C Touchpad' 'libinput Tapping Enabled' 1
|
||||
xinput set-prop 'MSFT0001:00 04F3:317C Touchpad' 'libinput Middle Emulation Enabled' 1
|
||||
end
|
||||
|
||||
setxkbmap -option ctrl:swapcaps
|
||||
setxkbmap -option altwin:swap_alt_win
|
||||
xset s off -dpms
|
||||
xinput set-prop 'MSFT0001:00 04F3:317C Touchpad' 'libinput Tapping Enabled' 1
|
||||
xinput set-prop 'MSFT0001:00 04F3:317C Touchpad' 'libinput Middle Emulation Enabled' 1
|
||||
|
||||
sxhkd &
|
||||
picom -b
|
||||
|
||||
wmname LG3D
|
||||
if test $DISPLAY = ":0"
|
||||
picom -b --blur-background
|
||||
else
|
||||
picom -b --backend xrender
|
||||
end
|
||||
|
||||
#wmname LG3D
|
||||
|
||||
xfce4-screensaver &
|
||||
~/.fehbg &
|
||||
|
||||
killall -q polybar barrier barrierc cbatticon pasystray
|
||||
if test $DISPLAY = ":0"
|
||||
killall -q polybar cbatticon pasystray barrier barrierc
|
||||
barrier &
|
||||
keepassxc &
|
||||
end
|
||||
|
||||
polybar m-bar &
|
||||
cbatticon &
|
||||
pasystray &
|
||||
keepassxc &
|
||||
barrier &
|
||||
|
||||
bspc monitor -d I II III IV V VI VII
|
||||
|
||||
|
|
|
|||
|
|
@ -1,121 +0,0 @@
|
|||
conky.config ={
|
||||
-- CONKY SETTINGS
|
||||
background = true,
|
||||
update_interval = 1,
|
||||
total_run_times = 0,
|
||||
|
||||
cpu_avg_samples = 2,
|
||||
net_avg_samples = 2,
|
||||
|
||||
override_utf8_locale = true,
|
||||
|
||||
double_buffer = true,
|
||||
no_buffers = true,
|
||||
|
||||
text_buffer_size = 32768,
|
||||
|
||||
-- CONKY: WINDOW SPECIFICATIONS
|
||||
own_window = true,
|
||||
own_window_argb_value = 216,
|
||||
own_window_argb_visual = true,
|
||||
own_window_class = 'conky',
|
||||
own_window_name = 'conky',
|
||||
own_window_colour = '#282828',
|
||||
-- own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager',
|
||||
own_window_transparent = false,
|
||||
own_window_type = 'desktop',
|
||||
|
||||
border_inner_margin = 6,
|
||||
border_width = 5,
|
||||
|
||||
minimum_height = 997,
|
||||
|
||||
minimum_width = 280,
|
||||
maximum_width = 280,
|
||||
|
||||
alignment = 'top_right',
|
||||
gap_x = 24,
|
||||
gap_y = 60,
|
||||
|
||||
-- GRAPHICS SETTINGS
|
||||
draw_shades = true,
|
||||
draw_outline = false,
|
||||
draw_borders = false,
|
||||
draw_graph_borders = true,
|
||||
|
||||
-- TEXT SETTINGS
|
||||
use_xft = true,
|
||||
font = 'IBM Plex Sans Regular:size=10',
|
||||
xftalpha = 0.2,
|
||||
|
||||
uppercase = false,
|
||||
|
||||
-- Pad percentages to this many decimals (0 = no padding)
|
||||
pad_percents = 2,
|
||||
|
||||
-- COLOUR SETTINGS
|
||||
default_color = 'ebdbb2',
|
||||
default_shade_color = '1d2021',
|
||||
default_outline_color = '1d2021',
|
||||
color1 = 'fbf1c7',
|
||||
color2 = '458588',
|
||||
color3 = '98971a',
|
||||
color4 = '79740e',
|
||||
color5 = '689d6a',
|
||||
color7 = 'cc241d',
|
||||
color8 = '9d0006',
|
||||
};
|
||||
|
||||
|
||||
conky.text = [[
|
||||
${alignc}${font IBM Plex Sans Light:size=10}${time %A %d %B %Y}${font}${alignc}
|
||||
${color1}${hr 2}${color}
|
||||
${voffset -5}
|
||||
${font IBM Plex Sans Light:size=8}${color1}HOSTNAME:${color}${font} ${alignr}$nodename
|
||||
${font IBM Plex Sans Light:size=8}${color1}UPTIME:${color}${font} ${alignr}$uptime_short
|
||||
${font IBM Plex Sans Light:size=8}${color1}KERNEL:${color}${font} ${alignr}$kernel ${voffset 5}
|
||||
${font :size=11}${color}Network ${hr 2}
|
||||
${voffset -20}
|
||||
${font IBM Plex Sans Light:size=10}${color1}IP ADDRESS:${color}${font} ${alignr}${addr wlan0}${color}
|
||||
${if_match "${addr wlan0}"!="No Address"}${voffset 5}${font IBM Plex Sans Light:size=10}${font}Download ${alignr}${downspeedf wlan0}k/s (${totaldown wlan0})
|
||||
${color1}${downspeedgraph wlan0 50,280 98971a 79740e -t}${color}
|
||||
${font IBM Plex Sans Light:size=10}${font}Upload ${alignr}${upspeedf wlan0}k/s (${totalup wlan0})
|
||||
${color1}${upspeedgraph wlan0 50,280 9d0006 cc241d -t}${color}
|
||||
${endif}${voffset 5}${font :size=11}${color}HDD ${hr 2}
|
||||
${voffset 5}${color1}Used: ${fs_used /}${goto 175}Free:${goto 225}${fs_free /}${color}
|
||||
${color2}${fs_bar /}${color}
|
||||
${font IBM Plex Sans Light:size=8}${color1}DISK I/O:${color}${font} ${alignr}$diskio
|
||||
${voffset 2}${font IBM Plex Sans Light:size=8}${color1}READ: ${font} ${goto 80}${diskiograph_read 15,210 98971a 79740e 750}${color}
|
||||
${voffset 2}${font IBM Plex Sans Light:size=8}${color1}WRITE:${font} ${goto 80}${diskiograph_write 15,210 9d0006 cc241d 750}${color}
|
||||
${voffset 5}${font :size=11}Memory ${hr 2}${voffset 2}${font}
|
||||
${font IBM Plex Sans Light:size=10}RAM $alignc ${font}${color1}$mem / $memmax $alignr ${color4}$memperc%${color}
|
||||
${color2}$membar${voffset 5}${color}
|
||||
${font :size=11}GPU ${hr 2}${voffset 2}
|
||||
${font IBM Plex Sans Light:size=9}${color1}GPU Freq.: $alignr ${color}${font}${nvidia gpufreq} Mhz${voffset 2}
|
||||
${font IBM Plex Sans Light:size=9}${color1}Memory Freq.: $alignr ${color}${font}${nvidia memfreq} Mhz${voffset 2}
|
||||
${font IBM Plex Sans Light:size=9}${color1}Temperature: $alignr ${color4}${font}${nvidia temp}°C ${voffset 5}${color}
|
||||
${font :size=11}CPUs ${hr 2}
|
||||
${voffset -20}
|
||||
${font IBM Plex Sans Light:size=10}${color1}CPU:${color}${font} ${alignr}AMD Ryzen 7 3800X
|
||||
${voffset -20}
|
||||
${font IBM Plex Sans Light:size=9}${color1}01 - 04:${color}${font} ${goto 100}${cpu cpu1}% ${goto 150}${cpu cpu2 }% ${goto 200}${cpu cpu3 }% ${goto 250}${cpu cpu4 }%
|
||||
${font IBM Plex Sans Light:size=9}${color1}05 - 08:${color}${font} ${goto 100}${cpu cpu5}% ${goto 150}${cpu cpu6 }% ${goto 200}${cpu cpu7 }% ${goto 250}${cpu cpu8 }%
|
||||
${font IBM Plex Sans Light:size=9}${color1}09 - 12:${color}${font} ${goto 100}${cpu cpu9}% ${goto 150}${cpu cpu10}% ${goto 200}${cpu cpu11}% ${goto 250}${cpu cpu12}%
|
||||
${voffset -10}
|
||||
${font IBM Plex Sans Light:size=9}${color1}CPU TEMP:${color4}${font}${alignr}${hwmon 1 temp 1}°C${color}
|
||||
${voffset 5}${font :size=11}Processes ${hr 2}${font}
|
||||
${voffset -20}
|
||||
${font :size=10}${font IBM Plex Sans Light:size=8}${color1}TOTAL:${color}${font} ${alignr}${processes}
|
||||
${voffset -12}
|
||||
${font IBM Plex Sans Light:size=9}${color1}APP NAME: ${goto 160}MEMORY: ${goto 245}CPU: ${color}${font}
|
||||
${voffset -20}
|
||||
${font IBM Plex Sans Light:size=9}${color1}${top_mem name 1} ${color}${font} ${goto 160}${top mem 1} % ${goto 235}${top cpu 1} %
|
||||
${font IBM Plex Sans Light:size=9}${color1}${top_mem name 2} ${color}${font} ${goto 160}${top mem 2} % ${goto 235}${top cpu 2} %
|
||||
${font IBM Plex Sans Light:size=9}${color1}${top_mem name 3} ${color}${font} ${goto 160}${top mem 3} % ${goto 235}${top cpu 3} %
|
||||
${font IBM Plex Sans Light:size=9}${color1}${top_mem name 4} ${color}${font} ${goto 160}${top mem 4} % ${goto 235}${top cpu 4} %
|
||||
${font IBM Plex Sans Light:size=9}${color1}${top_mem name 5} ${color}${font} ${goto 160}${top mem 5} % ${goto 235}${top cpu 5} %
|
||||
${font IBM Plex Sans Light:size=9}${color1}${top_mem name 6} ${color}${font} ${goto 160}${top mem 6} % ${goto 235}${top cpu 6} %
|
||||
${font IBM Plex Sans Light:size=9}${color1}${top_mem name 7} ${color}${font} ${goto 160}${top mem 7} % ${goto 235}${top cpu 7} %
|
||||
${font IBM Plex Sans Light:size=9}${color1}${top_mem name 8} ${color}${font} ${goto 160}${top mem 8} % ${goto 235}${top cpu 8} %
|
||||
${font IBM Plex Sans Light:size=9}${color1}${top_mem name 9} ${color}${font} ${goto 160}${top mem 9} % ${goto 235}${top cpu 9} %
|
||||
]];
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
function define_aliases -a uname -d 'Defines aliases for commonly used commands'
|
||||
alias q 'exit'
|
||||
alias q exit
|
||||
alias rcp 'rsync -aP'
|
||||
alias vg 'vagrant'
|
||||
alias tf 'terraform'
|
||||
alias vg vagrant
|
||||
alias tf terraform
|
||||
alias gco 'gcloud compute'
|
||||
alias tocb 'xclip -in -selection clipboard'
|
||||
alias fromcb 'xclip -out -selection clipboard'
|
||||
|
|
@ -12,17 +12,17 @@ function define_aliases -a uname -d 'Defines aliases for commonly used commands'
|
|||
alias age-e 'age --armor --recipient (cat ~/.secrets/id_ed25519.pub)'
|
||||
alias age-k 'age --decrypt --identity ~/.secrets/id_ed25519 ~/.secrets/age_keys.age'
|
||||
alias bb 'bun --bun'
|
||||
alias pn 'pnpm'
|
||||
alias pn pnpm
|
||||
|
||||
switch "$uname"
|
||||
case 'Linux'
|
||||
case Linux
|
||||
alias goland 'command goland'
|
||||
alias rider 'command rider'
|
||||
alias webstorm 'command webstorm'
|
||||
alias sctl 'sudo systemctl'
|
||||
alias uctl 'systemctl --user'
|
||||
alias bctl 'bluetoothctl'
|
||||
case 'Darwin'
|
||||
alias bctl bluetoothctl
|
||||
case Darwin
|
||||
alias goland 'open -a Goland'
|
||||
alias rider 'open -a Rider'
|
||||
alias webstorm 'open -a Webstorm'
|
||||
|
|
|
|||
|
|
@ -1,10 +1,16 @@
|
|||
function fish_greeting -d "What's up, fish?"
|
||||
set_color $fish_color_autosuggestion
|
||||
uname -nmsr
|
||||
|
||||
# TODO: `command -q -s` only works on fish 2.5+, so hold off on that for now
|
||||
set uname (uname -nor)
|
||||
|
||||
command -s uptime >/dev/null
|
||||
and uptime
|
||||
and if test (uname) = Linux
|
||||
and set uptime '; ' (uptime --pretty)
|
||||
else
|
||||
and set uptime '; ' (uptime)
|
||||
end
|
||||
|
||||
echo -s $uname $uptime
|
||||
|
||||
set_color normal
|
||||
end
|
||||
|
|
|
|||
|
|
@ -3,13 +3,12 @@ function toglpulse
|
|||
|
||||
if test -e ~/.config/pulse/client.conf
|
||||
rm -rf ~/.config/pulse/client.conf
|
||||
ssh -o StrictHostKeyChecking=no venator.lan systemctl --user restart pipewire-pulse
|
||||
or ssh -o StrictHostKeyChecking=no venator.lan nssm restart pulseaudio
|
||||
systemctl --user start pipewire.socket
|
||||
rebar
|
||||
else
|
||||
killall easyeffects pavucontrol; or killall -9 easyeffects pavucontrol
|
||||
echo "default-server = venator.lan" > ~/.config/pulse/client.conf
|
||||
systemctl --user stop pipewire pipewire-pulse wireplumber
|
||||
echo "default-server = 192.168.1.155" >~/.config/pulse/client.conf
|
||||
systemctl --user stop pipewire.socket pipewire pipewire-pulse wireplumber
|
||||
rebar
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -24,6 +24,10 @@ require("symbols-outline").setup({
|
|||
})
|
||||
require("leap").add_default_mappings()
|
||||
|
||||
require("notify").setup({
|
||||
background_colour = "#000000",
|
||||
})
|
||||
|
||||
require("noice").setup({
|
||||
lsp = {
|
||||
-- override markdown rendering so that **cmp** and other plugins use **Treesitter**
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ shadow-radius = 12
|
|||
fading = true
|
||||
fade-delta = 5
|
||||
|
||||
blur-background = true
|
||||
blur-kern = "11x11gaussian"
|
||||
|
||||
vsync = true
|
||||
|
|
|
|||
|
|
@ -1,95 +0,0 @@
|
|||
# If a config.py file exists, this file is ignored unless it's explicitly loaded
|
||||
# via config.load_autoconfig(). For more information, see:
|
||||
# https://github.com/qutebrowser/qutebrowser/blob/master/doc/help/configuring.asciidoc#loading-autoconfigyml
|
||||
# DO NOT edit this file by hand, qutebrowser will overwrite it.
|
||||
# Instead, create a config.py - see :help for details.
|
||||
|
||||
config_version: 2
|
||||
settings:
|
||||
aliases:
|
||||
global:
|
||||
q: close
|
||||
qa: quit
|
||||
w: session-save
|
||||
wq: quit --save
|
||||
wqa: quit --save
|
||||
auto_save.interval:
|
||||
global: 15000
|
||||
auto_save.session:
|
||||
global: false
|
||||
backend:
|
||||
global: webengine
|
||||
bindings.commands:
|
||||
global:
|
||||
insert: {}
|
||||
colors.webpage.darkmode.enabled:
|
||||
global: false
|
||||
completion.web_history.max_items:
|
||||
global: 0
|
||||
content.autoplay:
|
||||
global: false
|
||||
content.cache.size:
|
||||
global: 0
|
||||
content.cookies.accept:
|
||||
global: no-3rdparty
|
||||
content.cookies.store:
|
||||
global: false
|
||||
content.javascript.enabled:
|
||||
global: false
|
||||
content.local_storage:
|
||||
global: true
|
||||
content.notifications:
|
||||
https://app.slack.com: true
|
||||
content.webrtc_ip_handling_policy:
|
||||
global: all-interfaces
|
||||
content.xss_auditing:
|
||||
global: false
|
||||
downloads.location.directory:
|
||||
global: ~/downloads
|
||||
downloads.location.prompt:
|
||||
global: true
|
||||
downloads.location.remember:
|
||||
global: true
|
||||
downloads.location.suggestion:
|
||||
global: path
|
||||
downloads.open_dispatcher:
|
||||
global: null
|
||||
downloads.position:
|
||||
global: top
|
||||
downloads.remove_finished:
|
||||
global: -1
|
||||
editor.command:
|
||||
global:
|
||||
- kitty
|
||||
- nvim
|
||||
- -f
|
||||
- '{file}'
|
||||
- -c
|
||||
- normal {line}G{column0}l
|
||||
editor.encoding:
|
||||
global: utf-8
|
||||
fonts.default_family:
|
||||
global: JetBrains Mono
|
||||
fonts.default_size:
|
||||
global: 8pt
|
||||
fonts.web.family.fixed:
|
||||
global: JetBrains Mono
|
||||
fonts.web.family.sans_serif:
|
||||
global: IBM Plex Sans
|
||||
fonts.web.family.serif:
|
||||
global: IBM Plex Serif
|
||||
fonts.web.family.standard:
|
||||
global: IBM Plex Sans
|
||||
fonts.web.size.default:
|
||||
global: 16
|
||||
url.default_page:
|
||||
global: http://search.m
|
||||
url.searchengines:
|
||||
global:
|
||||
DEFAULT: http://search.m/?q={}
|
||||
url.start_pages:
|
||||
global: http://search.m
|
||||
window.title_format:
|
||||
global: '{perc}{host}{title_sep}qutebrowser'
|
||||
zoom.default:
|
||||
global: 125%
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
hn https://news.ycombinator.com/
|
||||
ch https://app.clubhouse.io/rotabull/stories/space/1285/platform-eng
|
||||
gh https://github.com/
|
||||
gcp https://console.cloud.google.com/projectselector2/home/dashboard?organizationId=817788800675&supportedpurview=project
|
||||
aws https://console.aws.amazon.com/s3/home?region=us-east-1
|
||||
rip https://app.rippling.com/dashboard
|
||||
slk https://rotabull.slack.com/
|
||||
octo https://rotabull.octopus.app/app#/users/sign-in
|
||||
log https://logentries.com/login/
|
||||
Loading…
Add table
Add a link
Reference in a new issue