Merge branch 'master' of git.joshfabean.com:fabean/Dotfiles

.config/alacritty/alacritty.yml

@@ -71,7 +71,6 @@ scrolling:
   #faux_multiplier: 3
 
   # Scroll to the bottom when new text is written to the terminal.
-  auto_scroll: false
 
 # Spaces per Tab (changes require restart)
 #
@@ -80,12 +79,12 @@ scrolling:
 # Some applications, like Emacs, rely on knowing about the width of a tab.
 # To prevent unexpected behavior in these applications, it's also required to
 # change the `it` value in terminfo when altering this setting.
-tabspaces: 8
 
 # Font configuration (changes require restart)
 font:
   # Normal (roman) font face
   #normal:
+  family: "JetBrains Mono"
     # Font family
     #
     # Default:
@@ -269,7 +268,7 @@ visual_bell:
 #
 # Window opacity as a floating point number from `0.0` to `1.0`.
 # The value `0.0` is completely transparent and `1.0` is opaque.
-background_opacity: 0.87
+background_opacity: 0.95
 
 # Mouse bindings
 #

.config/fish/config.fish

@@ -3,7 +3,7 @@ alias bim='nvim'
 alias ssh="ssh -A" # forward ssh keys to server
 alias cp='cp -iv' # prompt when overwriting and verbose
 alias mv='mv -iv' # prompt when overwriting and verbose
-alias ll='ls -FGlAhp'
+#alias ll='ls -FGlAhp'
 alias du1='du -h -d 1'
 alias ls='exa'
 alias gs='git status'
@@ -18,15 +18,15 @@ alias docker-stop='systemctl stop docker'
 alias mux='tmuxinator'
 
 function vpn-start
-  sudo systemctl start openvpn-client@$1
+  sudo systemctl start openvpn-client@$argv
 end
 
 function vpn-stop
-  sudo systemctl stop openvpn-client@$1
+  sudo systemctl stop openvpn-client@$argv
 end
 
 function vpn-status
-  sudo systemctl status openvpn-client@$1
+  sudo systemctl status openvpn-client@$argv
 end
 
 # my path

.config/i3/arch-config

@@ -14,7 +14,7 @@ exec --no-startup-id nightshift -l 39.0315533:-94.4954291 -d
 # exec --no-startup-id setxkbmap -model apple_laptop -layout us -variant dvp
 exec --no-startup-id /home/joshfabean/.screenlayout/desktop-computer-dual.sh
 
-font pango:FiraCode, FontAwesome 12
+font pango:JetBrains Mono, FontAwesome 12
 
 bindsym $mod+F7 exec --no-startup-id xset r rate 250 25 && xset b off && setxkbmap -option caps:escape
 
