misc changes

fish/.config/fish/config.fish

@@ -31,7 +31,7 @@ fish_add_path $HOME/.local/share/rustup/toolchains/stable-x86_64-unknown-linux-g
 fish_add_path /usr/lib/smlnj/bin
 fish_add_path $HOME/.config/emacs/bin
 fish_add_path $HOME/.elan/bin
-fish_add_path $HOME/.pack/bin
+fish_add_path $HOME/.local/share/pack/bin
 
 set -x XDG_CACHE_HOME $HOME/.cache
 set -x XDG_CONFIG_HOME $HOME/.config
@@ -55,7 +55,7 @@ set -x XDG_DATA_HOME $HOME/.local/share
 set -x CARGO_HOME $XDG_DATA_HOME/cargo
 set -x GNUPGHOME $XDG_DATA_HOME/gnupg
 set -x GPG_TTY (tty)
-set -x STACK_ROOT $XDG_DATA_HOME/stack
+set -x STACK_XDG 1
 set -x GHCUP_USE_XDG_DIRS true
 set -x JULIA_DEPOT_PATH $XDG_DATA_HOME/julia:$JULIA_DEPOT_PATH
 set -x JUPYTER_CONFIG_DIR $XDG_CONFIG_HOME/jupyter
@@ -65,3 +65,13 @@ set -x MAXIMA_USERDIR $XDG_CONFIG_HOME/maxima
 set -x AGDA_DIR $HOME/.config/agda
 set -x PACK_DIR $HOME/.local/share/pack
 set -x MIZFILES $HOME/.local/share/mizar
+set -x RLWRAP_HOME $XDG_DATA_HOME/rlwrap
+
+
+# BEGIN opam configuration
+# This is useful if you're using opam as it adds:
+#   - the correct directories to the PATH
+#   - auto-completion for the opam binary
+# This section can be safely removed at any time if needed.
+test -r '/home/wball/.opam/opam-init/init.fish' && source '/home/wball/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true
+# END opam configuration

fish/.config/fish/fish_variables

@@ -53,5 +53,5 @@ SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3dbrblack
 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:/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 fish_user_paths:/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

kitty/.config/kitty/kitty.conf

@@ -1,12 +1,10 @@
-font_family iosevka Nerd Font
+font_family Iosevka Nerd Font
 font_size 15.0
 window_padding_width 5
 
 enable_audio_bell no
 visual_bell_duration 0.0
 
-hide_window_decorations
-
 
 # BEGIN_KITTY_THEME
 # Catppuccin-Mocha

nvim/.config/nvim/after/ftplugin/c.lua

@@ -0,0 +1 @@
+vim.opt.expandtab = false

nvim/.config/nvim/lua/keymaps.lua

@@ -1,7 +1,7 @@
 local keymap = vim.keymap
 
 vim.g.mapleader = ' '
-vim.g.maplocalleader = ' '
+vim.g.maplocalleader = '\\'
 
 keymap.set('n', 'j', 'gj')
 keymap.set('n', 'k', 'gk')

nvim/.config/nvim/lua/plugins/keys.lua

@@ -8,8 +8,6 @@ return {
             wk.add({
                 { '<leader>f', group = 'find' },
                 { '<leader>h', group = 'help' },
-                { '<leader>e', group = 'explore' },
-                { '<leader>ee', ':Lexplore<CR>', desc='netrw cwd' },
             })
         end,
     }

nvim/.config/nvim/lua/plugins/languages/agda.lua

@@ -6,5 +6,52 @@ return {
             'neovimhaskell/nvim-hs.vim',
         },
         build = 'stack build',
