update

dot_config/aerc/aerc.conf

@@ -1,3 +1,6 @@
+[compose]
+editor=nvim
+
 [filters]
 subject,~^\[PATCH=awk -f /usr/share/aerc/filters/hldiff
 text/*=awk -f /usr/share/aerc/filters/plaintext

dot_config/nvim/coc-settings.json

@@ -1,4 +1,20 @@
 {
-	"python.jediEnabled": false
+	"python.jediEnabled": false,
+	"languageserver": {
+		"ocaml": {
+			"command": "opam",
+			"args": [
+				"config",
+				"exec",
+				"--",
+				"ocaml-language-server",
+				"--stdio"
+			],
+			"filetypes": [
+				"ocaml",
+				"reason"
+			]
+		}
+	}
 }
 

dot_config/nvim/coc.vim

@@ -16,6 +16,8 @@ function! s:show_documentation()
   endif
 endfunction
 
+command! -nargs=0 Format :call CocAction('format')
+
 " Binds
 nnoremap <silent> K :call <SID>show_documentation()<CR>
 nnoremap <silent> <space>a  :<C-u>CocList diagnostics<cr>

dot_config/nvim/init.vim

@@ -46,6 +46,9 @@ set cursorline
 set hidden
 set modeline
 set modelines=5
+set tabstop=4
+set shiftwidth=4
+set expandtab
 
 syntax on
 filetype on
@@ -61,6 +64,7 @@ imap kj <Esc>
 imap ;; <Esc>:w<CR>i
 
 nmap <F8> :TagbarToggle<CR>
+nmap ;; :w<CR> 
 
 " let g:LanguageClient_serverCommands = {
 "     \ 'rust': ['rust-analyzer'],

dot_config/sway/config

@@ -7,6 +7,7 @@ for_window [class=".*"] opacity $opacity
 for_window [app_id=".*"] opacity $opacity
 
 # STARTUP
+exec --no-startup-id swaybg --image /home/michael/Pictures/celeste-wallpaper.jpg
 exec --no-startup-id mpd
 exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
 exec --no-startup-id waybar

dot_config/waybar/config

@@ -8,16 +8,32 @@
 	"modules-right": ["mpd", "disk", "network", "pulseaudio", "clock", "tray"],
 
 	"disk": {
-		"format": "DISK: {percentage_free}%"
+		"format": "💽{percentage_free}%"
 	},
 
 	"clock": {
-		"format": "{:%m-%d / %H:%M}",
+		"format": "📅 <b>{:%m-%d / %H:%M}</b>",
 		"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
 	},
 
+    "network": {
+        "format-ethernet": "🖥️ {ifname}: {ipaddr}/{cidr}",
+        "format-wifi": " {essid} ({signalStrength}%)"
+    },
+
 	"pulseaudio": {
-		"format": "VOL {volume}%",
+        "format": "{icon} {volume}%",
+        "format-bluetooth": "{icon} {volume}%",
+        "format-muted": "",
+        "format-icons": {
+            "headphones": "",
+            "handsfree": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": ["", ""]
+        },
 		"on-click": "pavucontrol"
 	}
 }

dot_config/waybar/style.css

@@ -0,0 +1,33 @@
+* {
+    border: none;
+    border-radius: 0;
+    font-family: Roboto, Helvetica, Arial, sans-serif;
+    font-size: 13px;
+    min-height: 0;
+}
+
+window#waybar {
+    background: -gtk-gradient(
+        linear,
+        left bottom,
+        left top,
+        from(rgba(0, 0, 0, 0.9)),
+        to(rgba(0, 0, 0, 0.6))
+    );
+}
+
+#workspaces button {
+    padding: 0 5px;
+    border-bottom: 2px solid transparent;
+    background: transparent;
+}
+
+#workspaces button.focused {
+    border-bottom: 2px solid white;
+}
+
+#clock, #battery, #cpu, #memory, #network, #pulseaudio, #custom-spotify, #tray, #mode {
+    padding: 0 3px;
+    margin: 0 2px;
+}
+

dot_local/scripts/executable_passmenu.sh

@@ -17,8 +17,6 @@ password=$(printf '%s\n' "${password_files[@]}" | rofi -dmenu -levenshtein-sort
 
 [[ -n $password ]] || exit
 
-if [[ $typeit -eq 0 ]]; then
+pass show -c1 "$password" 2>/dev/null
-	pass show -c "$password" 2>/dev/null
+xclip -o -sel clip | wl-copy
-else
+
-	xdotool - <<<"type --clearmodifiers -- $(pass show "$password" | head -n 1)"
-fi

dot_pam_environment

@@ -0,0 +1,2 @@
+SSH_AGENT_PID   DEFAULT=
+SSH_AUTH_SOCK   DEFAULT="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"

dot_zshrc

@@ -20,11 +20,17 @@ export PATH="$HOME/.local/scripts:$HOME/.dotnet/tools:$PATH:$HOME/go/bin"
 [[ -s /home/michael/.autojump/etc/profile.d/autojump.sh ]] && source /home/michael/.autojump/etc/profile.d/autojump.sh
 autoload -U compinit && compinit -u
 
-
 # opam configuration
 test -r /home/michael/.opam/opam-init/init.zsh && . /home/michael/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true
 
+# ssh
+unset SSH_AGENT_PID
+if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+	export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+fi
+
 # aliases
+alias subl="nvim"
 alias rm="garbage put"
 alias cm="chezmoi"
 alias jrnl=" jrnl"

private_dot_gnupg/gpg-agent.conf

@@ -0,0 +1,3 @@
+enable-ssh-support
+pinentry-program /usr/bin/pinentry-qt
+