@@ -220,7 +220,9 @@ bar {
         font pango:Liberation 10, FontAwesome 12
         # strip_workspace_numbers yes
 
-        colors {
+       # strip_workspace_numbers yes
+
+       colors {
           separator #586e75
           background #0c1014
           statusline #aea79f

.config/rofi/config

@@ -7,15 +7,15 @@ rofi.color-normal: #0a0f14, #c1c1c1, #0a0f14, #394249, #ffffff
 !rofi.color-active: #0a0f14, #98d1ce, #0a0f14, #98d1ce, #ffffff
 rofi.color-active: #d41919, #d41919, #d41919, #98d1ce, #ffffff
 rofi.color-urgent: #0a0f14, #ff1844, #0a0f14, #394249, #ff1844
-rofi.lines: 7
-rofi.eh: 2
-rofi.fullscreen: true
-!rofi.width: 1400px
-rofi.padding:   400
-rofi.opacity:   90
+rofi.lines: 10
+rofi.eh: 1
+rofi.fullscreen: false
+rofi.width: 500px
+rofi.padding:   100
+rofi.opacity:   95
 rofi.bw: 0
-rofi.terminal: termite
+rofi.terminal: alacritty
 rofi.glob: true
 rofi.tokenize: false
-rofi.font: Source Sans Pro 30
-rofi.theme: ./flat-redux-green.rasi
+rofi.font: JetBrains Mono 12
+rofi.theme: ./flat-redux-green-window.rasi

.config/rofi/flat-redux-green-window.rasi

@@ -0,0 +1,144 @@
+/************************************************
+ * ROFI Color theme
+ * User: fabean
+ * Copyright: 2020 fabean
+ ***********************************************/
+
+* {
+    selected-normal-foreground:  rgba ( 251, 241, 199, 100 % );
+    foreground:                  rgba ( 251, 241, 199, 100 % );
+    normal-foreground:           @foreground;
+    alternate-normal-background: rgba ( 0, 0, 0,0% );
+    red:                         rgba ( 220, 50, 47, 100 % );
+    green:                       rgba ( 23, 145, 122, 100 % );
+    blue:                        rgba ( 38, 139, 210, 100 % );
+    lightbg:                     rgba ( 238, 232, 213, 100 % );
+    background:                  rgba ( 29, 32, 33, 95% );
+    alternate-normal-foreground: @foreground;
+    normal-background:           rgba (0,0,0,0);
+    lightfg:                     rgba ( 88, 104, 117, 100 % );
+    selected-normal-background:  @green;
+    border-color:                rgba ( 124, 131, 137, 100 % );
+    spacing:                     2;
+    separatorcolor:              rgba ( 29, 31, 33, 100 % );
+    urgent-background:           rgba ( 29, 31, 33, 17 % );
+    selected-urgent-background:  rgba ( 23, 145, 122, 100 % );
+    alternate-urgent-foreground: @urgent-foreground;
+    background-color:            rgba ( 0, 0, 0, 0 % );
+    alternate-active-foreground: @active-foreground;
+    active-background:           rgba ( 23, 145, 122, 100 % );
+    selected-active-background:  rgba ( 23, 145, 122, 100 % );
+}
+#window {
+    background-color: @background;
+    border:           0;
+    padding:          0;
+}
+#mainbox {
+    border:  0;
+    padding: 10px 10px;
+}
+#message {
+    border:       2px 0px 0px ;
+    border-color: @separatorcolor;
+    padding:      10px ;
+}
+#textbox {
+    text-color: @foreground;
+    background-color: rgba (255, 0, 0, 100 %);
+    padding: 20px;
+}
+#listview {
+    fixed-height: 0;
+    border:       0;
+    border-color: @separatorcolor;
+    spacing:      0;
+    scrollbar:    false;
+    padding:      0;
+}
+#element {
+    border:  0;
+    padding: 10px;
+}
+#element.normal.normal {
+    background-color: @normal-background;
+    text-color:       @normal-foreground;
+}
+#element.normal.urgent {
+    background-color: @urgent-background;
+    text-color:       @urgent-foreground;
+}
+#element.normal.active {
+    background-color: @active-background;
+    text-color:       @active-foreground;
+}
+#element.selected.normal {
+    background-color: @selected-normal-background;
+    text-color:       @selected-normal-foreground;
+}
+#element.selected.urgent {
+    background-color: @selected-urgent-background;
+    text-color:       @selected-urgent-foreground;
+}
+#element.selected.active {
+    background-color: @selected-active-background;
+    text-color:       @selected-active-foreground;
+}
+#element.alternate.normal {
+    background-color: @alternate-normal-background;
+    text-color:       @alternate-normal-foreground;
+}
+#element.alternate.urgent {
+    background-color: @alternate-urgent-background;
+    text-color:       @alternate-urgent-foreground;
+}
+#element.alternate.active {
+    background-color: @alternate-active-background;
+    text-color:       @alternate-active-foreground;
+}
+#scrollbar {
+    width:        4px ;
+    border:       0;
+    handle-color: @normal-foreground;
+    handle-width: 8px ;
+    padding:      0;
+}
+#sidebar {
+    border:       0px ;
+    border-color: @separatorcolor;
+}
+#button {
+    spacing:    0;
+    text-color: @normal-foreground;
+}
+#button.selected {
+    background-color: @selected-normal-background;
+    text-color:       @selected-normal-foreground;
+}
+#inputbar {
+    spacing:    0;
+    text-color: @normal-foreground;
+    padding:    10px;
+
+}
+#case-indicator {
+    spacing:    0;
+    text-color: @normal-foreground;
+}
+#entry {
+    spacing:    0;
+    text-color: @normal-foreground;
+}
+#prompt {
+    spacing:    0;
+    text-color: @normal-foreground;
+}
+#inputbar {
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
+}
+#textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3em 0em 0em ;
+    text-color: @normal-foreground;
+}