+        keys = {
+            {
+                "<leader>cl",
+                ":CornelisLoad<CR>",
+                "Load",
+            },
+            {
+                "<leader>cr",
+                ":CornelisRefine<CR>",
+                "Refine",
+            },
+            {
+                "<leader>cd",
+                ":CornelisMakeCase<CR>",
+                "Make Case",
+            },
+            {
+                "<leader>c,",
+                ":CornelisTypeContext<CR>",
+                "Type Context",
+            },
+            {
+                "<leader>c.",
+                ":CornelisTypeContextInfer<CR>",
+                "Type Context Infer",
+            },
+            {
+                "<leader>ca",
+                ":CornelisAuto<CR>",
+                "Auto",
+            },
+            {
+                "gd",
+                ":CornelisGoToDefinition<CR>",
+                "Go to definition"
+            },
+            {
+                "[e",
+                ":CornelisPrevGoal",
+                "Previous Goal"
+            },
+            {
+                "]e",
+                ":CornelisNextGoal",
+                "Next Goal"
+            },
+        }
     }
 }

nvim/.config/nvim/lua/plugins/languages/idris.lua

@@ -1,6 +1,6 @@
 return {
     {
-        'ShinKage/idris2-nvim',
+        'idris-community/idris2-nvim',
         event = { 'BufReadPre *.idr', 'BufNewFile *.idr' },
         dependencies = {
             'neovim/nvim-lspconfig',
@@ -25,9 +25,9 @@ return {
                         with_history = true,
                     },
                 },
-                autostart_semantic = true,
+                -- autostart_semantic = true,
-                code_action_post_hook = save_hook,
+                -- code_action_post_hook = save_hook,
-                use_default_semantic_hl_groups = true,
+                -- use_default_semantic_hl_groups = true,
                 server = {
                     init_options = {
                         logFile = "~/.cache/idris2-lsp/server.log",

nvim/.config/nvim/lua/plugins/ui.lua

@@ -2,5 +2,18 @@ return {
     {
         'stevearc/dressing.nvim',
         opts = {},
+    },
+    {
+        "nvim-neo-tree/neo-tree.nvim",
+        branch = "v3.x",
+        dependencies = {
+            "nvim-lua/plenary.nvim",
+            "nvim-tree/nvim-web-devicons",
+            "MunifTanjim/nui.nvim",
+        },
+        keys = {
+            { '<leader>e', group = 'neotree' },
+            { '<leader>ee', ':Neotree toggle<CR>', desc='toggle' },
+        }
     }
 }

river/.config/river/init

@@ -1,9 +1,12 @@
 #!/bin/sh
 
 # Variables
-term="foot"
+# term="foot"
-term_client="footclient"
+# term_client="footclient"
-term_float="foot --app-id=float -w 1120x700"
+# term_float="foot --app-id=float -w 1120x700"
+term="kitty"
+term_client="kitty"
+term_float="kitty --app-id=float -w 1120x700"
 browser="firefox"
 email="thunderbird"
 emacs="emacsclient --create-frame --alternate-editor='emacs'"
@@ -13,8 +16,8 @@ wobsock=$XDG_RUNTIME_DIR/wob.sock
 rm -f $wobsock && mkfifo $wobsock && tail -f $wobsock | wob &
 
 # Launch things
-riverctl map normal $mod Return spawn footclient
+riverctl map normal $mod Return spawn $term_client
-riverctl map normal $mod+Shift Return spawn foot
+riverctl map normal $mod+Shift Return spawn $term
 riverctl map normal $mod Semicolon spawn fuzzel
 riverctl map normal $mod BracketRight spawn "$browser"
 riverctl map normal $mod T spawn "$email"
@@ -116,6 +119,9 @@ do
     riverctl map $mode $mod+Control+Shift J spawn "brightnessctl set 5%- | sed -En 's/.*\(([0-9]+)%\).*/\1/p' > $wobsock"
 done
 
+# "caffeine"
+riverctl map normal $mod+Control C spawn "$HOME/.config/river/toggle_caffeine.sh"
+
 # colors
 riverctl background-color 0x1e1e2e
 riverctl border-color-focused 0xf5c2e7
@@ -146,7 +152,7 @@ scratch_tag=$((1 << 20))
 riverctl map normal $mod Slash toggle-focused-tags $scratch_tag
 riverctl map normal $mod+Shift Slash set-view-tags $scratch_tag
 riverctl map normal $mod+Control Slash toggle-view-tags $scratch_tag
-riverctl map normal $mod S spawn 'foot --app-id=float -w 1120x700'
+riverctl map normal $mod S spawn $term_float
 riverctl rule-add -app-id float float
 
 # SSD (so GTK apps show border)
@@ -163,17 +169,20 @@ riverctl rule-add -app-id com.github.xournalpp.xournalpp ssd
 
 # spawn stuff
 pgrep wbg || wbg ~/.config/wallpaper.png &
-# pgrep swaybg || swaybg --image ~/.config/wallpaper.png &
 wlr-randr --output eDP-1 --scale 1.25
-pgrep yambar || yambar &
+# pgrep yambar || yambar &
+pgrep waybar || waybar &
 
 # mako stuff
 pgrep mako || mako &
 riverctl map normal $mod D spawn 'makoctl dismiss'
 riverctl map normal $mod+Shift D spawn 'makoctl dismiss --all'
 
+# bluetooth
+blueman-applet &
+
 # foot server
-foot --server & # TODO: figure out systemd service
+# foot --server & # TODO: figure out systemd service
 
 # pianobar
 riverctl map normal $mod+Shift S spawn '~/.config/pianobar/change_station.sh'
@@ -183,7 +192,7 @@ riverctl map normal $mod N spawn 'echo "n" > ~/.config/pianobar/ctl'
 
 # swayidle
 pgrep swayidle || swayidle -w \
-    timeout 300 'swaylock -f -c 000000' \
+    timeout 300 '$HOME/.config/river/timeout.sh' \
     before-sleep 'swaylock -f -c 000000' &
 
 # start rivertile

river/.config/river/timeout.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+caffeine_file=$HOME/.cache/idle
+
+if [[ ! -f $caffeine_file ]] then
+    echo 0 > $caffeine_file
+fi
+
+caffeine=$(<$HOME/.cache/idle)
+
+if [[ $caffeine -eq 0 ]] then
+    swaylock -f -c 000000
+else
+    notify-send 'Caffeine' 'Not sleeping'
+fi

river/.config/river/toggle_caffeine.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+caffeine_file=$HOME/.cache/idle
+
+if [[ ! -f $caffeine_file ]] then
+    echo 0 > $caffeine_file
+fi
+
+caffeine=$(<$HOME/.cache/idle)
+
+if [[ $caffeine -eq 0 ]] then
+    echo 1 > $caffeine_file
+    notify-send 'Caffeine' 'Caffeine Enabled'
+else
+    echo 0 > $caffeine_file
+    notify-send 'Caffeine' 'Caffeine Disabled'
+fi

waybar-river/.config/waybar/config

@@ -0,0 +1,91 @@
+// -*- mode: json -*-
+
+{
+	"layer": "top",
+	"position": "bottom",
+    "height" : 36,
+
+	"modules-left": [
+		"river/tags",
+	],
+	"modules-center": [
+		"clock",
+	],
+	"modules-right": [
+		"tray",
+		"pulseaudio",
+        "network",
+		"battery",
+	],
+
+    "river/tags": {
+        "format": "{icon}",
+        "format-icons": {
+            "1": " 1 ",
+            "2": " 2 ",
+            "3": " 3 ",
+            "4": " 4 ",
+            "5": " 5 ",
+            "6": " 6 ",
+            "7": " 7 ",
+            "8": " 8 ",
+            "9": " 9 ",
+        },
+    },
+
+    "clock": {
+        "format": "{:%H:%M %A, %B %d}",
+        "tooltip": false
+    },
+
+    "pulseaudio": {
+        "format": "{icon} {volume:2}%",
+        "format-bluetooth": "{icon}  {volume}%",
+        "format-muted": "MUTE",
+        "format-icons": {
+            "headphones": "",
+            "default": [
+                "",
+                ""
+            ]
+        },
+        "scroll-step": 5,
+        "on-click": "pamixer -t",
+        "on-click-right": "pavucontrol"
+    },
+
+    "network": {
+        "interface": "wlan0",
+        "format": "{ifname}",
+        "format-wifi": "{essid} ({signalStrength}%)  ",
+        "format-ethernet": "{ipaddr}/{cidr} ",
+        "format-disconnected": "",
+        "tooltip-format": "{ifname} via {gwaddr} ",
+        "tooltip-format-wifi": "{essid} ({signalStrength}%)  ",
+        "tooltip-format-ethernet": "{ifname} ",
+        "tooltip-format-disconnected": "Disconnected",
+        "max-length": 50
+    },
+
+    "battery": {
+        "bat": "BAT0",
+        "interval": 60,
+        "states": {
+            "good": 95,
+            "warning": 30,
+            "critical": 15
+        },
+        "format": "{icon}  {capacity}%",
+        "format-icons": [
+            "",
+            "",
+            "",
+            "",
+            ""
+        ]
+    },
+
+    "tray": {
+        "icon-size": 20
+    }
+}

waybar-river/.config/waybar/style.css

@@ -0,0 +1,64 @@
+@import "mocha.css";
+
+* {
+	font-size: 20px;
+	font-family: Iosevka Nerd Font;
+    border-radius: 0;
+}
+
+window#waybar {
+    background: rgba(30, 30, 40, 1);
+	color: @text;
+}
+
+#clock,
+#pulseaudio,
+#battery,
+#tray {
+    background: transparent;
+}
+
+#language {
+    color: @yellow;
+}
+
+#tags button {
+	padding: 0 8px;
+	color: @text;
+}
+
+#tags button.focused {
+	color: @base;
+    background: @pink;
+}
+
+#tags button.occupied {
+    color: @text;
+    background: @surface1;
+}
+
+#tags button.occupied.focused {
+    color: @base;
+    background: @pink;
+}
+
+#pulseaudio {
+	color: @red;
+}
+
+#network {
+    color: @green;
+}
+
+#battery {
+	color: @blue;
+}
+
+#clock,
+#pulseaudio,
+#memory,
+#cpu,
+#battery,
+#disk {
+	padding: 0 10px;
+}

