16 changed files with 103 additions and 148 deletions
--- a/emacs/.config/emacs/Emacs.org
+++ b/emacs/.config/emacs/Emacs.org
@ -92,7 +92,7 @@
             :default-height 190
             :bold-weight extrabold)
            (t
-             :default-family "Iosevka Nerd Font"
+             :default-family "Adwaita Mono"
             :default-weight normal
             :variable-pitch-family "Libertinus Serif")))
    (fontaine-set-preset 'regular))
@ -109,18 +109,18 @@
 ** Theme
 *** Modus Themes
 #+begin_src emacs-lisp
-  ;; (use-package emacs
-  ;;   :ensure nil
-  ;;   :config
-  ;;   (require-theme 'modus-themes)
-  ;;   (setq modus-themes-italic-constructs t
-  ;;         modus-themes-bold-constructs t
-  ;; 	modus-themes-links '(no-underline background faint)
-  ;;         modus-themes-prompts '(bold intense)
-  ;;         modus-themes-mode-line '(borderless accented moody)
-  ;;         modus-themes-org-blocks 'gray-background
-  ;;         modus-themes-region '(bg-only no-extend))
-  ;;   (load-theme 'modus-operandi :no-confirm))
+  (use-package emacs
+    :ensure nil
+    :config
+    (require-theme 'modus-themes)
+    (setq modus-themes-italic-constructs t
+          modus-themes-bold-constructs t
+  	modus-themes-links '(no-underline background faint)
+          modus-themes-prompts '(bold intense)
+          modus-themes-mode-line '(borderless accented moody)
+          modus-themes-org-blocks 'gray-background
+          modus-themes-region '(bg-only no-extend))
+    (load-theme 'modus-operandi :no-confirm))
 #+end_src
 *** Autodark
 #+begin_src emacs-lisp
@ -132,10 +132,10 @@
 #+end_src
 *** Catpuccin
 #+begin_src emacs-lisp
-  (use-package catppuccin-theme
-    :init (setq catppuccin-flavor 'mocha)
-    :config
-    (load-theme 'catppuccin :no-confirm))
+  ;; (use-package catppuccin-theme
+  ;;   :init (setq catppuccin-flavor 'mocha)
+  ;;   :config
+  ;;   (load-theme 'catppuccin :no-confirm))
 #+end_src
 ** Ultra Scroll
 #+begin_src emacs-lisp
--- a/fish/.config/fish/conf.d/rustup.fish
+++ b/fish/.config/fish/conf.d/rustup.fish
@ -0,0 +1 @@
+source "/home/wball/.local/share/cargo/env.fish"
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@ -1,7 +1,7 @@
 #!/bin/fish

 # fish settings
-set --global fish_key_bindings fish_hybrid_key_bindings
+fish_hybrid_key_bindings
 set fish_cursor_default block
 set fish_cursor_insert line
 set fish_curser_replace_one underscore
@ -48,7 +48,6 @@ set -x BROWSER librewolf
 set -x MOZ_ENABLE_WAYLAND 1
 set -x ELECTRON_OZONE_PLATFORM_HINT auto
 set -x GDK_BACKEND wayland
-set -x QT_QPA_PLATFORM wayland

 set -x BEMENU_OPTS '--ignorecase --fb "#1e1e2e" --ff "#cdd6f4" --nb "#1e1e2e" --nf "#cdd6f4" --tb "#1e1e2e" --hb "#1e1e2e" --tf "#f5c2e7" --hf "#f9e2af" --af "#cdd6f4" --ab "#1e1e2e" --fn "Iosevka Nerd Font 16" --no-overlap --wrap'

--- a/fish/.config/fish/fish_variables
+++ b/fish/.config/fish/fish_variables
@ -1,7 +1,7 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
 SETUVAR --export FZF_DEFAULT_OPTS:\x2d\x2dcolor\x3dbg\x2b\x3a\x23313244\x2cbg\x3a\x231e1e2e\x2cspinner\x3a\x23f5e0dc\x2chl\x3a\x23f38ba8\x20\x2d\x2dcolor\x3dfg\x3a\x23cdd6f4\x2cheader\x3a\x23f38ba8\x2cinfo\x3a\x23cba6f7\x2cpointer\x3a\x23f5e0dc\x20\x2d\x2dcolor\x3dmarker\x3a\x23f5e0dc\x2cfg\x2b\x3a\x23cdd6f4\x2cprompt\x3a\x23cba6f7\x2chl\x2b\x3a\x23f38ba8
-SETUVAR --export GPG_TTY:not\x20a\x20tty
+SETUVAR --export GPG_TTY:/dev/pts/0
 SETUVAR --export SSH_AGENT_PID:786479
 SETUVAR --export SSH_AUTH_SOCK:/tmp/ssh\x2dXXXXXXkRTHwG/agent\x2e786475
 SETUVAR ZO_CMD:zo
@ -9,11 +9,51 @@ SETUVAR Z_CMD:z
 SETUVAR Z_DATA:/home/wball/\x2elocal/share/z/data
 SETUVAR Z_DATA_DIR:/home/wball/\x2elocal/share/z
 SETUVAR Z_EXCLUDE:\x5e/home/wball\x24
-SETUVAR __fish_initialized:4300
+SETUVAR __fish_initialized:3800
 SETUVAR _fisher_jethrokuan_2F_z_files:\x7e/\x2econfig/fish/functions/__z\x2efish\x1e\x7e/\x2econfig/fish/functions/__z_add\x2efish\x1e\x7e/\x2econfig/fish/functions/__z_clean\x2efish\x1e\x7e/\x2econfig/fish/functions/__z_complete\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/z\x2efish
 SETUVAR _fisher_jorgebucaran_2F_fisher_files:\x7e/\x2econfig/fish/functions/fisher\x2efish\x1e\x7e/\x2econfig/fish/completions/fisher\x2efish
 SETUVAR _fisher_patrickf1_2F_fzf_2E_fish_files:\x7e/\x2econfig/fish/functions/_fzf_configure_bindings_help\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_extract_var_info\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_preview_changed_file\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_preview_file\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_report_diff_type\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_report_file_type\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_directory\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_git_log\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_git_status\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_history\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_processes\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_variables\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_wrapper\x2efish\x1e\x7e/\x2econfig/fish/functions/fzf_configure_bindings\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/fzf\x2efish\x1e\x7e/\x2econfig/fish/completions/fzf_configure_bindings\x2efish
 SETUVAR _fisher_plugins:jorgebucaran/fisher\x1ejethrokuan/z\x1epatrickf1/fzf\x2efish
 SETUVAR _fisher_upgraded_to_4_4:\x1d
+SETUVAR fish_color_autosuggestion:brblack
+SETUVAR fish_color_cancel:\x2d\x2dreverse
+SETUVAR fish_color_command:normal
+SETUVAR fish_color_comment:red
+SETUVAR fish_color_cwd:green
+SETUVAR fish_color_cwd_root:red
+SETUVAR fish_color_end:green
+SETUVAR fish_color_error:brred
+SETUVAR fish_color_escape:brcyan
+SETUVAR fish_color_gray:6c7086
+SETUVAR fish_color_history_current:\x2d\x2dbold
+SETUVAR fish_color_host:normal
+SETUVAR fish_color_host_remote:yellow
+SETUVAR fish_color_keyword:normal
+SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
+SETUVAR fish_color_normal:normal
+SETUVAR fish_color_operator:brcyan
+SETUVAR fish_color_option:cyan
+SETUVAR fish_color_param:cyan
+SETUVAR fish_color_quote:yellow
+SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold
+SETUVAR fish_color_search_match:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_status:red
+SETUVAR fish_color_user:brgreen
+SETUVAR fish_color_valid_path:\x2d\x2dunderline\x3dsingle
+SETUVAR fish_key_bindings:fish_hybrid_key_bindings
+SETUVAR fish_pager_color_background:\x1d
+SETUVAR fish_pager_color_completion:normal
+SETUVAR fish_pager_color_description:yellow\x1e\x2d\x2ditalics
+SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline\x3dsingle
+SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dcyan
+SETUVAR fish_pager_color_secondary_background:\x1d
+SETUVAR fish_pager_color_secondary_completion:\x1d
+SETUVAR fish_pager_color_secondary_description:\x1d
+SETUVAR fish_pager_color_secondary_prefix:\x1d
+SETUVAR fish_pager_color_selected_background:\x2d\x2dreverse
+SETUVAR fish_pager_color_selected_completion:\x1d
+SETUVAR fish_pager_color_selected_description:\x1d
+SETUVAR fish_pager_color_selected_prefix:\x1d
 SETUVAR fish_user_paths:/var/home/wball/\x2elocal/bin\x1e/home/wball/\x2ezvm/bin\x1e/home/wball/\x2elocal/share/pack/bin\x1e/home/wball/\x2elocal/share/pack\x1e/home/wball/\x2ecache/cabal/bin\x1e/home/wball/\x2epack/bin\x1e/usr/lib/smlnj/bin\x1e/home/wball/go/bin\x1e/home/wball/\x2eelan/bin\x1e/home/wball/\x2econfig/emacs/bin\x1e/home/wball/j9\x2e5/bin\x1e/home/wball/\x2elocal/smlnj/bin\x1e/home/wball/\x2elocal/share/rustup/toolchains/stable\x2dx86_64\x2dunknown\x2dlinux\x2dgnu/bin\x1e/home/wball/code/j/j9\x2e4/bin\x1e/usr/lib/j9/bin\x1e/home/wball/\x2ecabal/bin\x1e/home/wball/\x2eghcup/bin\x1e/home/wball/\x2elocal/share/cargo/bin\x1e/home/wball/\x2elocal/bin\x1e/home/wball/\x2ecargo/bin\x1e/home/wball/\x2escripts
 SETUVAR grc_plugin_execs:cat\x1ecvs\x1edf\x1ediff\x1edig\x1egcc\x1eg\x2b\x2b\x1els\x1eifconfig\x1emake\x1emount\x1emtr\x1enetstat\x1eping\x1eps\x1etail\x1etraceroute\x1ewdiff\x1eblkid\x1edu\x1ednf\x1edocker\x1edocker\x2dcompose\x1edocker\x2dmachine\x1eenv\x1eid\x1eip\x1eiostat\x1ejournalctl\x1ekubectl\x1elast\x1elsattr\x1elsblk\x1elspci\x1elsmod\x1elsof\x1egetfacl\x1egetsebool\x1eulimit\x1euptime\x1enmap\x1efdisk\x1efindmnt\x1efree\x1esemanage\x1esar\x1ess\x1esysctl\x1esystemctl\x1estat\x1eshowmount\x1etcpdump\x1etune2fs\x1evmstat\x1ew\x1ewho\x1esockstat
--- a/fish/.config/fish/functions/__z.fish
+++ b/fish/.config/fish/functions/__z.fish
@ -169,6 +169,6 @@ function __z -d "Jump to a recent directory."
            echo "Not sure how to open file manager"; and return 1
        end
    else
-        cd "$target"
+        pushd "$target"
    end
 end
--- a/git/.config/git/config
+++ b/git/.config/git/config
@ -11,15 +11,15 @@
 	email = williampi103@gmail.com
 	name = William Ball
 	signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWWWTzqhrQMjtEjbhfc43RMRJABlxSDgn2FdTW6TlUu wball@perga
-;
-; [gpg]
-;     format = ssh
-;
-; [commit]
-; 	gpgSign = true
-;
-; [tag]
-;     gpgSign = true
-;
-; [pull]
-; 	rebase = false
+
+[gpg]
+    format = ssh
+
+[commit]
+	gpgSign = true
+
+[tag]
+    gpgSign = true
+
+[pull]
+	rebase = false
--- a/nvim/.config/nvim/lua/plugins/colors.lua
+++ b/nvim/.config/nvim/lua/plugins/colors.lua
@ -3,28 +3,28 @@ return {
        'norcalli/nvim-colorizer.lua',
        config = true
    },
-    {
-        'catppuccin/nvim',
-        name = 'catppuccin',
-        priority = 1000,
-        config = function()
-            require('catppuccin').setup({
-                transparent_background = true,
-            })
-            vim.cmd.colorscheme([[catppuccin-mocha]])
-        end
-    },
    -- {
-    --     "Mofiqul/adwaita.nvim",
-    --     lazy = false,
+    --     'catppuccin/nvim',
+    --     name = 'catppuccin',
    --     priority = 1000,
-    --
-    --     -- configure and set on startup
    --     config = function()
-    --         vim.g.adwaita_darker = true             -- for darker version
-    --         -- vim.g.adwaita_disable_cursorline = true -- to disable cursorline
-    --         vim.g.adwaita_transparent = true        -- makes the background transparent
-    --         vim.cmd('colorscheme adwaita')
+    --         require('catppuccin').setup({
+    --             transparent_background = true,
+    --         })
+    --         vim.cmd.colorscheme([[catppuccin-mocha]])
    --     end
-    -- }
+    -- },
+    {
+        "Mofiqul/adwaita.nvim",
+        lazy = false,
+        priority = 1000,
+
+        -- configure and set on startup
+        config = function()
+            vim.g.adwaita_darker = true             -- for darker version
+            -- vim.g.adwaita_disable_cursorline = true -- to disable cursorline
+            vim.g.adwaita_transparent = true        -- makes the background transparent
+            vim.cmd('colorscheme adwaita')
+        end
+    }
 }
--- a/river/.config/river/init
+++ b/river/.config/river/init
@ -109,21 +109,17 @@ for mode in normal locked
 do
    riverctl map $mode None XF86Eject spawn 'eject -T'

-    riverctl map $mode None XF86AudioRaiseVolume spawn "~/.config/river/volume.sh up 0.02"
-    riverctl map $mode None XF86AudioLowerVolume spawn "~/.config/river/volume.sh down 0.02"
-    riverctl map $mode Shift XF86AudioRaiseVolume spawn "~/.config/river/volume.sh up 0.01"
-    riverctl map $mode Shift XF86AudioLowerVolume spawn "~/.config/river/volume.sh down 0.01"
-    riverctl map $mode Control XF86AudioRaiseVolume spawn "~/.config/river/volume.sh up 0.10"
-    riverctl map $mode Control XF86AudioLowerVolume spawn "~/.config/river/volume.sh down 0.10"
-    riverctl map $mode None XF86AudioMute exec spawn "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
+    riverctl map $mode None XF86AudioRaiseVolume spawn "amixer sset Master 5%+ | sed -En 's/.*\[([0-9]+)%\].*/\1/p' | head -1 > $wobsock"
+    riverctl map $mode None XF86AudioLowerVolume spawn "amixer sset Master 5%- | sed -En 's/.*\[([0-9]+)%\].*/\1/p' | head -1 > $wobsock"
+    riverctl map $mode None XF86AudioMute exec spawn "sset Master toggle | sed -En '/\[on\]/ s/.*\[([0-9]+)%\].*/\1/ p; /\[off\]/ s/.*/0/p' | head -1 > $wobsock"

    riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause'
    riverctl map $mode None XF86AudioPlay  spawn 'playerctl play-pause'
    riverctl map $mode None XF86AudioPrev  spawn 'playerctl previous'
    riverctl map $mode None XF86AudioNext  spawn 'playerctl next'

-    riverctl map $mode None XF86MonBrightnessUp spawn "brightnessctl set +5% | sed -En 's/.*\(([0-9]+)%\).*/\1/p' > $wobsock"
-    riverctl map $mode None XF86MonBrightnessDown spawn "brightnessctl set 5%- | sed -En 's/.*\(([0-9]+)%\).*/\1/p' > $wobsock"
+    riverctl map $mode $mod+Control+Shift K spawn "brightnessctl set +5% | sed -En 's/.*\(([0-9]+)%\).*/\1/p' > $wobsock"
+    riverctl map $mode $mod+Control+Shift J spawn "brightnessctl set 5%- | sed -En 's/.*\(([0-9]+)%\).*/\1/p' > $wobsock"
 done

 # "caffeine"
@ -138,8 +134,7 @@ riverctl border-width 2
 # options
 riverctl set-repeat 50 300
 # riverctl keyboard-layout -options "altwin:swap_lalt_lwin" us
-# riverctl keyboard-layout -options "altwin:swap_lalt_lwin,grp:alt_space_toggle" -variant colemak_dh, us,us
-riverctl keyboard-layout -options "grp:alt_space_toggle" -variant colemak_dh, us,us
+riverctl keyboard-layout -options "altwin:swap_lalt_lwin,grp:alt_space_toggle" -variant ,colemak_dh us,us
 # riverctl keyboard-layout -options "altwin:swap_lalt_lwin,grp:alt_space_toggle" -variant ,colemak_dh,dvorak us,us,us
 # riverctl keyboard-layout -options "grp:alt_space_toggle" -variant ,dvorak us,us

@ -181,7 +176,7 @@ riverctl rule-add -app-id org.gnome.Boxes ssd
 riverctl rule-add -app-id com.github.xournalpp.xournalpp ssd

 # spawn stuff
-pgrep wbg || wbg ~/.config/river/wallpaper.jpg &
+pgrep wbg || wbg ~/.config/wallpaper.png &
 wlr-randr --output eDP-1 --scale 1.25 &
 pgrep waybar || waybar &

@ -199,9 +194,6 @@ foot --server & # TODO: figure out systemd service
 # emacs daemon
 emacs --daemon &

-# nextcloud client
-nextcloud &
-
 # pianobar
 riverctl map normal $mod+Shift S spawn '~/.config/pianobar/change_station.sh'
 riverctl map normal $mod P spawn 'echo "p" > ~/.config/pianobar/ctl'
--- a/river/.config/river/volume.sh
+++ b/river/.config/river/volume.sh
@ -1,11 +0,0 @@
-#!/bin/sh
-
-wobsock=$XDG_RUNTIME_DIR/wob.sock
-
-if [ $1 = "up" ]; then
-    wpctl set-volume @DEFAULT_AUDIO_SINK@ "$2+"
-else
-    wpctl set-volume @DEFAULT_AUDIO_SINK@ "$2-"
-fi
-
-wpctl get-volume @DEFAULT_AUDIO_SINK@ | sed 's/Volume: 0.//' > $wobsock
--- a/river/.config/river/wallpaper.jpg
+++ b/river/.config/river/wallpaper.jpg
--- a/scripts/.local/bin/aur
+++ b/scripts/.local/bin/aur
@ -1,3 +0,0 @@
-#!/bin/sh
-
-git clone "https://aur.archlinux.org/$1.git"
--- a/scripts/.local/bin/books.sh
+++ b/scripts/.local/bin/books.sh
@ -1,12 +0,0 @@
-#!/bin/sh
-
-prefix=$HOME/Nextcloud/Books/
-# dmenu="pipemenu --title Books"
-# dmenu="fuzzel -d -p books -w 80"
-dmenu="bemenu -p books --center --list 20 down --width-factor 0.5 --border 2 --bdr #f6c2e7"
-pdf=zathura
-# pdf="flatpak run org.gnome.Papers"
-
-choice=$(find $prefix -type f | sed "s|$prefix||;s/_/ /g" | $dmenu)
-
-test -n "$choice" && $pdf $(echo $choice | sed "s/ /_/g;s|^|$prefix|") &
--- a/scripts/.local/bin/papers.sh
+++ b/scripts/.local/bin/papers.sh
@ -1,12 +0,0 @@
-#!/bin/sh
-
-prefix=$HOME/Nextcloud/Papers/
-# dmenu="pipemenu --title Books"
-# dmenu="fuzzel -d -p books -w 80"
-dmenu="bemenu -p papers --center --list 20 down --width-factor 0.5 --border 2 --bdr #f6c2e7"
-pdf=zathura
-# pdf="flatpak run org.gnome.Papers"
-
-choice=$(find $prefix -type f | sed "s|$prefix||;s/_/ /g" | $dmenu)
-
-test -n "$choice" && $pdf $(echo $choice | sed "s/ /_/g;s|^|$prefix|") &
--- a/waybar/.config/waybar/config
+++ b/waybar/.config/waybar/config
@ -1 +1 @@
-./config-river
+config-niri
--- a/waybar/.config/waybar/config-river
+++ b/waybar/.config/waybar/config-river
@ -13,7 +13,7 @@
 	],
 	"modules-right": [
 		"tray",
-		"wireplumber",
+		"pulseaudio",
        "network",
 		"battery",
 	],
@ -54,27 +54,6 @@
        "on-click-right": "pavucontrol"
    },

-    "wireplumber": {
-        "format": "{volume}% {icon}",
-        "format-muted": "",
-        "on-click": "helvum",
-        "format-icons": ["", "", ""]
-    },
-
-//    "wireplumber": {
-//        "format": "{icon} {volume:2}%",
-//        "format-bluetooth": "{icon}  {volume}%",
-//        "format-muted": "MUTE",
-//        "format-icons": {
-//            "headphones": "",
-//            "default": [
-//                "",
-//                ""
-//            ]
-//        },
-//        "on-click": "helvum"
-//    },
-
    "network": {
        "interface": "wlan0",
        "format": "{ifname}",
--- a/waybar/.config/waybar/style.css
+++ b/waybar/.config/waybar/style.css
@ -19,24 +19,6 @@ window#waybar {
    color: @pink;
 }

-#tags button {
-    color: @text;
-}
-
-#tags button.occupied {
-    color: @yellow;
-}
-
-#tags button.focused {
-    color: @base;
-    background: @pink;
-}
-
-#tags button.urgent {
-    color: @base;
-    background: @red;
-}
-
 #clock,
 #pulseaudio,
 #battery,
				`@ -0,0 +1 @@`
				`source "/home/wball/.local/share/cargo/env.fish"`