Upgrade i3 and bashrc

9 files changed, 11 insertions, 468 deletions

diff --git a/.bashrc b/.bashrc
index 1a9023a..73b3e1a 100644
--- a/.bashrc
+++ b/.bashrc
@@ -120,3 +120,6 @@ fi
 source /usr/share/nvm/init-nvm.sh
 
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
+
+export BROWSER="/usr/bin/brave"
+xset r rate 350 50
diff --git a/.config/i3/.i3status.conf~ b/.config/i3/.i3status.conf~
deleted file mode 100644
index 9f8b6e7..0000000
--- a/.config/i3/.i3status.conf~
+++ /dev/null
@@ -1,84 +0,0 @@
-# i3status configuration file.
-# see "man i3status" for documentation.
-
-# It is important that this file is edited as UTF-8.
-# The following line should contain a sharp s:
-# ß
-# If the above line is not correctly displayed, fix your editor first!
-
-general {
-
-        colors = true
-        color_good = "#a3be8c"
-        color_bad = "#bf616a"
-        color_degraded = "#d08770"
-        output_format = "i3bar"
-        interval = 1
-}
-
-#order += "disk /home"
-order += "volume master"
-order += "cpu_usage 0"
-#order += "cpu_temperature 0"
-#order += "ipv6"
-#order += "run_watch DHCP"
-#order += "run_watch VPN"
-#order += "wireless wlan0"
-#order += "ethernet eth0"
-order += "battery 0"
-#order += "load"
-order += "tztime local"
-
-wireless wlan0 {
-        format_up = "W: (%quality at %essid, %bitrate) %ip"
-        format_down = "W: down"
-}
-
-ethernet eth0 {
-        # if you use %speed, i3status requires root privileges
-        format_up = "E: %ip"
-        format_down = "E: down"
-}
-
-battery 0 {
-        format = "🔋 %status %percentage"
-        last_full_capacity = true
-        low_threshold = 10
-}
-
-cpu_usage {
-		format = "💻 CPU %usage"
-}
-
-run_watch DHCP {
-        pidfile = "/var/run/dhclient*.pid"
-}
-
-run_watch VPN {
-        pidfile = "/var/run/vpnc/pid"
-}
-
-tztime local {
-        format = "📅 %A %D ⏰ %H:%M:%S"
-}
-
-load {
-        format = "%1min"
-}
-
-disk "/home" {
-        format = "|Home:%free"
-}
-
-cpu_temperature 0 {
-        format ="T:%degrees°C"
-	    max_threshold = 65
-        path = "/sys/devices/platform/coretemp.0/hwmon/hwmon0/temp1_input"
-}
-
-volume master {
-    format = "🎶 %volume"
-	  device = "default"
-	  mixer = "Master"
-	  mixer_idx = 0
-}
\ No newline at end of file
diff --git a/.config/i3/config b/.config/i3/config
index b4524a5..22a4cb2 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -194,26 +194,26 @@ bindsym $mod+r mode "resize"
 bindsym $mod+Shift+s "exec --no-startup-id maim -s | xclip -selection clipboard -target image/png"
 bindsym $mod+Shift+w "exec --no-startup-id brave"
 bindsym $mod+Shift+t "exec --no-startup-id deepin-screen-recorder"
-bindsym $mod+Shift+p "exec --no-startup-id keepass"
-bindsym $mod+Shift+m "exec --no-startup-id monero-wallet-gui"
+bindsym $mod+Shift+p "exec setup-screen.sh"
 
-for_window [class=".*"] border pixel 2 
+for_window [class=".*"] border pixel 3 
 gaps outer 0
-gaps inner 8 
+gaps inner 4 
 smart_gaps on
 smart_borders on
 
-client.focused          #4c7899 #285577 #ffffff #2e9ef4   #FF7276
+client.focused          #FF355E #FF355E #ffffff #2e9ef4
 
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 bar {
-		
-        	status_command i3status --config ~/.config/i3/.i3status.conf
 		i3bar_command i3bar --transparency
+        status_command i3status --config ~/.config/i3/.i3status.conf
 		position top
 		separator_symbol "⋆"
 		colors {
 			   background #101010dd
 		}
 }
