fix nvim version checks

Makefile

@@ -1,3 +1,48 @@
-.PHONY: apply
-apply:
-	stow --target=$${HOME} */
+QUBES_DIRS = qubes dom0
+ALL_DIRS = $(shell ls -d */ | sed 's#/##')
+GENERAL_DIRS = $(filter-out $(QUBES_DIRS), $(ALL_DIRS))
+
+.PHONY: all apply-general apply-qubes install-apt-essentials clean
+
+all: apply-general apply-qubes
+
+apply-general:
+	@echo "Applying general configurations..."
+	stow --target=$(HOME) $(GENERAL_DIRS)
+
+apply-qubes:
+	@echo "Applying Qubes configurations..."
+	sudo rm -rf /rw/config/rc.local
+	sudo stow --target=/ qubes
+
+install-apt-essentials:
+	sudo apt install \
+		tig \
+		htop \
+		tree \
+		ripgrep \
+		net-tools \
+		stow \
+		zsh \
+		rsync \
+		shellcheck \
+		pass \
+		make \
+		cmake \
+		ninja-build \
+		gettext \
+		curl \
+		build-essential \
+		jq \
+		wget \
+		lua5.4 \
+		luarocks \
+		git-lfs \
+		wormhole \
+		python3-venv \
+		-y
+
+clean:
+	@echo "Removing stowed configurations..."
+	stow -D --target=$(HOME) $(GENERAL_DIRS)
+	stow -D --target=\ qubes

README.md

@@ -0,0 +1,21 @@
+# Dotfiles a la Stow
+
+If starting on a new machine, begin by cloning this over https:
+```
+$ git clone https://git.distrust.co/anton/dotfiles
+```
+
+## Qubes
+
+The `dom0` files have to be copied over to `dom0` and placed into the correct location. To copy files over use the following command in a `dom0` terminal:
+
+```
+$ qvm-run -pass-io <app_vm> 'cat path/to/file' > /path/
+```
+
+### Split SSH
+Ensure that the `qubes-ssh-socket` service is enabled
+```
+systemctl --user enable --now qubes-ssh-socket
+systemctl --user status qubes-ssh-socket
+```

X/.Xresources

@@ -23,8 +23,8 @@
 *color11: #657b83
  
 !! blue dark/light
-*color4: #268bd2
-*color12: #839496
+*color4: #81a1c1
+*color12: #5fafff
  
 !! magenta dark/light
 *color5: #d33682

bash/.bashrc