.config/sway/golem-sway

@@ -3,7 +3,7 @@
 set $mod Mod4
 set $alt Mod1
 
-font pango:FiraCode, FontAwesome 12, Noto
+font JetBrains Mono, FontAwesome 12
 
 bindsym $mod+F7 exec --no-startup-id xset r rate 250 25 && xset b off && setxkbmap -option caps:escape
 
@@ -157,6 +157,7 @@ for_window [class="^Steam$" title="^Steam - Self Updater$"] floating enable
 for_window [class="^Steam$" title="^Screenshot Uploader$"] floating enable
 for_window [class="^Steam$" title="^Steam Guard - Computer Authorization Required$"] floating enable
 for_window [title="^Steam Keyboard$"] floating enable
+for_window [title="Qalculate!"] floating enable
 
 ###########################
 ## Assign Workspaces
@@ -168,11 +169,11 @@ assign [class="Plexamp"] 3
 ## Gaps
 ##########################
 # new_window 1pixel
-default_border pixel 2
+default_border pixel 0
 #Hide border if 1 window
 hide_edge_borders both
 set $default_gaps_inner 5
-set $default_gaps_outer 0
+set $default_gaps_outer 5
 gaps inner $default_gaps_inner
 gaps outer $default_gaps_outer
 smart_gaps on
@@ -220,20 +221,6 @@ bindsym $mod+Control+Left resize shrink width 5 px or 5 ppt
 # finds out, if available)
 bar {
    swaybar_command waybar
-#  position top
-#  status_command i3blocks
-#  font pango:Liberation 10, FontAwesome 12
-#  strip_workspace_numbers yes
-#
-#  colors {
-#    separator #586e75
-#    background #0c1014
-#    statusline #aea79f
-#    focused_workspace #091f2e #091f2e #ffffff
-#    active_workspace #073642 #073642 #ffffff
-#    inactive_workspace #0c1014 #0c1014 #aea79f
-#    urgent_workspace #77216f #77216f #ffffff
-#  }
 }
 
 # class                 border  backgr. text    indicator child_border
@@ -245,26 +232,31 @@ client.urgent           #dc322f #b71c1c #fdf6e3 #dc322f #dc322f
 ############################
 ## Displays
 ############################
-output DVI-D-1 pos 0 0 res 1920x1080
-output DP-1 pos 1920 0 res 1920x1200
-output DP-2 pos 3840 0 res 1920x1200
+#HOME
+output HDMI-A-2 pos 0 0 res 1920x1080
+#output DP-1 pos 1920 0 res 1920x1200
+output DP-1 pos 1920 0 res 3440x1440
+#FFICE
+#output DVI-D-1 pos 0 0 res 1920x1080
+#output HDMI-A-1 pos 0 0 res 1920x1080
+#output DP-1 pos 1920 0 res 1920x1200
+#output DP-2 pos 3840 0 res 1920x1200
 # background images
 #output eDP-1 bg ~/Wallpapers/xp-sunrise.png stretch
 #output DP-1 bg ~/Wallpapers/xp-sunrise.png stretch
 #output DP-2 bg ~/Wallpapers/xp-sunrise.png stretch
-output * bg ~/Pictures/Wallpapers/calvin-hobbes-stars.jpg fill
+#output * bg ~/Pictures/Wallpapers/calvin-hobbes-stars.jpg fill
+output * bg ~/Pictures/Wallpapers/scenic-view-of-forest-during-night-time-1252869.jpg fill
 bindsym $mod+Shift+m exec --no-startup-id "sway output output DP-1 pos 2880 0 res 1920x1080 && sway ouput DP-2 res 1920x1080"
 
 ##############################
 ## Startup Things
 ##############################
 exec --no-startup-id pcmanfm -d
-# exec --no-startup-id nm-applet
-# exec --no-startup-id xss-lock -- i3lock-fancy
 #exec --no-startup-id xset r rate 250 25
 #exec --no-startup-id xset b off
 #exec --no-startup-id setxkbmap -option caps:escape