+
+exec --no-startup-id xrandr --output HDMI-A-0 --auto --right-of eDPRR
diff --git a/.config/i3/config~ b/.config/i3/config~
deleted file mode 100644
index d1648b2..0000000
--- a/.config/i3/config~
+++ /dev/null
@@ -1,219 +0,0 @@
-# This file has been auto-generated by i3-config-wizard(1).
-# It will not be overwritten, so edit it as you like.
-#
-# Should you change your keyboard layout some time, delete
-# this file and re-run i3-config-wizard(1).
-#
-
-# i3 config file (v4)
-#
-# Please see https://i3wm.org/docs/userguide.html for a complete reference!
-
-set $mod Mod4
-
-# Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below.
-#font pango:monospace 10
-
-# This font is widely installed, provides lots of unicode glyphs, right-to-left
-# text rendering and scalability on retina/hidpi displays (thanks to pango).
-font pango:DejaVu Sans Mono 10
-
-# The combination of xss-lock, nm-applet and pactl is a popular choice, so
-# they are included here as an example. Modify as you see fit.
-
-# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
-# screen before suspend. Use loginctl lock-session to lock your screen.
-exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
-
-# NetworkManager is the most popular way to manage wireless networks on Linux,
-# and nm-applet is a desktop environment-independent system tray GUI for it.
-exec --no-startup-id nm-applet
-
-# Use pactl to adjust volume in PulseAudio.
-set $refresh_i3status killall -SIGUSR1 i3status
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5% && $refresh_i3status
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5% && $refresh_i3status
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
-bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
-
-# Use Mouse+$mod to drag floating windows to their wanted position
-floating_modifier $mod
-
-# start a terminal
-bindsym $mod+Return exec konsole
-
-# kill focused window
-bindsym $mod+Shift+q kill
-
-# start dmenu (a program launcher)
-bindsym $mod+d exec --no-startup-id dmenu_run
-# A more modern dmenu replacement is rofi:
-# bindcode $mod+40 exec "rofi -modi drun,run -show drun"
-# There also is i3-dmenu-desktop which only displays applications shipping a
-# .desktop file. It is a wrapper around dmenu, so you need that installed.
-# bindcode $mod+40 exec --no-startup-id i3-dmenu-desktop
-
-# change focus
-bindsym $mod+j focus left
-bindsym $mod+k focus down
-bindsym $mod+l focus up
-bindsym $mod+semicolon focus right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
-
-# move focused window
-bindsym $mod+Shift+j move left
-bindsym $mod+Shift+k move down
-bindsym $mod+Shift+l move up
-bindsym $mod+Shift+semicolon move right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
-
-# split in horizontal orientation
-bindsym $mod+h split h
-
-# split in vertical orientation
-bindsym $mod+v split v
-
-# enter fullscreen mode for the focused container
-bindsym $mod+f fullscreen toggle
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym $mod+s layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+e layout toggle split
-
-# toggle tiling / floating
-bindsym $mod+Shift+space floating toggle
-
-# change focus between tiling / floating windows
-bindsym $mod+space focus mode_toggle
-
-# focus the parent container
-bindsym $mod+a focus parent
-
-# focus the child container
-#bindsym $mod+d focus child
-
-# Define names for default workspaces for which we configure key bindings later on.
-# We use variables to avoid repeating the names in multiple places.
-set $ws1 "1"
-set $ws2 "2"
-set $ws3 "3"
-set $ws4 "4"
-set $ws5 "5"
-set $ws6 "6"
-set $ws7 "7"
-set $ws8 "8"
-set $ws9 "9"
-set $ws10 "10"
-
-# switch to workspace
-bindsym $mod+1 workspace number $ws1
-bindsym $mod+2 workspace number $ws2
-bindsym $mod+3 workspace number $ws3
-bindsym $mod+4 workspace number $ws4
-bindsym $mod+5 workspace number $ws5
-bindsym $mod+6 workspace number $ws6
-bindsym $mod+7 workspace number $ws7
-bindsym $mod+8 workspace number $ws8
-bindsym $mod+9 workspace number $ws9
-bindsym $mod+0 workspace number $ws10
-
-# move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace number $ws1
-bindsym $mod+Shift+2 move container to workspace number $ws2
-bindsym $mod+Shift+3 move container to workspace number $ws3
-bindsym $mod+Shift+4 move container to workspace number $ws4
-bindsym $mod+Shift+5 move container to workspace number $ws5
-bindsym $mod+Shift+6 move container to workspace number $ws6
-bindsym $mod+Shift+7 move container to workspace number $ws7
-bindsym $mod+Shift+8 move container to workspace number $ws8
-bindsym $mod+Shift+9 move container to workspace number $ws9
-bindsym $mod+Shift+0 move container to workspace number $ws10
-
-# reload the configuration file
-bindsym $mod+Shift+c reload
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+r restart
-# exit i3 (logs you out of your X session)
-
-set $mode_system System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown
-mode "$mode_system" {
-    bindsym l exec --no-startup-id i3exit lock, mode "default"
-    bindsym e exec --no-startup-id i3exit logout, mode "default"
-    bindsym s exec --no-startup-id i3exit suspend, mode "default"
-    bindsym h exec --no-startup-id i3exit hibernate, mode "default"
-    bindsym r exec --no-startup-id i3exit reboot, mode "default"
-    bindsym Shift+s exec --no-startup-id i3exit shutdown, mode "default"
-
-    # back to normal: Enter or Escape
-    bindsym Return mode "default"
-    bindsym Escape mode "default"
-}
-
-bindsym $mod+Shift+e mode "$mode_system"
-
-# resize window (you can also use the mouse for that)
-mode "resize" {
-        # These bindings trigger as soon as you enter the resize mode
-
-        # Pressing left will shrink the window’s width.
-        # Pressing right will grow the window’s width.
-        # Pressing up will shrink the window’s height.
-        # Pressing down will grow the window’s height.
-        bindsym j resize shrink width 10 px or 10 ppt
-        bindsym k resize grow height 10 px or 10 ppt
-        bindsym l resize shrink height 10 px or 10 ppt
-        bindsym semicolon resize grow width 10 px or 10 ppt
-
-        # same bindings, but for the arrow keys
-        bindsym Left resize shrink width 10 px or 10 ppt
-        bindsym Down resize grow height 10 px or 10 ppt
-        bindsym Up resize shrink height 10 px or 10 ppt
-        bindsym Right resize grow width 10 px or 10 ppt
-
-        # back to normal: Enter or Escape or $mod+r
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-        bindsym $mod+r mode "default"
-}
-
-bindsym $mod+r mode "resize"
-
-# Custom
-bindsym $mod+Shift+s "exec --no-startup-id maim -s | xclip -selection clipboard -target image/png"
-bindsym $mod+Shift+w "exec --no-startup-id brave"
-bindsym $mod+Shift+t "exec --no-startup-id deepin-screen-recorder"
-bindsym $mod+Shift+p "exec --no-startup-id keepass"
-bindsym $mod+Shift+m "exec --no-startup-id monero-wallet-gui"
-
-for_window [class=".*"] border pixel 1
-gaps outer 0
-gaps inner 4
-smart_gaps on
-smart_borders on
-
-client.focused          #4c7899 #285577 #ffffff #2e9ef4   #FF7276
-
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-bar {
-		
-        	status_command i3status --config ~/.config/i3/.i3status.conf
-		i3bar_command i3bar --transparency
-		position top
-		separator_symbol "⋆"
-		colors {
-			   background #101010dd
-		}
-}
diff --git a/.config/i3/run_i3_status.sh b/.config/i3/run_i3_status.sh
deleted file mode 100755
index 31933e2..0000000
--- a/.config/i3/run_i3_status.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# shell script to prepend i3status with more stuff
-
-i3status --config ~/.config/i3/.i3status.conf | while :
-do
-    read line
-	WEATHER=$(sh /usr/bin/i3weather.sh)
-	echo "$line" || exit 1
-done
diff --git a/.config/i3/run_i3_status.sh~ b/.config/i3/run_i3_status.sh~
deleted file mode 100644
index a7bbaa7..0000000
--- a/.config/i3/run_i3_status.sh~
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# shell script to prepend i3status with more stuff
-
-i3status | while :
-do
-        read line
-        echo "mystuff | $line" || exit 1
-done
diff --git a/.config/i3/workspace-1.json b/.config/i3/workspace-1.json
deleted file mode 100644
index c5bfffb..0000000
--- a/.config/i3/workspace-1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-// vim:ts=4:sw=4:et
-{
-    "border": "pixel",
-    "current_border_width": 3,
-    "floating": "auto_off",
-    "geometry": {
-       "height": 1005,
-       "width": 1000,
-       "x": 0,
-       "y": 0
-    },
-    "marks": [],
-    "name": "i3: Layout saving in i3 — Mozilla Firefox",
-    "percent": 0.5,
-    "type": "con"
-}
-
-{
-    // splitv split container with 2 children
-    "border": "normal",
-    "floating": "auto_off",
-    "layout": "splitv",
-    "marks": [],
-    "percent": 0.5,
-    "type": "con",
-    "nodes": [
-        {
-            "border": "pixel",
-            "current_border_width": 3,
-            "floating": "auto_off",
-            "geometry": {
-               "height": 1033,
-               "width": 621,
-               "x": 1285,
-               "y": 14
-            },
-            "marks": [],
-            "name": "~ : bash — Konsole",
-            "percent": 0.5,
-            "type": "con"
-        },
-        {
-            "border": "pixel",
-            "current_border_width": 3,
-            "floating": "auto_off",
-            "geometry": {
-               "height": 639,
-               "width": 672,
-               "x": 0,
-               "y": 0
-            },
-            "marks": [],
-            "name": "emacs@Manjaro",
-            "percent": 0.5,
-            "type": "con"
-        }
-    ]
-}
-
diff --git a/.config/i3/workspace-1.json~ b/.config/i3/workspace-1.json~
deleted file mode 100644
index 355a065..0000000
--- a/.config/i3/workspace-1.json~
+++ /dev/null
@@ -1,82 +0,0 @@
-// vim:ts=4:sw=4:et
-{
-    "border": "pixel",
-    "current_border_width": 3,
-    "floating": "auto_off",
-    "geometry": {
-       "height": 1005,
-       "width": 1000,
-       "x": 0,
-       "y": 0
-    },
-    "marks": [],
-    "name": "i3: Layout saving in i3 — Mozilla Firefox",
-    "percent": 0.5,
-    "swallows": [
-       {
-       // "class": "^firefox$",
-       // "instance": "^Navigator$",
-       // "title": "^i3\\:\\ Layout\\ saving\\ in\\ i3\\ \\—\\ Mozilla\\ Firefox$",
-       // "window_role": "^browser$"
-       }
-    ],
-    "type": "con"
-}
-
-{
-    // splitv split container with 2 children
-    "border": "normal",
-    "floating": "auto_off",
-    "layout": "splitv",
-    "marks": [],
-    "percent": 0.5,
-    "type": "con",
-    "nodes": [
-        {
-            "border": "pixel",
-            "current_border_width": 3,
-            "floating": "auto_off",
-            "geometry": {
-               "height": 1033,
-               "width": 621,
-               "x": 1285,
-               "y": 14
-            },
-            "marks": [],
-            "name": "~ : bash — Konsole",
-            "percent": 0.5,
-            "swallows": [
-               {
-               // "class": "^konsole$",
-               // "instance": "^konsole$",
-               // "title": "^\\~\\ \\:\\ bash\\ \\—\\ Konsole$",
-               // "window_role": "^MainWindow\\#1$"
-               }
-            ],
-            "type": "con"
-        },
-        {
-            "border": "pixel",
-            "current_border_width": 3,
-            "floating": "auto_off",
-            "geometry": {
-               "height": 639,
-               "width": 672,
-               "x": 0,
-               "y": 0
-            },
-            "marks": [],
-            "name": "emacs@Manjaro",
-            "percent": 0.5,
-            "swallows": [
-               {
-               // "class": "^Emacs$",
-               // "instance": "^emacs$",
-               // "title": "^emacs\\@Manjaro$"
-               }
-            ],
-            "type": "con"
-        }
-    ]
-}
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3fc352e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.~
\ No newline at end of file