@@ -0,0 +1,25 @@
+exec zsh
+
+# Source global definitions
+if [ -f /etc/bashrc ]; then
+    . /etc/bashrc
+fi
+
+# User specific environment
+if ! [[ "$PATH" =~ "$HOME/.local/bin:$HOME/bin:" ]]; then
+    PATH="$HOME/.local/bin:$HOME/bin:$PATH"
+fi
+export PATH
+
+# Uncomment the following line if you don't like systemctl's auto-paging feature:
+# export SYSTEMD_PAGER=
+
+# User specific aliases and functions
+if [ -d ~/.bashrc.d ]; then
+    for rc in ~/.bashrc.d/*; do
+        if [ -f "$rc" ]; then
+            . "$rc"
+        fi
+    done
+fi
+unset rc

dom0/etc/qubes/policy.d/50-ssh.policy

@@ -0,0 +1 @@
+ques.SshAgent * @anyvm @anym ask target=vault

git/.gitconfig

@@ -1,7 +1,7 @@
 [user]
-	email = lance@distrust.co
-	name = Lance R. Vick
-	signingKey = E90A401336C8AAA9
+	name = Anton Livaja
+	email = anton@livaja.me
+	signingKey = F4BF5C81EC78A5DD341C91EEDC4B7D1F52E0BA4D
 [push]
 	default = simple
 [color]

nvim/.config/nvim/init.lua

@@ -0,0 +1,9 @@
+require("config.lazy")
+vim.opt.number = true
+vim.opt.relativenumber = true
+vim.opt.ruler = true
+vim.opt.cursorline = true
+vim.opt.cursorcolumn = true
+vim.opt.colorcolumn = "80"
+vim.opt.statusline = "%l,%c"
+

nvim/.config/nvim/init.vim

@@ -1 +0,0 @@
-colorscheme lackluster-hack

nvim/.config/nvim/lazy-lock.json

@@ -0,0 +1,6 @@
+{
+  "editorconfig-vim": { "branch": "master", "commit": "91bd0b0a2c6a72a110ab9feae335e1224480c233" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
+  "nvim-treesitter": { "branch": "master", "commit": "2b0760dca2354fecf48ea35fdf1d753a232e3de2" },
+  "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }
+}

nvim/.config/nvim/lua/config/lazy.lua

@@ -0,0 +1,35 @@
+-- Bootstrap lazy.nvim
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
+  local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+  local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
+  if vim.v.shell_error ~= 0 then
+    vim.api.nvim_echo({
+      { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+      { out, "WarningMsg" },
+      { "\nPress any key to exit..." },
+    }, true, {})
+    vim.fn.getchar()
+    os.exit(1)
+  end
+end
+vim.opt.rtp:prepend(lazypath)
+
+-- Make sure to setup `mapleader` and `maplocalleader` before
+-- loading lazy.nvim so that mappings are correct.
+-- This is also a good place to setup other settings (vim.opt)
+vim.g.mapleader = " "
+vim.g.maplocalleader = "\\"
+
+-- Setup lazy.nvim
+require("lazy").setup({
+  spec = {
+    -- import your plugins
+    { import = "plugins" },
+  },
+  -- Configure any other settings here. See the documentation for more details.
+  -- colorscheme that will be used when installing plugins.
+  install = { colorscheme = { "habamax" } },
+  -- automatically check for plugin updates
+  checker = { enabled = true, notify = false },
+})

nvim/.config/nvim/lua/plugins/editorconfig.lua

@@ -0,0 +1,6 @@
+return {
+    "editorconfig/editorconfig-vim",
+    event = "BufReadPre",
+    lazy = false -- Load immediately to ensure `.editorconfig` rules apply
+}
+

nvim/.config/nvim/lua/plugins/theme.lua

@@ -0,0 +1,8 @@
+return {
+    "folke/tokyonight.nvim",
+    lazy = false,  -- Load at startup
+    priority = 1000,  -- Ensure it loads before everything else
+    config = function()
+        vim.cmd("colorscheme tokyonight")  -- Apply the theme
+    end
+}

nvim/.config/nvim/lua/plugins/treesitter.lua

@@ -0,0 +1,13 @@
+return {
+    "nvim-treesitter/nvim-treesitter",
+    build = ":TSUpdate",
+    event = { "BufReadPost", "BufNewFile" },
+    config = function()
+        require("nvim-treesitter.configs").setup({
+            ensure_installed = { "lua", "vim", "bash", "python", "javascript" }, -- Add needed languages
+            highlight = { enable = true },
+            indent = { enable = true },
+        })
+    end
+}
+

qubes/etc/docker/docker.daemon

@@ -0,0 +1,5 @@
+{
+  "features": {
+    "containerd-snapshotter": true
+  }
+}

qubes/rw/bind-dirs/etc/docker/docker.daemon

@@ -0,0 +1,5 @@
+{
+  "features": {
+    "containerd-snapshotter": true
+  }
+}

qubes/rw/bind-dirs/etc/systemd/user/qubes-ssh-socket.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Run a SSH proxy socket to another QubesOS VM
+
+[Service]
+Environment=SSH_VAULT_VM=vault
+ExecStart=%h/.local/bin/qubes-ssh-socket
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

qubes/rw/config/qubes-bind-dirs.d/50_user.conf

@@ -1,2 +1,3 @@
 binds+=('/var/lib/docker')
 binds+=('/var/lib/containerd')
+binds+=('/etc/systemd/user/qubes-ssh-socket.service')

qubes/rw/config/rc.local

@@ -0,0 +1,10 @@
+# SPLIT SSH CONFIGURATION >>>
+# replace "vault" with your AppVM name which stores the ssh private key(s)
+SSH_VAULT_VM="vault"
+
+if [ "$SSH_VAULT_VM" != "" ]; then
+  export SSH_SOCK="/home/user/.SSH_AGENT_$SSH_VAULT_VM"
+  rm -f "$SSH_SOCK"
+  sudo -u user /bin/sh -c "umask 177 && exec socat 'UNIX-LISTEN:$SSH_SOCK,fork' 'EXEC:qrexec-client-vm $SSH_VAULT_VM qubes.SshAgent'" &
+fi
+# <<< SPLIT SSH CONFIGURATION

qubes/rw/etc/systemd/user/qubes-ssh-socket.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Run a SSH proxy socket to another QubesOS VM
+
+[Service]
+Environment=SSH_VAULT_VM=vault
+ExecStart=%h/.local/bin/qubes-ssh-socket
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

tmux/.tmux.conf

@@ -5,3 +5,7 @@ run-shell "powerline-daemon -q"
 source "/usr/share/powerline/bindings/tmux/powerline.conf"
 
 # vim: ft=tmux
+
+# Fix coloring
+set-option -g default-terminal "xterm-256color"
+set-option -ga terminal-overrides ",xterm-256color:Tc"

zsh/.zshrc

@@ -5,7 +5,7 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]
   source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
 fi
 
-export DEFAULT_USER="lrvick"
+export DEFAULT_USER="anton"
 export DISABLE_AUTO_UPDATE="true"
 export COMPLETION_WAITING_DOTS="true"
 export HISTFILE=~/.zsh_history
@@ -20,3 +20,31 @@ source ~/.zsh/themes/powerlevel10k/powerlevel10k.zsh-theme
 
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
+
+# Aliases
+alias gib='git branch'
+alias gis='git status'
+alias gfa='git fetch -a'
+alias gpoh='git push origin HEAD'
+
+# Bindkeys
+bindkey '^R' history-incremental-search-backward  # ctrl + shift + r -> Reverse search
+bindkey '^A' beginning-of-line                    # ctrl + a -> Move to start of line
+bindkey '^E' end-of-line                          # ctrl + e -> Move to end of line
+bindkey '^[[1;5D' backward-word                   # ctrl + left arrow  -> Move back one word
+bindkey '^[[1;5C' forward-word                    # Ctrl + right arrow -> Move forward one word
+bindkey '\ed' kill-word
+
+# Color different file types
+export LS_COLORS='di=94:ln=36:so=35:pi=33:ex=32:bd=46;34:cd=46;34'
+alias ls='ls --color=auto'
+
+export GPG_TTY=$(tty)
+
+# SPLIT SSH CONFIGURATION >>>
+SSH_VAULT_VM="vault"
+
+if [ "$SSH_VAULT_VM" != "" ]; then
+  export SSH_AUTH_SOCK="/home/user/.SSH_AGENT_$SSH_VAULT_VM"
+fi
+# <<< SPLIT SSH CONFIGURATION