-exec --no-startup-id nightshift -l 39.0315533:-94.4954291 -d
+#exec --no-startup-id nightshift -l 39.0315533:-94.4954291 -d
 #exec --no-startup-id setxkbmap -model apple_laptop -layout us -variant dvp
 exec --no-startup-id mako
 

.config/waybar/config

@@ -4,9 +4,29 @@
     "height": 30, // Waybar height (to be removed for auto height)
     // "width": 1280, // Waybar width
     // Choose the order of the modules
-    "modules-left": ["sway/workspaces", "sway/mode", "custom/media"],
-    "modules-center": ["sway/window"],
-    "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "battery", "battery#bat2", "clock", "tray"],
+    "modules-left": [
+        "sway/workspaces",
+        "sway/mode",
+        "custom/media"
+    ],
+    "modules-center": [
+        "sway/window"
+    ],
+    "modules-right": [
+        "custom/watson",
+        "custom/calc",
+        "idle_inhibitor",
+        "pulseaudio",
+        "network",
+        "cpu",
+        "memory",
+        "custom/temperature",
+        "backlight",
+        "battery",
+        "battery#bat2",
+        "clock",
+        "tray"
+    ],
     // Modules configuration
     // "sway/workspaces": {
     //     "disable-scroll": true,
@@ -79,14 +99,34 @@
         // "thermal-zone": 2,
         // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
         "critical-threshold": 80,
+        "exec": "ryzen-cpu-temp",
         // "format-critical": "{temperatureC}°C {icon}",
         "format": "{temperatureC}°C {icon}",
-        "format-icons": ["", "", ""]
+        "format-icons": [
+            "",
+            "",
+            ""
+        ]
+    },
+    "custom/temperature": {
+        "interval": 10,
+        "critical-threshold": 80,
+        "exec": "ryzen-cpu-temp",
+        "format-critical": "{} {icon}",
+        "format": "{}°C {icon}",
+        "format-icons": [
+            "",
+            "",
+            ""
+        ]
     },
     "backlight": {
         // "device": "acpi_video1",
         "format": "{percent}% {icon}",
-        "format-icons": ["", ""]
+        "format-icons": [
+            "",
+            ""
+        ]
     },
     "battery": {
         "states": {
@@ -100,7 +140,13 @@
         "format-alt": "{time} {icon}",
         // "format-good": "", // An empty format will hide the module
         // "format-full": "",
-        "format-icons": ["", "", "", "", ""]
+        "format-icons": [
+            "",
+            "",
+            "",
+            "",
+            ""
+        ]
     },
     "battery#bat2": {
         "bat": "BAT2"
@@ -128,7 +174,11 @@
             "phone": "",
             "portable": "",
             "car": "",
-            "default": ["", "", ""]
+            "default": [
+                "",
+                "",
+                ""
+            ]
         },
         "on-click": "pavucontrol"
     },
@@ -143,5 +193,17 @@
         "escape": true,
         "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
         // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
+    },
+    "custom/watson": {
+        "format": "{} ",
+        //"max-length": 15,
+        "interval": 10,
+        "exec": "watson-status",
+        "on-click": "watson stop"
+    },
+    "custom/calc": {
+        "format": "",
+        "interval": 1000,
+        "on-click": "qalculate-gtk"
     }
 }

.config/waybar/style.css

@@ -2,15 +2,15 @@
     border: none;
     border-radius: 0;
     /* `otf-font-awesome` is required to be installed for icons */
-    font-family: Roboto, Helvetica, Arial, sans-serif;
-    font-size: 13px;
+    font-family: JetBrains Mono, mono, sans-serif;
+    font-size: 12px;
     min-height: 0;
 }
 
 window#waybar {
-    background-color: transparent;
-    border-bottom: 3px solid rgba(100, 114, 125, 0.2);
-    color: #ffffff;
+    background-color: #1d2021;
+    /*border-bottom: 3px solid rgba(100, 114, 125, 0.2);*/
+    color: #fbf1c7;
     transition-property: background-color;
     transition-duration: .5s;
 }
