Merge branch 'main' of ssh://git.zacke.dev:222/wholteza/dotfiles

.bashrc

@@ -117,9 +117,9 @@ fi
 
 ## Modified by me
 ### Start tmux if not already in a session
-if [[ -z "$TMUX" ]]; then
-  tmux attach || tmux new
-fi
+# if [[ -z "$TMUX" ]]; then
+#   tmux attach || tmux new
+# fi
 ### GPG and SSH agent configurations for yubikey
 # This is now disabled since i use bw
 #export GPG_TTY="$(tty)"

.config/nvim/init.lua

@@ -2,7 +2,9 @@
 vim.o.number = true         -- Show line numbers
 vim.o.wrap = true           -- Soft-wrap lines
 vim.o.tabstop = 2           -- 2 space tab width
+vim.o.tabstop = 2           -- Same as above
 vim.o.shiftwidth = 2        -- 2 space tab width
+vim.o.expandtab = true      -- 2 space tab width
 vim.o.swapfile = false      -- Disable swap files (annoying)
 vim.o.undofile = true       -- Enable undo between sessions
 vim.o.mouse = 'a'           -- Enable mouse support

.config/oh-my-posh/theme.omp.json

@@ -1,92 +1,45 @@
 {
   "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
   "palette": {
-    "base": "#1E1E2E",
-    "blue": "#89B4FA",
-    "crust": "#11111B",
-    "docker": "p:sky",
-    "false": "p:red",
-    "flamingo": "#F2CDCD",
-    "git": "p:lavender",
-    "go": "p:mauve",
-    "green": "#A6E3A1",
-    "haskell": "p:mauve",
-    "julia": "p:mauve",
-    "lavender": "#B4BEFE",
-    "lua": "p:mauve",
-    "mantle": "#181825",
-    "maroon": "#EBA0AC",
-    "mauve": "#CBA6F7",
-    "os-bg": "p:overlay1",
-    "os-fg": "p:base",
-    "overlay0": "#6C7086",
-    "overlay1": "#7F849C",
-    "overlay2": "#9399B2",
-    "path": "p:yellow",
-    "peach": "#FAB387",
-    "pink": "#F5C2E7",
-    "python": "p:mauve",
-    "red": "#F38BA8",
-    "root-bg": "p:yellow",
-    "root-fg": "p:base",
-    "rosewater": "#F5E0DC",
-    "rust": "p:mauve",
-    "sapphire": "#74C7EC",
-    "sky": "#89DCEB",
-    "subtext0": "#A6ADC8",
-    "subtext1": "#BAC2DE",
-    "surface0": "#313244",
-    "surface1": "#45475A",
-    "surface2": "#585B70",
-    "teal": "#94E2D5",
-    "text": "#CDD6F4",
-    "time": "p:overlay1",
-    "true": "p:green",
-    "yellow": "#F9E2AF"
+    "os": "#ACB0BE",
+    "closer": "p:os",
+    "pink": "#F4B8E4",
+    "lavender": "#BABBF1",
+    "blue": "#8CAAEE"
   },
-  "transient_prompt": {
-    "template": "{{ now | date \"15:04:05\" }} {{ if gt .Code 0 }}<p:false>❯</>{{ else }}<p:true>❯</>{{ end }} ",
-    "foreground": "p:time"
-  },
-  "console_title_template": "{{ .Shell }} in {{ .PWD }}",
   "blocks": [
     {
-      "type": "prompt",
       "alignment": "left",
       "segments": [
         {
-          "properties": {
-            "cache_duration": "none",
-            "windows": "\ue70f"
-          },
-          "trailing_diamond": "\ue0b0",
+          "foreground": "p:os",
+          "style": "plain",
           "template": "{{.Icon}} ",
-          "foreground": "p:os-fg",
-          "background": "p:os-bg",
-          "type": "os",
-          "style": "diamond",
-          "foreground_templates": ["{{ if .Root }}p:root-fg{{ end }}"],
-          "background_templates": ["{{ if .Root }}p:root-bg{{ end }}"]
+          "type": "os"
         },
         {
+          "foreground": "p:blue",
+          "style": "plain",
+          "template": "{{ .UserName }} ",
+          "type": "session"
+        },
+        {
+          "foreground": "p:pink",
           "properties": {
-            "cache_duration": "none",
-            "folder_icon": "..",
+            "folder_icon": "..\ue5fe..",
             "home_icon": "~",
             "style": "agnoster_short"
           },
+          "style": "plain",
           "template": "{{ .Path }} ",
-          "foreground": "p:path",
-          "type": "path",
-          "style": "plain"
+          "type": "path"
         },
         {
+          "foreground": "p:lavender",
           "properties": {
             "branch_icon": "\ue725 ",
-            "cache_duration": "none",
             "cherry_pick_icon": "\ue29b ",
             "commit_icon": "\uf417 ",
-            "fetch_stash_count": false,
             "fetch_status": false,
             "fetch_upstream_icon": false,
             "merge_icon": "\ue727 ",
@@ -96,109 +49,39 @@
             "tag_icon": "\uf412 "
           },
           "template": "{{ .HEAD }} ",
-          "foreground": "p:git",
-          "type": "git",
-          "style": "plain"
-        },
-        {
-          "properties": {
-            "cache_duration": "none"
-          },
-          "template": "\uf308 {{ .Context }} ",
-          "foreground": "p:docker",
-          "type": "docker",
-          "style": "plain"
-        },
-        {
-          "properties": {
-            "cache_duration": "none"
-          },
-          "template": "\ue627 {{ if not .Error }}{{ .Full }}{{ end }} ",
-          "foreground": "p:go",
-          "type": "go",
-          "style": "plain"
-        },
-        {
-          "properties": {
-            "cache_duration": "none"
-          },
-          "template": "\ue61f {{ if not .Error }}{{ .Full }}{{ end }} ",
-          "foreground": "p:haskell",
-          "type": "haskell",
-          "style": "plain"
-        },
-        {
-          "properties": {
-            "cache_duration": "none"
-          },
-          "template": "\ue624 {{ if not .Error }}{{ .Full }}{{ end }} ",
-          "foreground": "p:julia",
-          "type": "julia",
-          "style": "plain"
-        },
-        {
-          "properties": {
-            "cache_duration": "none"
-          },
-          "template": "\ue620 {{ if not .Error }}{{ .Full }}{{ end }} ",
-          "foreground": "p:lua",
-          "type": "lua",
-          "style": "plain"
-        },
-        {
-          "properties": {
-            "cache_duration": "none",
-            "display_default": false,
-            "display_mode": "context"
-          },
-          "template": "\ue73c {{ if not .Error }}{{ if .Venv }}venv/{{ end }}{{ .Full }}{{ end }} ",
-          "foreground": "p:python",
-          "type": "python",
-          "style": "plain"
-        },
-        {
-          "properties": {
-            "cache_duration": "none"
-          },
-          "template": "\ue7a8 {{ if not .Error }}{{ .Full }}{{ end }} ",
-          "foreground": "p:rust",
-          "type": "rust",
-          "style": "plain"
-        },
-        {
-          "properties": {
-            "cache_duration": "none",
-            "style": "austin",
-            "threshold": 500
-          },
-          "template": "\udb81\udd1f {{ .FormattedMs }} ",
-          "foreground": "p:true",
-          "type": "executiontime",
           "style": "plain",
-          "foreground_templates": ["{{ if .Code }}p:false{{ end }}"]
+          "type": "git"
+        },
+        {
+          "background": "#FFDE57",
+          "foreground": "#111111",
+          "powerline_symbol": "\ue0b0",
+          "properties": {
+            "display_mode": "environment",
+            "fetch_virtual_env": true,
+            "home_enabled": true
+          },
+          "style": "plain",
+          "template": " \ue235 {{ if .Venv }}({{ .Venv }}){{ end }} ",
+          "type": "python"
         }
       ],
-      "newline": true
+      "type": "prompt"
     },
     {
-      "type": "prompt",
       "alignment": "left",
       "segments": [
         {
-          "properties": {
-            "always_enabled": true,
-            "cache_duration": "none"
-          },
-          "template": "❯ ",
-          "foreground": "p:true",
-          "type": "status",
           "style": "plain",
-          "foreground_templates": ["{{ if gt .Code 0 }}p:false{{ end }}"]
+          "foreground": "p:closer",
+          "template": "\uf105",
+          "type": "text"
         }
       ],
+      "type": "prompt",
       "newline": true
     }
   ],
-  "version": 3,
-  "shell_integration": true
+  "final_space": true,
+  "version": 3
 }

