From ce39e84b900ad78a218e6c5a9c1404421689b454 Mon Sep 17 00:00:00 2001
From: William Ball <williampi103@gmail.com>
Date: Sun, 27 Jul 2025 16:42:15 -0700
Subject: [PATCH] back on GNOME

---
 nvim/.config/nvim/lua/plugins/colors.lua | 40 ++++++++++++------------
 scripts/.local/bin/books.sh              |  6 ++--
 scripts/.local/bin/papers.sh             |  6 ++--
 zsh/.config/zsh/.zshrc                   |  4 +--
 zsh/.zshenv                              |  4 +++
 5 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/nvim/.config/nvim/lua/plugins/colors.lua b/nvim/.config/nvim/lua/plugins/colors.lua
index 48e48d2..5afbf31 100644
--- 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
+    }
 }
diff --git a/scripts/.local/bin/books.sh b/scripts/.local/bin/books.sh
index 5541abb..c8ccffe 100755
--- a/scripts/.local/bin/books.sh
+++ b/scripts/.local/bin/books.sh
@@ -1,8 +1,10 @@
 #!/bin/sh
 
 prefix=$HOME/Nextcloud/Books/
-dmenu="bemenu -p books --center --list 20 down --width-factor 0.5 --border 2 --bdr #f6c2e7"
-pdf=zathura
+dmenu="pipemenu --title Books"
+# 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)
 
diff --git a/scripts/.local/bin/papers.sh b/scripts/.local/bin/papers.sh
index 52d0a78..3df257d 100755
--- a/scripts/.local/bin/papers.sh
+++ b/scripts/.local/bin/papers.sh
@@ -1,8 +1,10 @@
 #!/bin/sh
 
 prefix=$HOME/Nextcloud/Papers/
-dmenu="bemenu -p papers --center --list 20 down --width-factor 0.5 --border 2 --bdr #f6c2e7"
-pdf=zathura
+dmenu="pipemenu --title Papers"
+# 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)
 
diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index 444dda6..d8af4e2 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -41,8 +41,8 @@ zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
 zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}'
 
 # plugins
-source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
+source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+source /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh
 
 # zoxide
 eval "$(zoxide init zsh)"
diff --git a/zsh/.zshenv b/zsh/.zshenv
index 2f5e933..ba3ec36 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -1,2 +1,6 @@
 export XDG_CONFIG_HOME="$HOME/.config"
 export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
+. "/home/wball/.local/share/cargo/env"
+
+if [ -e /home/wball/.nix-profile/etc/profile.d/nix.sh ]; then . /home/wball/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer
+[[ ! -r '/home/wball/.local/share/opam/opam-init/init.zsh' ]] || source '/home/wball/.local/share/opam/opam-init/init.zsh' > /dev/null 2> /dev/null