Big bundle of changes!

12 files changed, 84 insertions, 16 deletions

diff --git a/Xresources b/Xresources
index ccb0445..e03056b 100644
--- a/Xresources
+++ b/Xresources
@@ -13,7 +13,6 @@
 /* xterm*faceName: terminus-16 */
 /* xterm*font: terminus-18 */
 /* xterm*faceName:  Hack Nerd Font Mono */
-xterm*faceSize: 14
 XTerm*cursorBlink: false
 XTerm*blinkAsBold: false
 /* XTerm*colorMode: false */
@@ -21,15 +20,18 @@ XTerm*dynamicColors: false
 XTerm*colorBDMode: false
 XTerm*colorULMode: false
 /* XTerm*cursorColor: black */
-/* xterm*boldFont: terminus-16 */
+! xterm*boldFont: terminus-14
 /* xterm*faceName: Hack Nerd Font */
 xterm*faceName: Iosevka Nerd Font Mono
 /* xterm*faceName: Ubuntu Mono */
+! xterm*faceName: Terminus
+xterm*faceSize: 13
 /* xterm*faceName: "Jetbrains Mono Nerd Mono" */
 /* xterm*faceName: "Cascadia Code Nerd Font" */
 /* xterm*faceName: "Jetbrains Mono Nerd Font" */
 /* xterm*faceSize: 15 */
-xterm*vt100*geometry: 80x50
+/* xterm*vt100*geometry: 80x50 */
+XTerm*geometry: 120x30
 /* xterm*background: black */
 /* xterm*foreground: white */
 XTerm*allowBoldFonts: false
diff --git a/bash_profile b/bash_profile
index 9f5935f..333d0a0 100644
--- a/bash_profile
+++ b/bash_profile
@@ -21,3 +21,5 @@ xset r rate 300 30
 # perlbrew
 source ~/perl5/perlbrew/etc/bashrc
 . "$HOME/.cargo/env"
+
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
diff --git a/bashrc b/bashrc
index dea681b..f009467 100644
--- a/bashrc
+++ b/bashrc
@@ -22,13 +22,12 @@ export HISTCONTROL=ignoreboth:erasedups
 export HISTSIZE=20000
 export HISTFILESIZE=200000
 
-
 # Setting PATH
 export PATH=~/.cargo/bin:$PATH
 export PATH=~/bin/:$PATH
-export PATH="$HOME/gems/bin:$PATH"
+export PATH="$PATH:/opt/nvim-linux64/bin"
+#export PATH="$HOME/gems/bin:$PATH"
 export PATH="$HOME/go/bin:$PATH"
-export PATH="$HOME/.local/share/gem/ruby/3.0.0/bin:$PATH"
 export PATH="$HOME/.local/bin:$PATH"
 export PATH="/usr/local/go/bin:$PATH"
 export BORG_PASSCOMMAND='pass show borg-passphrase'
@@ -322,7 +321,6 @@ append_to_masterlist() {
 # Colors for ls - yellow directories
 # export LS_COLORS="$LS_COLORS:di=1;33"
 # Install Ruby Gems to ~/gems
-export GEM_HOME="$HOME/gems"
 
 
 # note() {
@@ -375,3 +373,6 @@ ytmp3-split-to-chapters() {
 . "$HOME/.cargo/env"
 
 eval "$(direnv hook bash)"
+
+# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
+export PATH="$PATH:$HOME/.rvm/bin"
diff --git a/cursor_settings.json b/cursor_settings.json
index a13c272..9e14bf0 100644
--- a/cursor_settings.json
+++ b/cursor_settings.json
@@ -18,6 +18,7 @@
         "workbench.action.navigateUp"
     ],
     "editor.fontWeight": "normal",
+    "workbench.activityBar.orientation": "vertical",
     "terminal.external.linuxExec": "urxvt",
     "git.confirmNoVerifyCommit": false,
     "extensions.ignoreRecommendations": true,
@@ -33,5 +34,6 @@
     "cursor.cpp.disabledLanguages": [
         "plaintext",
         "markdown"
-    ]
+    ],
+    "git.confirmSync": false
 }
\ No newline at end of file
diff --git a/gpg-agent.conf b/gpg-agent.conf
index 8a21424..7caa178 100644
--- a/gpg-agent.conf
+++ b/gpg-agent.conf
@@ -8,7 +8,7 @@ default-cache-ttl 3600
 max-cache-ttl 3600
 #pinentry-program /usr/local/bin/pinentry
 #pinentry-program /usr/bin/pinentry-gtk
-pinentry-program /usr/bin/pinentry-gtk-2
+pinentry-program /usr/bin/pinentry
 allow-loopback-pinentry
 pinentry-timeout 600
 log-file $HOME/.gnupg/gpg-agent.log
diff --git a/i3-config b/i3-config
index c05afb8..f3fb496 100644
--- a/i3-config
+++ b/i3-config
@@ -95,6 +95,7 @@ exec --no-startup-id xset r rate 300 30
 exec --no-startup-id setxkbmap -option ctrl:nocaps
 exec --no-startup-id setxkbmap -layout gb
 exec --no-startup-id /usr/bin/keepassxc
