changes

10 files changed, 37 insertions, 58 deletions

diff --git a/fish/functions/shrekfetch.fish b/fish/functions/shrekfetch.fish
new file mode 100644
index 0000000..e3ccc2c
--- /dev/null
+++ b/fish/functions/shrekfetch.fish
@@ -0,0 +1,3 @@
+function shrekfetch --wraps='fastfetch -l Pictures/shrek.jpg --logo-type sixel --logo-width 30' --description 'alias shrekfetch fastfetch -l Pictures/shrek.jpg --logo-type sixel --logo-width 30'
+    fastfetch -l Pictures/shrek.jpg --logo-type sixel --logo-width 30 $argv
+end
diff --git a/nvim/lua/plugins/image.lua b/nvim/lua/plugins/image.lua
deleted file mode 100644
index b1dc285..0000000
--- a/nvim/lua/plugins/image.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
-	"3rd/image.nvim",
-	build = false, -- so that it doesn't build the rock https://github.com/3rd/image.nvim/issues/91#issuecomment-2453430239
-	ft = "norg",
-	opts = {
-		backend = "sixel",
-		processor = "magick_cli",
-		only_render_image_at_cursor = true,
-		only_render_image_at_cursor_mode = "popup",
-	}
-}
diff --git a/nvim/lua/plugins/nabla.lua b/nvim/lua/plugins/nabla.lua
deleted file mode 100644
index ebf53a6..0000000
--- a/nvim/lua/plugins/nabla.lua
+++ /dev/null
@@ -1,17 +0,0 @@
-local config = function()
-  vim.keymap.set("n", "<Space>x", function()
-    require("nabla").popup({ border = "rounded" })
-  end, { desc = "Popup Math" })
-  vim.keymap.set("n", "<Space>xx", function()
-    require "nabla".toggle_virt({
-      autogen = true, -- auto-regenerate ASCII art when exiting insert mode
-      silent = true,  -- silents error messages
-    })
-  end, { desc = "Toggle Math" })
-end
-
-return {
-  "jbyuki/nabla.nvim",
-  ft = "norg",
-  config = config
-}
diff --git a/nvim/lua/plugins/neorg.lua b/nvim/lua/plugins/neorg.lua
index 77bb71f..528fc73 100644
--- a/nvim/lua/plugins/neorg.lua
+++ b/nvim/lua/plugins/neorg.lua
@@ -13,20 +13,29 @@ local config = function()
 
 			vim.keymap.set("n", "<.", "<Plug>(neorg.promo.demote)", { buffer = true })
 			vim.keymap.set("n", "<<", "<Plug>(neorg.promo.demote.nested)", { buffer = true })
-			vim.keymap.set("n", "<C-Space>", "<Plug>(neorg.qol.todo-items.todo.task-cycle)", { buffer = true })
+			vim.keymap.set("n", "<C-Space>", "<Plug>(neorg.qol.todo-items.todo.task-cycle)",
+				{ buffer = true })
 			vim.keymap.set("n", "<CR>", "<Plug>(neorg.esupports.hop.hop-link)", { buffer = true })
-			vim.keymap.set("n", "<Space>cm", "<Plug>(neorg.looking-glass.magnify-code-block)", { buffer = true })
+			vim.keymap.set("n", "<Space>cm", "<Plug>(neorg.looking-glass.magnify-code-block)",
+				{ buffer = true })
 			vim.keymap.set("n", "<Space>id", "<Plug>(neorg.tempus.insert-date)", { buffer = true })
 			vim.keymap.set("n", "<Space>li", "<Plug>(neorg.pivot.list.invert)", { buffer = true })
 			vim.keymap.set("n", "<Space>lt", "<Plug>(neorg.pivot.list.toggle)", { buffer = true })
-			vim.keymap.set("n", "<Space>ma", "<Plug>(neorg.qol.todo-items.todo.task-ambiguous)", { buffer = true })
-			vim.keymap.set("n", "<Space>mc", "<Plug>(neorg.qol.todo-items.todo.task-cancelled)", { buffer = true })
+			vim.keymap.set("n", "<Space>ma", "<Plug>(neorg.qol.todo-items.todo.task-ambiguous)",
+				{ buffer = true })
+			vim.keymap.set("n", "<Space>mc", "<Plug>(neorg.qol.todo-items.todo.task-cancelled)",
+				{ buffer = true })
 			vim.keymap.set("n", "<Space>md", "<Plug>(neorg.qol.todo-items.todo.task-done)", { buffer = true })
-			vim.keymap.set("n", "<Space>mh", "<Plug>(neorg.qol.todo-items.todo.task-on-hold)", { buffer = true })
-			vim.keymap.set("n", "<Space>mi", "<Plug>(neorg.qol.todo-items.todo.task-important)", { buffer = true })
-			vim.keymap.set("n", "<Space>mp", "<Plug>(neorg.qol.todo-items.todo.task-pending)", { buffer = true })
-			vim.keymap.set("n", "<Space>mr", "<Plug>(neorg.qol.todo-items.todo.task-recurring)", { buffer = true })
-			vim.keymap.set("n", "<Space>mu", "<Plug>(neorg.qol.todo-items.todo.task-undone)", { buffer = true })
+			vim.keymap.set("n", "<Space>mh", "<Plug>(neorg.qol.todo-items.todo.task-on-hold)",
+				{ buffer = true })
+			vim.keymap.set("n", "<Space>mi", "<Plug>(neorg.qol.todo-items.todo.task-important)",
+				{ buffer = true })
+			vim.keymap.set("n", "<Space>mp", "<Plug>(neorg.qol.todo-items.todo.task-pending)",
+				{ buffer = true })
+			vim.keymap.set("n", "<Space>mr", "<Plug>(neorg.qol.todo-items.todo.task-recurring)",
+				{ buffer = true })
+			vim.keymap.set("n", "<Space>mu", "<Plug>(neorg.qol.todo-items.todo.task-undone)",
+				{ buffer = true })
 			vim.keymap.set("n", "<M-CR>", "<Plug>(neorg.esupports.hop.hop-link.vsplit)", { buffer = true })
 			vim.keymap.set("n", "<M-t>", "<Plug>(neorg.esupports.hop.hop-link.tab-drop)", { buffer = true })
 			vim.keymap.set("n", ">.", "Plug>(neorg.promo.promote)", { buffer = true })
