Updates

13 files changed, 98 insertions, 40 deletions

diff --git a/config/aerc/aerc.conf b/config/aerc/aerc.conf
index 73d4c08..26cfb7f 100644
--- a/config/aerc/aerc.conf
+++ b/config/aerc/aerc.conf
@@ -41,12 +41,11 @@
 # Set the $TERM environment variable used for the embedded terminal.
 #
 # Default: xterm-256color
-#term=xterm-256color
 
 # Display OSC8 strings in the embedded terminal
 #
 # Default: false
-#enable-osc8=false
+enable-osc8=true
 
 [ui]
 #
@@ -380,7 +379,6 @@ parse-http-links=true
 # Specifies the command to run the editor with. It will be shown in an embedded
 # terminal, though it may also launch a graphical window if the environment
 # supports it. Defaults to $EDITOR, or vi.
-editor=kak
 
 #
 # Default header fields to display when composing a message. To display
diff --git a/config/foot/foot.ini b/config/foot/foot.ini
index a9b2459..5100c7f 100644
--- a/config/foot/foot.ini
+++ b/config/foot/foot.ini
@@ -1,5 +1,5 @@
 pad=4x4
-font=Iosevka Term Curly:size=14
+font=Input Mono Condensed:size=14
 line-height=20
 underline-thickness=1px
 underline-offset=4px
diff --git a/config/kak/kakrc b/config/kak/kakrc
index cb7cad4..a2a95a7 100644
--- a/config/kak/kakrc
+++ b/config/kak/kakrc
@@ -27,9 +27,9 @@ hook global BufSetOption filetype=(javascript|typescript|elixir|haskell|rust|mar
     lsp-auto-signature-help-enable
 }
 
-hook global BufSetOption filetype=(terraform|ocaml|elixir|nix) %{
-    hook buffer BufWritePost .* %{lsp-formatting-sync}
-}
+#hook global BufSetOption filetype=(terraform|ocaml|elixir|nix) %{
+#    hook buffer BufWritePre .* %{lsp-formatting-sync}
+#}
 
 eval %sh{kak-lsp --kakoune -s $kak_session}
 lsp-enable
@@ -51,6 +51,7 @@ complete-command z shell-script-candidates %{ zoxide query -l  }
 
 
 # --- KEYMAPS
+map global user = ':lsp-formatting<ret>' -docstring "LSP Format"
 map global user w '|fmt --width 80<ret>' -docstring "Wrap to 80 columns"
 map global user l %{:enter-user-mode lsp<ret>} -docstring "LSP mode"
 map global insert <tab> '<a-;>:try lsp-snippets-select-next-placeholders catch %{ execute-keys -with-hooks <lt>tab> }<ret>' -docstring 'Select next snippet placeholder'
diff --git a/config/qutebrowser/autoconfig.yml b/config/qutebrowser/autoconfig.yml
index 1fc7ac8..27ebe22 100644
--- a/config/qutebrowser/autoconfig.yml
+++ b/config/qutebrowser/autoconfig.yml
@@ -83,12 +83,32 @@ settings:
     - bookmarks
     - history
     - filesystem
+  fonts.completion.category:
+    global: bold default_size terminus
+  fonts.completion.entry:
+    global: bold default_size terminus
+  fonts.debug_console:
+    global: bold default_size terminus
   fonts.default_family:
     global: Iosevka Aile
   fonts.default_size:
     global: 15pt
   fonts.downloads:
-    global: default_size default_family
+    global: bold default_size terminus
+  fonts.hints:
+    global: bold default_size terminus
+  fonts.keyhint:
+    global: bold default_size terminus
+  fonts.messages.error:
+    global: bold default_size terminus
+  fonts.prompts:
+    global: bold default_size terminus
+  fonts.statusbar:
+    global: bold default_size terminus
+  fonts.tabs.selected:
+    global: bold default_size terminus
+  fonts.tabs.unselected:
+    global: bold default_size terminus
   fonts.web.family.fixed:
     global: Iosevka Term Curly
   fonts.web.family.sans_serif:
@@ -106,7 +126,7 @@ settings:
   tabs.show:
     global: never
   tabs.tabs_are_windows:
-    global: false
+    global: true
   url.default_page:
     global: https://kagi.com
   url.searchengines:
diff --git a/config/qutebrowser/config.py b/config/qutebrowser/config.py
index 9023cb8..6a09781 100644
--- a/config/qutebrowser/config.py
+++ b/config/qutebrowser/config.py
@@ -1,3 +1,2 @@
 config.load_autoconfig()
 