@@ -38,22 +38,21 @@ window#waybar.chromium {
 }
 
 #workspaces button {
-    padding: 0 5px;
-    background-color: transparent;
-    color: #ffffff;
-    border-bottom: 3px solid transparent;
+    padding: 0 2px;
+    background-color: #fbf1c7;
+    color: #1d2021;
 }
 
 /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
 #workspaces button:hover {
-    background: rgba(0, 0, 0, 0.2);
+    background: #17917a;
     box-shadow: inherit;
-    border-bottom: 3px solid rgba(255, 255, 255, 0.4);
+    color: #fbf1c7;
 }
 
 #workspaces button.focused {
-    background-color: rgba(212, 25, 25, 0.7);
-    border-bottom: 3px solid rgba(255, 255, 255, 0.2);
+    background-color: #17917a;
+    color: #fbf1c7;
 }
 
 #workspaces button.urgent {
@@ -62,7 +61,6 @@ window#waybar.chromium {
 
 #mode {
     background-color: #64727D;
-    border-bottom: 3px solid #ffffff;
 }
 
 #clock,
@@ -77,25 +75,19 @@ window#waybar.chromium {
 #tray,
 #mode,
 #idle_inhibitor,
+#custom-temperature,
+#custom-watson,
+#custom-calc,
 #mpd {
-    padding: 0 10px;
+    padding: 0 4px;
     margin: 0 4px;
-    color: #ffffff;
+    color: #fbf1c7;
 }
 
 #clock {
-    background-color: #64727D;
 }
 
-#battery {
-    background-color: #ffffff;
-    color: #000000;
-}
 
-#battery.charging {
-    color: #ffffff;
-    background-color: #26A65B;
-}
 
 @keyframes blink {
     to {
@@ -119,53 +111,38 @@ label:focus {
 }
 
 #cpu {
-    background-color: #2ecc71;
-    color: #000000;
 }
 
 #memory {
-    background-color: #9b59b6;
 }
 
 #backlight {
-    background-color: #90b1b1;
 }
 
 #network {
     /*background-color: #2980b9;*/
-    background-color: rgba(41, 128, 185, 0.7);
 }
 
 #network.disconnected {
-    background-color: #f53c3c;
 }
 
 #pulseaudio {
-    background-color: #f1c40f;
-    color: #000000;
 }
 
 #pulseaudio.muted {
-    background-color: #90b1b1;
-    color: #2a5c45;
 }
 
 #custom-media {
-    background-color: #66cc99;
-    color: #2a5c45;
     min-width: 100px;
 }
 
 #custom-media.custom-spotify {
-    background-color: #66cc99;
 }
 
 #custom-media.custom-vlc {
-    background-color: #ffa000;
 }
 
 #temperature {
-    background-color: #f0932b;
 }
 
 #temperature.critical {
@@ -177,7 +154,6 @@ label:focus {
 }
 
 #idle_inhibitor {
-    background-color: #2d3436;
 }
 
 #idle_inhibitor.activated {
@@ -186,18 +162,14 @@ label:focus {
 }
 
 #mpd {
-    background-color: #66cc99;
-    color: #2a5c45;
 }
 
 #mpd.disconnected {
-    background-color: #f53c3c;
 }
 
 #mpd.stopped {
-    background-color: #90b1b1;
 }
 
 #mpd.paused {
-    background-color: #51a37a;
 }
+

.tmux.conf

@@ -64,7 +64,11 @@ bind -n M-Left if-shell "$is_vim" "send-keys M-Left" "select-pane -L"
 bind -n M-Down if-shell "$is_vim" "send-keys M-Down" "select-pane -D"
 bind -n M-Up if-shell "$is_vim" "send-keys M-Up" "select-pane -U"
 bind -n M-Right if-shell "$is_vim" "send-keys M-Right" "select-pane -R"
-bind -n M-\ if-shell "$is_vim" "send-keys M-\\" "select-pane -l"
+#bind -n M-\ if-shell "$is_vim" "send-keys M-\\" "select-pane -l"
+
+# quick pane cycling
+unbind ^B
+bind ^B select-pane -t :.+
 
 # Split windows like Vim.
 bind v split-window -h