diff --git a/scripts/set_background b/scripts/set_background
index be75486..b9c8b80 100755
--- a/scripts/set_background
+++ b/scripts/set_background
@@ -5,12 +5,11 @@ if test (count $argv) -lt 1; or not test -f $argv[1]
 end
 
 wallust run $argv[1] -Ts; and begin
-	set -U IMG $argv[1]
-	echo "IMG=$IMG" > ~/.config/scripts/IMG.env
-	niri msg action do-screen-transition 
-	wallust -q run $IMG
-	systemctl --user restart swaybg.service
-	makoctl reload
+	niri msg action do-screen-transition
+	set -U IMG $argv[1] &
+	wallust -q run $IMG &
+	killall swaybg ; swaybg -i $IMG &
+	makoctl reload &
 	notify-send -i $IMG "Wallust" "Changed wallpaper and palette."
 end; or begin
 	notify-send -i $argv[1] -u critical "Wallust" "Failed to change palette"
diff --git a/scripts/set_random b/scripts/set_random
index 894361c..52dbab4 100755
--- a/scripts/set_random
+++ b/scripts/set_random
@@ -6,9 +6,8 @@ if test (count $argv) -lt 1; or not test -d $argv[1]
 end
 
 ~/.config/scripts/set_background (
-  for file in (fd . $argv[1] -t f)
+  for file in (fd . $argv[1] -t f -d 1)
     if test -z $IMG; or test $file != $IMG
       echo (math (random) % 1000)":$file"
     end
   end | sort -n | head -n 1 | cut -d ':' -f2)
-
diff --git a/scripts/wallpapermenu b/scripts/wallpapermenu
index 85ed1d1..1ddf308 100755
--- a/scripts/wallpapermenu
+++ b/scripts/wallpapermenu
@@ -3,9 +3,8 @@
 if test -z $argv[1] 
 	echo "Provide a directory"
 else
-  set dir $argv[1]
 	set chosen (
-		for file in (find $dir -type f)
+		for file in (fd . $argv[1] -t f -d 1)
 			if test -z $IMG; or test $file != $IMG
 				echo -en "$file\0icon\x1fthumbnail://$file\n"
 			end
diff --git a/systemd/user/random-wallpaper.service b/systemd/user/random-wallpaper.service
index e552232..f647034 100644
--- a/systemd/user/random-wallpaper.service
+++ b/systemd/user/random-wallpaper.service
@@ -1,2 +1,8 @@
+[Unit]
+Description=Set random wallpaper
+After=graphical-session.target
+
 [Service]
+Type=oneshot
 ExecStart=%h/.config/scripts/set_random %h/Pictures/Backgrounds/
+KillMode=process
diff --git a/systemd/user/swaybg.service b/systemd/user/swaybg.service
deleted file mode 100644
index b298cac..0000000
--- a/systemd/user/swaybg.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-PartOf=graphical-session.target
-After=graphical-session.target
-Requisite=graphical-session.target
-
-[Service]
-EnvironmentFile=%h/.config/scripts/IMG.env
-ExecStart=/usr/bin/swaybg -m fill -i "$IMG"
-Restart=always
diff --git a/wallust/templates/niri b/wallust/templates/niri
index 579c061..5f896d3 100644
--- a/wallust/templates/niri
+++ b/wallust/templates/niri
@@ -1,5 +1,6 @@
 prefer-no-csd
 screenshot-path "~/Pictures/Screenshots/%Y%m%d-%H%M%S.png"
+spawn-sh-at-startup "fish -c 'swaybg -i $IMG &'"
 
 environment {
   QT_QPA_PLATFORM "wayland"
@@ -199,9 +200,9 @@ binds {
   Mod+Space				hotkey-overlay-title="Spawn Applauncher"		{ spawn "rofi" "-show" "drun" "-theme" "~/.config/rofi/applauncher.rasi"; }
   Mod+Escape			hotkey-overlay-title="Spawn Powermenu"      { spawn "~/.config/scripts/powermenu"; }
   Mod+W						hotkey-overlay-title="Spawn Wallpapermenu"  { spawn-sh "~/.config/scripts/wallpapermenu ~/Pictures/Backgrounds/"; }
-  Mod+Alt+W																										{ spawn-sh "~/.config/scripts/wallpapermenu ~/Pictures/Misc/Backgrounds/"; }
+  Mod+Alt+W																										{ spawn-sh "~/.config/scripts/wallpapermenu ~/Pictures/Backgrounds/Alt/"; }
   Mod+Shift+W			hotkey-overlay-title="Random Wallpaper"     { spawn-sh "~/.config/scripts/set_random ~/Pictures/Backgrounds/"; }
-  Mod+Shift+Alt+W																							{ spawn-sh "~/.config/scripts/set_random ~/Pictures/Misc/Backgrounds/"; }
+  Mod+Shift+Alt+W																							{ spawn-sh "~/.config/scripts/set_random ~/Pictures/Backgrounds/Alt/"; }
 
   XF86AudioRaiseVolume  allow-when-locked=true { spawn "pamixer" "-i" "5"; }
   XF86AudioLowerVolume  allow-when-locked=true { spawn "pamixer" "-d" "5"; }