.config/sway/autostart

@@ -13,3 +13,4 @@ exec swayidle -w \
 ## Start XDG autostart .desktop files using dex. See also
 ### https://wiki.archlinux.org/index.php/XDG_Autostart
 exec --no-startup-id dex --autostart --environment i3
+exec --no-startup-id tailscale systray

.config/sway/keybinds

@@ -3,7 +3,8 @@
 floating_modifier $mod
 
 ## Start a terminal
-bindsym $mod+Return exec alacritty --config-file /home/wholteza/.config/alacritty/alacritty.toml
+# bindsym $mod+Return exec alacritty --config-file /home/wholteza/.config/alacritty/alacritty.toml
+bindsym $mod+Return exec wezterm
 
 ## Kill focused window
 bindsym $mod+Shift+q kill

.config/sway/window

@@ -13,6 +13,7 @@ for_window [title="Bitwarden"] resize set width 500 px height 700 px
 for_window [title="Extension.*"] floating enable
 for_window [title="Extension.*"] resize set width 500 px height 700 px
 for_window [title="Alacritty"] border none
+for_window [app_id="org.wezfurlong.wezterm"] border none
 for_window [title=".*Mozilla Firefox"] border none
 for_window [title=".*LibreWolf"] border none
 for_window [title="Bolt Launcher"] floating enable