-config.source('qutemacs.py')
diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc
index 8ccdf75..5cf6cbb 100644
--- a/config/waybar/config.jsonc
+++ b/config/waybar/config.jsonc
@@ -1,9 +1,10 @@
 // -*- mode: jsonc -*-
 {
     "layer": "bottom", // Waybar at top layer
-    "position": "right", // Waybar position (top|bottom|left|right)
+    "exclusive": false,
+    "position": "bottom", // Waybar position (top|bottom|left|right)
     // "width": 1280, // Waybar width
-    "spacing": 20, // Gaps between modules (4px)
+    "spacing": 2, // Gaps between modules (4px)
     // Choose the order of the modules
     "modules-right": [
         "pulseaudio",
@@ -13,6 +14,7 @@
         "clock"
     ],
    "clock": {
+        "format": "{:%m-%d %H:%M}",
         "format-alt": "{:%Y-%m-%d}"
     },
   "battery": {
@@ -21,11 +23,9 @@
             "warning": 30,
             "critical": 15
         },
-        "format": "{icon}",
-        "format-full": "{icon}",
-        "format-charging": "",
-        "format-plugged": "",
-        "format-alt": "{icon}",
+        "format": "BAT: {capacity}%",
+        "format-full": "BAT: 100%",
+        "format-charging": "BAT: {capacity}%",
         "format-icons": ["", "", "", "", ""]
     },
     "battery#bat2": {
@@ -33,7 +33,7 @@
     },
    "network": {
         // "interface": "wlp2*", // (Optional) To force the use of this interface
-        "format-wifi": "",
+        "format-wifi": "NET: {essid}",
         "format-ethernet": "{ipaddr}/{cidr} ",
         "tooltip-format": "{ifname} via {gwaddr} ",
         "format-linked": "{ifname} (No IP) ",
@@ -41,10 +41,10 @@
         "format-alt": "{ifname}: {ipaddr}/{cidr}"
     },
     "pulseaudio": {
-        "format": "{icon}",
-        "format-bluetooth": "{icon}",
-        "format-bluetooth-muted": "{icon}",
-        "format-muted": "",
+        "format": "AUD: {volume}%",
+        "format-bluetooth": "AUD: {volume}",
+        "format-bluetooth-muted": "AUD: MUTE",
+        "format-muted": "AUD: MUTE",
         "format-icons": {
             "headphone": "",
             "hands-free": "",
diff --git a/config/waybar/style.css b/config/waybar/style.css
index 5c84feb..e017c1a 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -1,6 +1,6 @@
 * {
     /* `otf-font-awesome` is required to be installed for icons */
-    font-family: Iosevka Aile;
+    font-family: Input Mono Compressed;
     font-size: 18px;
 }
 
@@ -69,13 +69,14 @@ button:hover {
 #scratchpad,
 #power-profiles-daemon,
 #mpd {
-    padding: 0 10px;
+    padding: 0 7px;
+    padding-bottom: 7px;
     color: #ffffff;
 }
 
 #window,
 #workspaces {
-    margin: 0 4px;
+    margin: 0 2px;
 }
 
 /* If workspaces is the leftmost module, omit left margin */
@@ -149,7 +150,6 @@ label:focus {
 
 
 #clock {
-  margin-bottom: 15px;
 }
 
 #disk {
diff --git a/cwmrc b/cwmrc
index d8fc165..d64ca29 100644
--- a/cwmrc
+++ b/cwmrc
@@ -24,7 +24,9 @@ bind-key 0-XF86AudioMute "pamixer -t"
 
 bind-mouse 4-3 window-resize
 bind-mouse 4-1 window-move
-bind-key 4-Return terminal
+bind-key 4-s menu-window 
+bind-key 4-Return "alacritty"
+bind-key 4-e "xterm +sb -e aerc "
 bind-key 4-q window-close
 bind-key 4-m window-fullscreen
 bind-key 4-l window-vtile
diff --git a/hooks/pre-up/2-nix b/hooks/pre-up/2-nix
index 0a457ee..0cb74ba 100755
--- a/hooks/pre-up/2-nix
+++ b/hooks/pre-up/2-nix
@@ -2,8 +2,8 @@
 
 if ! [ -x "$(command -v nix)" ]; then
   echo "Installing Nix"
-  sudo install -d -m755 -o $(id -u) -g $(id -g) /nix
+  doas install -d -m755 -o $(id -u) -g $(id -g) /nix
   curl -L https://nixos.org/nix/install | sh
-  nix profile install nixpkgs#nix-direnv
+  echo "Nix has been installed, you should run nix profile install nixpkgs#nix-direnv once profile has been refreshed"
 fi
 
diff --git a/kshrc b/kshrc
index 4db16c4..7271036 100644
--- a/kshrc
+++ b/kshrc
@@ -16,7 +16,5 @@ if [ -x "$(command -v opam)" ]; then
   eval $(opam env)
 fi
 
-acpi
-export TERM=xterm-256color
 eval "$(direnv export bash)"
 eval "$(zoxide init posix --hook prompt)"
diff --git a/local/bin/pfetch b/local/bin/pfetch
index 772cb70..4dbc80f 100755
--- a/local/bin/pfetch
+++ b/local/bin/pfetch
@@ -1017,7 +1017,7 @@ get_wm() {
                 #
                 # To extract the name, everything before '_NET_WM_NAME = \"'
                 # is removed and everything after the next '"' is removed.
-                wm=$(xprop -id "$id" -notype -len 25 -f _NET_WM_NAME 8t)
+                wm=$(xprop -id "$id" -notype -len 7 -f _NET_WM_NAME 8t)
             }
 
             # Handle cases of a window manager _not_ populating the
@@ -1051,7 +1051,7 @@ get_wm() {
         ;;
     esac
 
-    log wm "$(echo $wm | tr '[:upper:]' '[:lower:]')" >&6
+    log wm "hikari" >&6
 }
 
 
@@ -1067,7 +1067,7 @@ get_de() {
 
 get_shell() {
     # Display the basename of the '$SHELL' environment variable.
-    log shell "${SHELL##*/}" >&6
+    log sh "${SHELL##*/}" >&6
 }
 
 get_editor() {
@@ -1075,7 +1075,7 @@ get_editor() {
     # value of '$EDITOR'.
     editor=${VISUAL:-"$EDITOR"}
 
-    log editor "${editor##*/}" >&6
+    log ed "${editor##*/}" >&6
 }
 
 get_palette() {
diff --git a/profile b/profile
index bd95291..9438683 100644
--- a/profile
+++ b/profile
@@ -1,13 +1,17 @@
 if [ -e /home/mccd/.nix-profile/etc/profile.d/nix.sh ]; then . /home/mccd/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer
 
-export MOZ_USE_XINPUT2=1
+export LIBSEAT_BACKEND=logind
+export QT_QPA_PLATFORM=wayland-egl
+export MOZ_ENABLE_WAYLAND="1"
+export XDG_CURRENT_DESKTOP="wlroots"
+export XDG_SESSION_TYPE="wayland"
 alias sudo='doas'
-export EDITOR="vis"
+export EDITOR="kak"
 export GDK_DPI_SCALE="1.5"
 export GDK_SCALE="1.5"
 export XCURSOR_SIZE="32"
-export PF_INFO="ascii title editor shell wm"
-export PF_ALIGN="7"
+export PF_INFO="ascii title os editor shell wm"
+export PF_ALIGN="5"
 export PF_COLOR="0"
 export PATH=${PATH}:~/.local/bin
 export ENV=$HOME/.kshrc
@@ -19,5 +23,5 @@ export TERM=xterm-256color
 
 test -r /home/mccd/.opam/opam-init/init.sh && . /home/mccd/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true
 
-if [ "$(tty)" == "/dev/tty1" ]; then exec dbus-run-session startx; fi
+if [ "$(tty)" == "/dev/tty1" ]; then exec dbus-run-session hikari; fi
 
diff --git a/vimrc b/vimrc
new file mode 100644
index 0000000..7a47e75
--- /dev/null
+++ b/vimrc
@@ -0,0 +1,36 @@
+packadd lsp
+packadd vim-colors-plain
+set tabstop=2
+set expandtab
+set shiftwidth=2 
+set shiftround
+set nobackup 
+set autoindent
+set smartindent
+set cindent
+let mapleader=" "
+syntax on
+colorscheme plain-cterm
+
+call LspAddServer([#{
+	\    name: 'caml',
+	\    filetype: ['ocaml'],
+	\    path: '/home/mccd/.opam/default/bin/ocamllsp',
+	\    args: [],
+	\    syncInit: v:true
+	\  }])
+
+
+noremap , :
+noremap <leader>e :e **/
+noremap gd mB:LspGotoDefinition<Enter>
+noremap <leader>ca :LspCodeAction<Enter>
+noremap <leader>k :LspDiagCurrent<Enter>
+nnoremap <leader>l :ls<CR>:b<space>
+
+au BufEnter *.org set spell
+
+set wildmenu
+set wildmode=longest:full,lastused
+set wildignore=_build/**,release/**
+set grepprg=git\ grep\ -nH