waybar-sway/.config/waybar/mocha.css

@@ -0,0 +1,37 @@
+/*
+*
+* Catppuccin Mocha palette
+* Maintainer: rubyowo
+*
+*/
+
+@define-color base   #1e1e2e;
+@define-color mantle #181825;
+@define-color crust  #11111b;
+
+@define-color text     #cdd6f4;
+@define-color subtext0 #a6adc8;
+@define-color subtext1 #bac2de;
+
+@define-color surface0 #313244;
+@define-color surface1 #45475a;
+@define-color surface2 #585b70;
+
+@define-color overlay0 #6c7086;
+@define-color overlay1 #7f849c;
+@define-color overlay2 #9399b2;
+
+@define-color blue      #89b4fa;
+@define-color lavender  #b4befe;
+@define-color sapphire  #74c7ec;
+@define-color sky       #89dceb;
+@define-color teal      #94e2d5;
+@define-color green     #a6e3a1;
+@define-color yellow    #f9e2af;
+@define-color peach     #fab387;
+@define-color maroon    #eba0ac;
+@define-color red       #f38ba8;
+@define-color mauve     #cba6f7;
+@define-color pink      #f5c2e7;
+@define-color flamingo  #f2cdcd;
+@define-color rosewater #f5e0dc;

wob/.config/wob/wob.ini

@@ -0,0 +1,3 @@
+border_color = f5c2e7
+background_color = 1e1e2e
+bar_color = cdd6f4