mirror of
https://github.com/elkowar/dots-of-war.git
synced 2024-11-06 03:12:24 +00:00
asdf
This commit is contained in:
parent
8aa1804333
commit
099e5663d9
9 changed files with 103 additions and 121 deletions
|
|
@ -3,13 +3,13 @@
|
|||
Xcursor.size: 16
|
||||
Xcursor.theme: capitaine-cursors-light
|
||||
|
||||
Xft.autohint: 0
|
||||
Xft.antialias: 1
|
||||
Xft.hinting: true
|
||||
Xft.hintstyle: hintslight
|
||||
Xft.dpi: 96
|
||||
Xft.rgba: rgb
|
||||
Xft.lcdfilter: lcddefault
|
||||
!Xft.autohint: 0
|
||||
!Xft.antialias: 1
|
||||
!Xft.hinting: true
|
||||
!Xft.hintstyle: hintslight
|
||||
!Xft.dpi: 96
|
||||
!Xft.rgba: rgb
|
||||
!Xft.lcdfilter: lcddefault
|
||||
|
||||
rofi.lines: 5
|
||||
rofi.eh: 2
|
||||
|
|
@ -31,33 +31,41 @@ rofi.font: System San Francisco Display 18
|
|||
dzen.font: -*-fixed-medium-r-s*--12-87-*-*-*-*-iso10???-1
|
||||
|
||||
|
||||
URxvt.color24: #076678
|
||||
URxvt.color66: #427b58
|
||||
URxvt.color88: #9d0006
|
||||
URxvt.color96: #8f3f71
|
||||
URxvt.color100: #79740e
|
||||
URxvt.color108: #8ec07c
|
||||
URxvt.color109: #83a598
|
||||
URxvt.color130: #af3a03
|
||||
URxvt.color136: #b57614
|
||||
URxvt.color142: #b8bb26
|
||||
URxvt.color167: #fb4934
|
||||
URxvt.color175: #d3869b
|
||||
URxvt.color208: #fe8019
|
||||
URxvt.color214: #fabd2f
|
||||
URxvt.color223: #ebdbb2
|
||||
URxvt.color228: #f2e5bc
|
||||
URxvt.color229: #fbf1c7
|
||||
URxvt.color230: #f9f5d7
|
||||
URxvt.color234: #1d2021
|
||||
URxvt.color235: #282828
|
||||
URxvt.color236: #32302f
|
||||
URxvt.color237: #3c3836
|
||||
URxvt.color239: #504945
|
||||
URxvt.color241: #665c54
|
||||
URxvt.color243: #7c6f64
|
||||
URxvt.color244: #928374
|
||||
URxvt.color245: #928374
|
||||
URxvt.color246: #a89984
|
||||
URxvt.color248: #bdae93
|
||||
URxvt.color250: #d5c4a1
|
||||
|
||||
|
||||
URxvt.font: xft:scientifica
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
!URxvt.color24: #076678
|
||||
!URxvt.color66: #427b58
|
||||
!URxvt.color88: #9d0006
|
||||
!URxvt.color96: #8f3f71
|
||||
!URxvt.color100: #79740e
|
||||
!URxvt.color108: #8ec07c
|
||||
!URxvt.color109: #83a598
|
||||
!URxvt.color130: #af3a03
|
||||
!URxvt.color136: #b57614
|
||||
!URxvt.color142: #b8bb26
|
||||
!URxvt.color167: #fb4934
|
||||
!URxvt.color175: #d3869b
|
||||
!URxvt.color208: #fe8019
|
||||
!URxvt.color214: #fabd2f
|
||||
!URxvt.color223: #ebdbb2
|
||||
!URxvt.color228: #f2e5bc
|
||||
!URxvt.color229: #fbf1c7
|
||||
!URxvt.color230: #f9f5d7
|
||||
!URxvt.color234: #1d2021
|
||||
!URxvt.color235: #282828
|
||||
!URxvt.color236: #32302f
|
||||
!URxvt.color237: #3c3836
|
||||
!URxvt.color239: #504945
|
||||
!URxvt.color241: #665c54
|
||||
!URxvt.color243: #7c6f64
|
||||
!URxvt.color244: #928374
|
||||
!URxvt.color245: #928374
|
||||
!URxvt.color246: #a89984
|
||||
!URxvt.color248: #bdae93
|
||||
!URxvt.color250: #d5c4a1
|
||||
|
|
|
|||
|
|
@ -254,6 +254,7 @@ schemes:
|
|||
white: '#e6e6e6'
|
||||
gruvbox: &gruvbox
|
||||
primary:
|
||||
#background: '#1d2021' # hard contrast: background = '#1d2021'
|
||||
background: '#282828' # hard contrast: background = '#1d2021'
|
||||
foreground: '#ebdbb2' # soft contrast: background = '#32302f'
|
||||
normal:
|
||||
|
|
@ -306,8 +307,14 @@ colors: *gruvbox
|
|||
background_opacity: 1
|
||||
|
||||
font:
|
||||
size: 13
|
||||
size: 12
|
||||
normal: # >>= >=
|
||||
family: Iosevka
|
||||
#family: JetBrainsMono Nerd Font
|
||||
#family: Iosevka
|
||||
family: cozette
|
||||
#family: Terminus (TTF)
|
||||
#family: cherry
|
||||
#family: lucy tewi2a
|
||||
#family: Scientifica
|
||||
style: Normal
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ fish_vi_key_bindings
|
|||
# fish_default_key_bindings
|
||||
|
||||
set -U FZF_TMUX 1
|
||||
set -U FZF_DEFAULT_COMMANDS "--filepath-word --cycle"
|
||||
set -U FZF_PREVIEW_FILE_CMD "head -n 10 | bat --color=always --decorations=never"
|
||||
set -U fish_greeting
|
||||
#function fish_greeting
|
||||
|
|
@ -9,6 +10,7 @@ set -U fish_greeting
|
|||
|
||||
|
||||
alias ls=lsd
|
||||
alias tcolors="env TERM=xterm-256color tcolors"
|
||||
abbr --add --global vim nvim
|
||||
abbr --add --global tsh trash
|
||||
#abbr --add --global clear "clear && ls"
|
||||
|
|
@ -36,6 +38,14 @@ function run_stuff
|
|||
commandline -f repaint
|
||||
end
|
||||
|
||||
function c
|
||||
set -l result (/home/leon/scripts/conf)
|
||||
commandline -r "$result"
|
||||
commandline -f repaint
|
||||
commandline -f execute
|
||||
end
|
||||
|
||||
|
||||
bind \ca run_stuff
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
# This file contains fish universal variable definitions.
|
||||
# VERSION: 3.0
|
||||
SETUVAR FZF_DEFAULT_COMMANDS:\x2d\x2dfilepath\x2dword\x20\x2d\x2dcycle
|
||||
SETUVAR FZF_DEFAULT_OPTS:\x2d\x2dheight\x2040\x25
|
||||
SETUVAR FZF_ENABLE_OPEN_PREVIEW:1
|
||||
SETUVAR FZF_LEGACY_KEYBINDINGS:0
|
||||
|
|
|
|||
|
|
@ -39,6 +39,10 @@ alert = #bd2c40
|
|||
|
||||
;; Bar config ----------------------------------------- {{{
|
||||
|
||||
[global/wm]
|
||||
margin-bottom = 0
|
||||
|
||||
|
||||
[bar/main]
|
||||
monitor = ${env:MONITOR:}
|
||||
|
||||
|
|
@ -91,23 +95,25 @@ module-margin-right = 0
|
|||
;font-0 = "JetBrainsMono Nerd Font:fontformat=truetype:size=10;2"
|
||||
;font-1 = "NotoEmoji:scale=10;1"
|
||||
;font-0 = "JetbrainsMono Bold:size=10;2"
|
||||
font-0 = "JetbrainsMono:weight=medium:size=10;2"
|
||||
;font-0 = "JetbrainsMono:weight=medium:size=10;2"
|
||||
;font-0 = "scientifica:size=10;2"
|
||||
;font-0 = "Terminus (TTF):size=12;2"
|
||||
font-0 = "cherry:size=12;2"
|
||||
;font-0 = "cozette:size=10;2"
|
||||
font-1 = "Symbola:size=8;1"
|
||||
font-2 = "FontAwesome5Free:style=Solid:size=8;2"
|
||||
font-3 = "Iosevka Nerd Font:size=17;4"
|
||||
;font-1 = "FontAwesome:fontformat=truetype:size=12;1"
|
||||
|
||||
|
||||
modules-left = xmonad bspwm
|
||||
modules-center = timerDisplay spotify mpd gitlab-pipeline player-mpv-tail time
|
||||
modules-right = pulseaudio-control updates-arch pulseaudio filesystem memory cpu date
|
||||
; network-traffic
|
||||
modules-left = xmonad
|
||||
modules-center = timerDisplay spotify gitlab-pipeline player-mpv-tail time
|
||||
modules-right = pulseaudio-control updates-arch filesystem memory cpu date
|
||||
|
||||
tray-position = ${env:TRAY_POSITION:right}
|
||||
tray-padding = 2
|
||||
tray-maxsize = 16
|
||||
tray-background = ${colors.background}
|
||||
;tray-background = #0063ff
|
||||
|
||||
cursor-click = pointer
|
||||
cursor-scroll = ns-resize
|
||||
|
|
@ -123,52 +129,31 @@ interval = 25
|
|||
|
||||
mount-0 = /
|
||||
format-mounted = <label-mounted>
|
||||
;format-mounted-prefix = "disk: "
|
||||
;format-mounted-prefix-foreground = ${colors.foreground-alt}
|
||||
format-mounted-prefix = "%{F#8ec07c}%{F-} "
|
||||
;format-mounted-prefix = " "
|
||||
;format-mounted-underline = #0fca42
|
||||
;label-mounted = %{F#0a81f5}%mountpoint%%{F-}: %percentage_used%%
|
||||
label-mounted = %percentage_used%%
|
||||
label-unmounted = %mountpoint% not mounted
|
||||
label-unmounted-foreground = ${colors.foreground-alt}
|
||||
|
||||
[module/cpu]
|
||||
type = internal/cpu
|
||||
interval = 2
|
||||
;format-prefix-foreground = ${colors.foreground-alt}
|
||||
format-prefix = "%{F#fe8019}%{F-} "
|
||||
label = %percentage:2%%
|
||||
|
||||
[module/memory]
|
||||
type = internal/memory
|
||||
interval = 2
|
||||
;format-prefix-foreground = ${colors.foreground-alt}
|
||||
format-prefix = "%{F#83a598}%{F-} "
|
||||
label = %percentage_used%%
|
||||
|
||||
[module/date]
|
||||
type = internal/date
|
||||
interval = 20
|
||||
date = %A, %d %m %y
|
||||
date-alt = %d-%m-%Y
|
||||
time = %H:%M
|
||||
time-alt = %H:%M:%S
|
||||
;format-prefix = "%{F#fbff8c} %{F-}"
|
||||
;format-prefix-foreground = ${colors.foreground-alt}
|
||||
;label = "%{F#444} %{F-}%{B#444} %time% | %date% %{B-}%{F#444} %{F-}"
|
||||
interval = 500
|
||||
date = %a, %d.%m.%Y
|
||||
label = "%date%"
|
||||
|
||||
[module/time]
|
||||
type = internal/date
|
||||
interval = 20
|
||||
date = %a, %d %m %y
|
||||
date-alt = %d-%m-%Y
|
||||
time = %H:%M
|
||||
time-alt = %H:%M:%S
|
||||
;format-prefix = "%{F#fbff8c} %{F-}"
|
||||
;format-prefix-foreground = ${colors.foreground-alt}
|
||||
;label = "%{F#444} %{F-}%{B#444} %time% | %date% %{B-}%{F#444} %{F-}"
|
||||
interval = 1
|
||||
time = %H:%M:%S
|
||||
label = "%time%"
|
||||
|
||||
[module/xmonad]
|
||||
|
|
@ -177,29 +162,11 @@ exec = "~/.config/polybar/polybar-scripts/xmonad-status.sh"
|
|||
label = " %output%"
|
||||
tail = true
|
||||
|
||||
[module/gpu]
|
||||
type = custom/script
|
||||
exec = "cat /tmp/gpu_load"
|
||||
interval = 5
|
||||
|
||||
|
||||
[module/timerDisplay]
|
||||
type = custom/script
|
||||
exec = "[ -f ~/scripts/remainingTime.txt ] && head -n 1 scripts/remainingTime.txt"
|
||||
interval = 1
|
||||
|
||||
|
||||
;[module/gitlab-pipeline]
|
||||
;type = custom/script
|
||||
;exec = ~/scripts/fetch-running-pipelines.sh
|
||||
;interval = 10
|
||||
|
||||
[module/info-pingrtt]
|
||||
type = custom/script
|
||||
exec = ~/.config/polybar/polybar-scripts/info-pingrtt.sh
|
||||
interval = 10
|
||||
|
||||
|
||||
[module/player-mpv-tail]
|
||||
type = custom/script
|
||||
exec = ~/.config/polybar/polybar-scripts/player-mpv-tail.py -t 42 -c '#abb2bf'
|
||||
|
|
@ -217,7 +184,6 @@ type = custom/script
|
|||
exec = ~/.config/polybar/polybar-scripts/network-traffic.sh
|
||||
tail = true
|
||||
|
||||
|
||||
[module/spotify]
|
||||
type = custom/script
|
||||
interval = 1
|
||||
|
|
@ -226,13 +192,11 @@ exec = python ~/.config/polybar/polybar-scripts/spotify_status.py -f '{artist} -
|
|||
click-left = "dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.PlayPause"
|
||||
exec-if = "pgrep spotify"
|
||||
|
||||
|
||||
[module/updates-arch]
|
||||
type = custom/script
|
||||
exec = ~/.config/polybar/polybar-scripts/updates-arch-combined.sh
|
||||
interval = 600
|
||||
|
||||
|
||||
[module/pulseaudio-control]
|
||||
type = custom/script
|
||||
tail = true
|
||||
|
|
@ -244,27 +208,3 @@ click-middle = bash ~/.config/polybar/polybar-scripts/pulseaudio-control.bash to
|
|||
click-left = bash ~/.config/polybar/polybar-scripts/pulseaudio-control.bash next-sink
|
||||
scroll-up = bash ~/.config/polybar/polybar-scripts/pulseaudio-control.bash up
|
||||
scroll-down = bash ~/.config/polybar/polybar-scripts/pulseaudio-control.bash down
|
||||
|
||||
[module/bspwm]
|
||||
type = internal/bspwm
|
||||
|
||||
label-occupied = " %name% "
|
||||
label-empty = ""
|
||||
|
||||
label-focused = " %name% "
|
||||
label-focused-background= ${colors.background-alt}
|
||||
|
||||
pin-workspaces = true
|
||||
inline-mode = false
|
||||
enable-click = true
|
||||
enable-scroll = false
|
||||
reverse-scroll = false
|
||||
fuzzy-match = true
|
||||
|
||||
|
||||
|
||||
[global/wm]
|
||||
margin-bottom = 0
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
[options]
|
||||
font = Iosevka Nerd Font Medium 12
|
||||
;font = Cozette 10
|
||||
;font = scientifica Regular 12
|
||||
;font = Victor mono 13
|
||||
;font = jetbrains mono Nerd Font 12
|
||||
;font = monospace 13
|
||||
|
|
|
|||
|
|
@ -401,7 +401,7 @@ main = do
|
|||
|
||||
let myConfig = desktopConfig
|
||||
{ terminal = myTerminal
|
||||
, workspaces = withScreens (fromIntegral currentScreenCount) (map show [1..5 :: Int])
|
||||
, workspaces = withScreens (fromIntegral currentScreenCount) (map show [1..6 :: Int])
|
||||
, modMask = myModMask
|
||||
, borderWidth = 2
|
||||
, layoutHook = myLayout
|
||||
|
|
@ -443,14 +443,18 @@ polybarPP monitor = namedScratchpadFilterOutWorkspacePP $ marshallPP (fromIntegr
|
|||
, ppHidden = withFG gray . (\wsp -> wrapOnClickCmd ("xdotool key super+" ++ wsp) $ withMargin "__hidden__")
|
||||
, ppHiddenNoWindows = withFG gray . (\wsp -> wrapOnClickCmd ("xdotool key super+" ++ wsp) $ withMargin "__empty__")
|
||||
, ppWsSep = ""
|
||||
, ppSep = " | "
|
||||
, ppLayout = removeWord "Minimize" . removeWord "Hinted" . removeWord "Spacing" . withFG purple . withMargin
|
||||
, ppSep = ""
|
||||
, ppLayout = \l -> if l == "Tall" || l == "Horizon"
|
||||
then ""
|
||||
else (withFG gray " | ") ++
|
||||
(removeWords ["Minimize", "Hinted", "Spacing", "Tall"] . withFG purple . withMargin $ l)
|
||||
, ppExtras = []
|
||||
, ppTitle = const "" -- withFG aqua . (shorten 40)
|
||||
}
|
||||
where
|
||||
withMargin = wrap " " " "
|
||||
removeWord substr = unwords . filter (/= substr) . words
|
||||
removeWords wrds str = foldr removeWord str wrds
|
||||
withBG col = wrap ("%{B" ++ col ++ "}") "%{B-}"
|
||||
withFG col = wrap ("%{F" ++ col ++ "}") "%{F-}"
|
||||
wrapOnClickCmd command = wrap ("%{A1:" ++ command ++ ":}") "%{A}"
|
||||
|
|
|
|||
|
|
@ -2,3 +2,6 @@ xmonad /home/leon/.xmonad/lib/Config.hs
|
|||
polybar /home/leon/.config/polybar/config.ini
|
||||
picom /home/leon/.config/picom.conf
|
||||
vimrc /home/leon/.vimrc
|
||||
termite /home/leon/.config/termite/config
|
||||
alacritty /home/leon/.config/alacritty/alacritty.yml
|
||||
fish /home/leon/.config/fish/config.fish
|
||||
|
|
|
|||
|
|
@ -1,5 +1,12 @@
|
|||
#!/bin/bash
|
||||
selected=$(cat /home/leon/scripts/bookmarks/config_files | awk '{print $1}' | fzf)
|
||||
last_selection=$(cat /tmp/fzf-open-conf-last 2>/dev/null)
|
||||
|
||||
config_files_path="/home/leon/scripts/bookmarks/config_files"
|
||||
config_file_count=$((2+$(cat "$config_files_path" | wc -l)))
|
||||
|
||||
options="$last_selection\n$(awk '{print $1}' $config_files_path | grep -v "$last_selection")"
|
||||
selected=$(echo -e "$options" | fzf --history=/tmp/conf-open-history --cycle --reverse --height "$config_file_count")
|
||||
test "$selected" = "" && exit 1
|
||||
file=$(grep "$selected" /home/leon/scripts/bookmarks/config_files | sed -r 's/^\w*\s+(.*)$/\1/g')
|
||||
nvim "$file"
|
||||
echo "$selected" > /tmp/fzf-open-conf-last
|
||||
file=$(grep "$selected" "$config_files_path" | sed -r 's/^\w*\s+(.*)$/\1/g')
|
||||
echo "nvim $file"
|
||||
|
|
|
|||
Loading…
Reference in a new issue