From f584f0e21472814a867eec6a9b71aeb54bd634a6 Mon Sep 17 00:00:00 2001 From: CramMK Date: Mon, 10 Feb 2020 07:31:25 +0100 Subject: [PATCH] Some major changes --- config.yaml | 6 +- dotfiles/Xresources | 8 +- dotfiles/Xresources.d/colors-afterglow | 44 +++++++++ dotfiles/Xresources.d/colors-clean-and-green | 36 ++++++++ dotfiles/i3_config | 26 +++++- dotfiles/i3status_config | 92 ++++++++++++------- dotfiles/picom.conf | 28 +++--- .../agnoster-plus.zsh-theme | 0 .../marc-pygmalion.zsh-theme | 0 .../the-one.zsh-theme | 0 dotfiles/zshrc | 6 ++ 11 files changed, 193 insertions(+), 53 deletions(-) create mode 100644 dotfiles/Xresources.d/colors-afterglow create mode 100644 dotfiles/Xresources.d/colors-clean-and-green rename dotfiles/{zsh-themes => zsh.themes}/agnoster-plus.zsh-theme (100%) rename dotfiles/{zsh-themes => zsh.themes}/marc-pygmalion.zsh-theme (100%) rename dotfiles/{zsh-themes => zsh.themes}/the-one.zsh-theme (100%) diff --git a/config.yaml b/config.yaml index 0c10ca9..b22dca1 100644 --- a/config.yaml +++ b/config.yaml @@ -45,7 +45,7 @@ dotfiles: src: oh-my-zsh dst: ~/.oh-my-zsh f_zsh_themes: - src: zsh-themes + src: zsh.themes dst: ~/.oh-my-zsh/themes d_fonts: src: fonts @@ -53,7 +53,7 @@ dotfiles: d_xresources_d: src: Xresources.d dst: ~/.Xresources.d - f_picom.conf: + f_picom: src: picom.conf dst: ~/.config/picom.conf profiles: @@ -113,4 +113,4 @@ profiles: - f_gdbinit picom: dotfiles: - - f_picom.conf + - f_picom diff --git a/dotfiles/Xresources b/dotfiles/Xresources index 51cad56..55cdc69 100644 --- a/dotfiles/Xresources +++ b/dotfiles/Xresources @@ -1,5 +1,11 @@ ! Colors -#include ".Xresources.d/colors-nord" +! more blue-ish +!#include ".Xresources.d/colors-nord" +! more vibrant +#include ".Xresources.d/colors-afterglow" + +!others +!#include ".Xresources.d/colors-clean-and-green" !#include ".Xresources.d/colors-breeze-dark" !#include ".Xresources.d/colors-onedark" !#include ".Xresources.d/colors-onedark-16" diff --git a/dotfiles/Xresources.d/colors-afterglow b/dotfiles/Xresources.d/colors-afterglow new file mode 100644 index 0000000..be2d0ae --- /dev/null +++ b/dotfiles/Xresources.d/colors-afterglow @@ -0,0 +1,44 @@ +! +! Generated with : +! XRDB2Xreources.py +! +*.foreground: #d0d0d0 +*.background: #212121 +*.cursorColor: #d0d0d0 +! +! Black +*.color0: #151515 +*.color8: #505050 +! +! Red +*.color1: #ac4142 +*.color9: #ac4142 +! +! Green +*.color2: #7e8e50 +*.color10: #7e8e50 +! +! Yellow +*.color3: #e5b567 +*.color11: #e5b567 +! +! Blue +*.color4: #6c99bb +*.color12: #6c99bb +! +! Magenta +*.color5: #9f4e85 +*.color13: #9f4e85 +! +! Cyan +*.color6: #7dd6cf +*.color14: #7dd6cf +! +! White +*.color7: #d0d0d0 +*.color15: #f5f5f5 +! +! Bold, Italic, Underline +*.colorBD: #d0d0d0 +!*.colorIT: +!*.colorUL: diff --git a/dotfiles/Xresources.d/colors-clean-and-green b/dotfiles/Xresources.d/colors-clean-and-green new file mode 100644 index 0000000..5313432 --- /dev/null +++ b/dotfiles/Xresources.d/colors-clean-and-green @@ -0,0 +1,36 @@ +! special +*.foreground: #ffffff +*.background: #2e3440 +*.cursorColor: #ffffff + +! black +*.color0: #2e3440 +*.color8: #707f9c + +! red +*.color1: #84d498 +*.color9: #84d498 + +! green +*.color2: #1cfa67 +*.color10: #1cfa67 + +! yellow +*.color3: #85fa8d +*.color11: #85fa86 + +! blue +*.color4: #1aa662 +*.color12: #1aa662 + +! magenta +*.color5: #23ff77 +*.color13: #23ff77 + +! cyan +*.color6: #50fa7b +*.color14: #50fa7b + +! white +*.color7: #707f9c +*.color15: #ffffff diff --git a/dotfiles/i3_config b/dotfiles/i3_config index c2b6dfb..f3c98db 100644 --- a/dotfiles/i3_config +++ b/dotfiles/i3_config @@ -178,10 +178,23 @@ bindsym $mod+r mode "resize" # Start i3bar to display a workspace bar (plus the system information i3status # finds out, if available) bar { - status_command i3status + colors { + background #2f343f + statusline #2f343f + #separator #4b5262 + separator #2f343f + + # colour of border, background, and text + focused_workspace #2f343f #00b111 #d8dee8 + active_workspace #2f343f #2f343f #d8dee8 + inactive_workspace #2f343f #2f343f #d8dee8 + urgent_workspacei #2f343f #ebcb8b #bf616a + } + status_command i3status } # Keyboard lauyout shortcuts +exec setxkbmap -layout us bindsym Ctrl+Shift+1 exec --no-startup-id setxkbmap us bindsym Ctrl+Shift+2 exec --no-startup-id setxkbmap de @@ -194,7 +207,7 @@ new_window 1pixel bindsym $mod+Shift+b exec "xlock -mode blank -startCmd /share/bin/isweg -endCmd /share/bin/isda" # Custom Workspaces -exec --no-startup-id "xterm -e /home/mthomas/bin/info-tmux" +exec --no-startup-id "xterm -e tmux" exec --no-startup-id "firefox" for_window [class="XTerm" title="info-tmux"] move container to workspace 10 @@ -213,14 +226,19 @@ bindsym $mod+Ctrl+1 move workspace to output $monitor1 bindsym $mod+Ctrl+2 move workspace to output $monitor2 {%@@ endif @@%} + + + + {%@@ if profile == "laptop" @@%} # Locking bindsym $mod+Shift+b exec "xlock -mode matrix" # Custom Workspaces exec --no-startup-id "firefox" -exec --no-startup-id "discord" for_window [class="Firefox"] move container to workspace 9 -for_window [class="Discord"] move container to workspace 10 + +exec --no-startup-id feh --bg-scale ~/.wallpaper/minimalist-forest.jpg +exec --no-startup-id picom {%@@ endif @@%} diff --git a/dotfiles/i3status_config b/dotfiles/i3status_config index 7fe719c..ef91324 100644 --- a/dotfiles/i3status_config +++ b/dotfiles/i3status_config @@ -1,50 +1,76 @@ general { - output_format = "i3bar" - colors = true - interval = 1 + output_format = "i3bar" + colors = false + markup = pango + interval = 5 + color_good = '#2f343f' + color_degraded = '#ebcb8b' + color_bad = '#ba5e57' } -{%@@ if profile == "laptop" @@%} -order += "wireless _first_" -order += "ethernet _first_" -order += "battery all" -order += "disk /" -{%@@ endif @@%} order += "load" order += "memory" + +{%@@ if profile == "laptop" @@%} +order += "cpu_temperature 0" +order += "ethernet _first_" +order += "wireless _first_" +order += "volume master" +order += "battery all" +{%@@ endif @@%} + order += "tztime local" -wireless _first_ { - format_up = "W: (%quality at %essid) %ip" - format_down = "W: down" -} - -ethernet _first_ { - format_up = "E: %ip (%speed)" - format_down = "E: down" -} - -battery all { - format = "%status %percentage %remaining" -} - -disk "/" { - format = "%avail" -# format = "free" # also shows reserved -} - load { - format = "%1min" + format = " %5min Load " } memory { - format = "%used - %available" - threshold_degraded = "1G" - format_degraded = "MEMORY < %available" + format = " %used Mem " + threshold_degraded = "1G" + format_degraded = "MEMORY < %available" +} + +cpu_temperature 0 { + format = " %degrees °C " + path = "/sys/class/thermal/thermal_zone0/temp" +} + +ethernet _first_ { + format_up = " %ip (%speed) " + format_down = " Disconnected " +} + +wireless _first_ { + format_up = " %essid (%quality) " + format_down = " Disconnected " +} + +volume master { + format = " %volume " + format_muted = " Muted " + device = "default" + mixer = "Master" + mixer_idx = 0 +} + +battery all { + last_full_capacity = true + format = " %status %percentage " + format_down = "No Battery" + status_chr = "Charging" + status_bat = "Battery" + status_unk = "Unknown" + status_full = "Charged" + path = "/sys/class/power_supply/BAT%d/uevent" + low_threshold = 10 } tztime local { - format = "%Y-%m-%d %H:%M:%S" + format = " %time " + format_time = "%a %-d %b %H:%M" } + + diff --git a/dotfiles/picom.conf b/dotfiles/picom.conf index be57264..116587b 100644 --- a/dotfiles/picom.conf +++ b/dotfiles/picom.conf @@ -1,23 +1,27 @@ opacity-rule = [ -# add xlock + "85:class_g = 'XTerm' && !focused", + "95:class_g = 'XTerm' && focused", ]; -active-opacity = 0.99; -inactive-opacity = 0.9; +wintypes: { + dock = { opacity = 0.8; } +} -blur-background = true; -blur-background-fixed = true; +#active-opacity = 0.99; +#inactive-opacity = 0.9; -inactive-dim = 0.05; +#blur-background = true; +#blur-background-fixed = true; + +#inactive-dim = 0.05; #fading = true; #fade-delta = 4; #fade-in-step = 0.02; #fade-out-step = 0.02; -blur: -{ - method = "gaussian"; - size = 90; - deviation = 10.0; -} +#blur: { +# method = "gaussian"; +# size = 90; +# deviation = 10.0; +#} diff --git a/dotfiles/zsh-themes/agnoster-plus.zsh-theme b/dotfiles/zsh.themes/agnoster-plus.zsh-theme similarity index 100% rename from dotfiles/zsh-themes/agnoster-plus.zsh-theme rename to dotfiles/zsh.themes/agnoster-plus.zsh-theme diff --git a/dotfiles/zsh-themes/marc-pygmalion.zsh-theme b/dotfiles/zsh.themes/marc-pygmalion.zsh-theme similarity index 100% rename from dotfiles/zsh-themes/marc-pygmalion.zsh-theme rename to dotfiles/zsh.themes/marc-pygmalion.zsh-theme diff --git a/dotfiles/zsh-themes/the-one.zsh-theme b/dotfiles/zsh.themes/the-one.zsh-theme similarity index 100% rename from dotfiles/zsh-themes/the-one.zsh-theme rename to dotfiles/zsh.themes/the-one.zsh-theme diff --git a/dotfiles/zshrc b/dotfiles/zshrc index 5c6cf41..d2a90bd 100644 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -23,6 +23,8 @@ export LANG="en_US.UTF-8" alias zshrc="vim ~/.zshrc" alias szsh="source ~/.zshrc" +alias dotf="cd ~/dotfiles/dotfiles" + alias vimrc="vim ~/.vimrc" alias dotdrop="~/dotfiles/dotdrop.sh" --cfg="~/dotfiles/config.yaml" @@ -30,3 +32,7 @@ alias dotdrop="~/dotfiles/dotdrop.sh" --cfg="~/dotfiles/config.yaml" alias fonts="/home/$USER/.local/share/fonts" alias listfonts="fc-list :scalable=true:spacing=mono: family" alias cachefonts="fc-cache -f -v" + +if [ -f ~/.zsh/zshaliases_local ]; then + source ~/.zsh/zshaliases_local +fi