+exec --no-startup-id dbus-launch --exit-with-session
 #means laptop lid closure will kill suspend the laptop so switched off for now
 
 # scratchpad
diff --git a/i3status_config b/i3status_config
index 598079c..ed64fbe 100644
--- a/i3status_config
+++ b/i3status_config
@@ -11,10 +11,19 @@ general {
         interval = 5
 }
 
+
+
+order += "ethernet br0"
+ethernet br0 {
+    format_up = "E: br0: %ip"
+    format_down = " br0 down"
+}
+
 # order += "ipv6"
-order += "wireless _first_"
-order += "ethernet _first_"
-order += "battery all"
+#order += "wireless _first_"
+order += "ethernet"
+#order += "ethernet _first_"
+#order += "battery all"
 # order += "disk /"
 # order += "load"
 order += "memory"
diff --git a/mpv/mpv.conf b/mpv/mpv.conf
index a240759..28860aa 100644
--- a/mpv/mpv.conf
+++ b/mpv/mpv.conf
@@ -10,4 +10,4 @@ audio-channels=2
 save-position-on-quit=yes
 #ytdl-format=bestvideo[height <= 1080]+bestaudio/best
 ytdl-format="bestvideo[height<=?1080]+bestaudio/best"
-script-opts-append=ytdl_hook-ytdl_path=/usr/bin/yt-dlp
+script-opts-append=ytdl_hook-ytdl_path=/home/lemon/.local/bin/yt-dlp
diff --git a/redshift.conf b/redshift.conf
new file mode 100644
index 0000000..044c3f1
--- /dev/null
+++ b/redshift.conf
@@ -0,0 +1,5 @@
+[redshift]
+location-provider=manual
+[manual]
+lat=55.770
+lon=2.00
diff --git a/vim/vimrc b/vim/vimrc
index 53f677d..9214005 120000
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1 +1 @@
-min-vim
\ No newline at end of file
+vimrc-sept24
\ No newline at end of file
diff --git a/zed/keymap.json b/zed/keymap.json
index 591ab50..51f7ee4 100644
--- a/zed/keymap.json
+++ b/zed/keymap.json
@@ -5,12 +5,50 @@
 //
 // To see the default key bindings run `zed: open default keymap`
 // from the command palette.
+//
+// For vim docs see: https://zed.dev/docs/vim
 [
   {
+    "context": "VimControl && !menu",
+    "bindings": {
+      // Put key bindings here if you want them to work in normal & visual mode.
+      // "ctrl-h": ["workspace::ActivatePaneInDirection", "Left"],
+      // "ctrl-l": ["workspace::ActivatePaneInDirection", "Right"],
+      "ctrl-k": ["workspace::ActivatePaneInDirection", "Up"],
+      "ctrl-j": ["workspace::ActivatePaneInDirection", "Down"],
+      "ctrl-l": "pane::ActivateNextItem",
+      "ctrl-h": "pane::ActivatePrevItem",
+      "ctrl-3": "tab_switcher::Toggle"
+    }
+  },
+  {
+    "context": "vim_mode == normal && !menu",
+    "bindings": {
+      // "shift-y": ["workspace::SendKeystrokes", "y $"] // Use neovim's yank behavior: yank to end of line.
+    }
+  },
+  {
+    "context": "vim_mode == insert",
+    "bindings": {
+      // "j k": "vim::NormalBefore" // In insert mode, make jk escape to normal mode.
+    }
+  },
+  {
+    "context": "EmptyPane || SharedScreen",
+    "bindings": {
+      // Put key bindings here (in addition to the context above) if you want them to
+      // work when no editor exists.
+      // "space f": "file_finder::Toggle"
+    }
+  },
+  {
     "context": "Workspace",
     "bindings": {
       // "shift shift": "file_finder::Toggle"
-      "alt-`": "workspace::ToggleBottomDock"
+      "alt-`": "workspace::ToggleBottomDock",
+      "alt-b": "workspace::ToggleLeftDock",
+      "alt-w": "pane::CloseActiveItem",
+      "alt-enter": "editor::ToggleCodeActions"
     }
   },
   {
diff --git a/zed/settings.json b/zed/settings.json
index 58c5898..b1f3346 100644
--- a/zed/settings.json
+++ b/zed/settings.json
@@ -6,6 +6,10 @@
 // custom settings, run `zed: open default settings` from the
 // command palette (cmd-shift-p / ctrl-shift-p)
 {
+  // Delete this duplicate telemetry section since it exists later in the file,
+  "tab_bar": {
+    "show": true
+  },
   "assistant": {
     "default_model": {
       "provider": "zed.dev",
@@ -13,6 +17,10 @@
     },
     "version": "2"
   },
+  "features": {
+    "inline_completion_provider": "supermaven",
+    "show_inline_completions": false
+  },
   "languages": {
     "Ruby": {
       "language_servers": [
@@ -55,6 +63,6 @@
   "theme": {
     "mode": "system",
     "light": "Rosé Pine",
-    "dark": "One Dark"
+    "dark": "Andromeda"
   }
 }