xsession: switch to awesome, add needed picom option, run dunst with dwm

awesome/.config/awesome/rc.lua

@@ -54,14 +54,12 @@ end
 
 local function read_theme()
   local theme = "theme_dark.lua"
-  local f = io.open(os.getenv('HOME') .. '/.config/alacritty/alacritty.toml')
+  local f = io.open(os.getenv('HOME') .. '/.lightmode')
   if f then
-    if string.find(f:read('*all'), 'light') then
     theme = 'theme_light.lua'
-    end
     f:close()
-    return theme
   end
+  return theme
 end
 
 local theme = read_theme()
@@ -88,7 +86,7 @@ local function switch_theme()
 end
 
 -- This is used later as the default terminal and editor to run.
-local terminal = "st"
+local terminal = "kitty --single-instance --instance-group default"
 
 -- Default modkey.
 local modkey = "Mod4"
@@ -242,7 +240,9 @@ local function focus_nth_window (n)
     if awful.widget.tasklist.filter.currenttags(c, mouse.screen) then cc[#cc + 1] = c end
   end
   local new_focused = cc[n]
-  if new_focused then client.focus = new_focused; new_focused:raise() end
+  if new_focused then
+    client.focus = new_focused; new_focused:raise()
+  end
 end
 
 -- {{{ Key bindings
@@ -296,7 +296,7 @@ local globalkeys = gears.table.join(
     { description = "open a terminal", group = "launcher" }),
   awful.key({ modkey, "Control", "Shift" }, "s", function() awful.spawn("systemctl suspend") end,
     { description = "open a terminal", group = "launcher" }),
-  awful.key({ modkey, "Shift" }, "F6", switch_theme,
+  awful.key({ modkey, "Control", "Shift" }, "t", switch_theme,
     { description = "switch theme", group = "launcher" }),
   awful.key({ modkey, }, "q", awesome.restart,
     { description = "reload awesome", group = "awesome" }),
@@ -347,7 +347,7 @@ local globalkeys = gears.table.join(
     end,
     { description = "lua execute prompt", group = "awesome" }),
   -- Menubar
-  awful.key({ modkey }, "p", function() awful.spawn("dmenu_run -fn 'FiraCode Nerd Font Ret:size=10'") end,
+  awful.key({ modkey }, "p", function() awful.spawn("dmenu_run -fn 'HurmitNerdFont:size=16'") end,
     { description = "run command", group = "launcher" })
 )
 

awesome/.config/awesome/theme_dark.lua

@@ -5,7 +5,7 @@ local dpi                      = xresources.apply_dpi
 
 local theme                    = {}
 
-theme.font                     = "Fira Code Nerd Font 10"
+theme.font                     = "HurmitNerdFont 10"
 theme.tasklist_disable_icon    = true
 theme.wibar_height             = 30
 

awesome/.config/awesome/theme_light.lua

@@ -5,7 +5,7 @@ local dpi                      = xresources.apply_dpi
 
 local theme                    = {}
 
-theme.font                     = "Fira Code Nerd Font 10"
+theme.font                     = "HurmitNerdFont 10"
 theme.tasklist_disable_icon    = true
 theme.wibar_height             = 30
 

kitty/.config/kitty/kitty.conf

@@ -1,20 +1,20 @@
-font_family FiraCode Nerd
+font_family HurmitNerdFont
 font_size 11
 
 cursor_blink_interval 0
 
-tab_title_template "{fmt.fg.red}{bell_symbol}{activity_symbol}{fmt.fg.tab}{title} {index}"
+tab_bar_style powerline
+tab_bar_filter session:~ or session:^$
+tab_title_template "{index}:{session_name}:{bell_symbol}{activity_symbol}{title}"
+tab_powerline_style round
+
+open_url_with qutebrowser
 
 action_alias launch_tab launch --type=tab --cwd=current
 
-map ctrl+shift+n launch_tab tmux
-map ctrl+shift+t launch_tab tmux attach
-map ctrl+shift+s launch_tab zsh
 map ctrl+shift+6 no_op
+map ctrl+shift+0 nth_window -1
 
-map ctrl+shift+h previous_tab
-map ctrl+shift+l next_tab
-map ctrl+shift+p goto_tab -1
 map ctrl+alt+1 goto_tab 1
 map ctrl+alt+2 goto_tab 2
 map ctrl+alt+3 goto_tab 3
@@ -24,9 +24,34 @@ map ctrl+alt+6 goto_tab 6
 map ctrl+alt+7 goto_tab 7
 map ctrl+alt+8 goto_tab 8
 map ctrl+alt+9 goto_tab 9
-map ctrl+alt+0 goto_tab 10
+map ctrl+alt+0 goto_tab -1
+
+map ctrl+alt+h neighboring_window left
+map ctrl+alt+j neighboring_window down
+map ctrl+alt+k neighboring_window up
+map ctrl+alt+l neighboring_window right
+
+map ctrl+alt+return last_used_layout
+map ctrl+alt+f goto_layout fat
+map ctrl+alt+g goto_layout grid
+map ctrl+alt+v goto_layout tall
+
+map ctrl+alt+space goto_session -1
+map ctrl+alt+e launch_tab nvim
+map ctrl+alt+m toggle_layout stack
+map ctrl+alt+o goto_session ~/.config/kitty/sessions
+map ctrl+alt+s launch --stdin-source=@screen_scrollback --type=overlay nvim -R -
+map ctrl+alt+w new_window_with_cwd
+map ctrl+alt+t new_tab_with_cwd
+map ctrl+alt+x close_window_with_confirmation
+map ctrl+alt+y new_window nvim @selection
+
+map ctrl+alt+shift+s save_as_session --base-dir ~/.config/kitty/sessions --match=session:.
+map ctrl+alt+shift+t detach_tab
+map ctrl+alt+shift+w detach_window
+map ctrl+alt+shift+x close_session .
 
 # BEGIN_KITTY_THEME
-# Afterglow
+# Kanagawa
 include current-theme.conf
 # END_KITTY_THEME

lazygit/.config/lazygit/config.yml

@@ -7,3 +7,7 @@ os:
 
 gui:
   nerdFontsVersion: "3"
+
+  theme:
+    selectedLineBgColor:
+      - reverse

nvim/.config/nvim/lsp/lua_ls.lua

@@ -7,6 +7,9 @@ return {
 			runtime = {
 				version = "LuaJIT",
 			},
+			diagnostics = {
+				globals = { "vim" },
+			}
 		},
 	},
 }

nvim/.config/nvim/lua/config/options.lua

@@ -11,3 +11,5 @@ vim.opt.title = true
 vim.opt.timeout = false
 
 vim.o.undofile = true
+
+vim.cmd([[autocmd TermOpen * startinsert]]);

nvim/.config/nvim/lua/config/remap.lua

@@ -5,8 +5,15 @@ set("n", "<M-k>", "<C-w>k")
 set("n", "<M-j>", "<C-w>j")
 set("n", "<M-l>", "<C-w>l")
 
+set({ "n", 'v' }, "<leader>p", [["+p]])
+set({ "n", 'v' }, "<leader>P", [["+P]])
+set({ "n", 'v' }, "<leader>y", [["+y]])
+set({ "n", 'v' }, "<leader>Y", [["+Y]])
+
 set("n", "<Esc>", "<cmd>nohlsearch<cr>")
 set("n", "<leader>K", "<cmd>cp<cr>")
 set("n", "<leader>J", "<cmd>cn<cr>")
 set("n", "<leader>x", "<cmd>copen<cr>")
 set("n", "<leader>X", "<cmd>cclose<cr>")
+
+set("n", "<leader>ga", "<cmd>tabnew | terminal lazygit<cr>")

nvim/.config/nvim/lua/plugins/snacks.lua

@@ -15,10 +15,6 @@ set("n", "<leader>ea", function()
 	Snacks.explorer()
 end, { desc = "File Explorer" })
 
-set("n", "<leader>ga", function()
-	Snacks.lazygit()
-end, { desc = "Lazygit" })
-
 set("n", "<leader>gh", function()
 	Snacks.picker.git_diff()
 end, { desc = "Git Diff (Hunks)" })

nvim/.config/nvim/lua/plugins/telescope.lua

@@ -19,21 +19,51 @@ vim.pack.add({
 
 local ok, builtin = pcall(require, "telescope.builtin")
 if ok then
+	local defaults = require("telescope.themes").get_dropdown()
+	defaults["path_display"] = {
+		filename_first = {
+			reverse_directories = true,
+		},
+	}
+	defaults["mappings"] = {
+		i = {
+			["<C-k>"] = "move_selection_previous",
+			["<C-j>"] = "move_selection_next",
+		},
+		n = {
+			["<C-k>"] = "move_selection_previous",
+			["<C-j>"] = "move_selection_next",
+			["q"] = "close",
+		},
+	}
 	require("telescope").setup({
-		defaults = require("telescope.themes").get_ivy(),
+		defaults = defaults,
+		pickers = {
+			diagnostics = {
+				theme = "ivy",
+			},
+			buffers = {
+				mappings = {
+					n = {
+						["d"] = "delete_buffer",
+					},
+				},
+			},
+		},
 	})
 	local set = vim.keymap.set
 
 	require("telescope").load_extension("fzf")
 	require("telescope").load_extension("git_grep")
 	require("telescope").load_extension("frecency")
-	set("n", "<leader><space>", function()
+	set("n", "<leader>;", function()
 		require("telescope-frecency").start()
 	end, { desc = "Telescope frecency" })
-	set("n", "<leader>;", function()
+	set("n", "<leader><leader>", function()
 		require("telescope-frecency").start({ workspace = "CWD" })
 	end, { desc = "Telescope frecency" })
-	set("n", "<leader>b", builtin.buffers, { desc = "Telescope buffers" })
+	set("n", "<leader>b", function() builtin.buffers({ sort_mru = true, sort_lastused = true }) end,
+		{ desc = "Telescope buffers" })
 	set("n", "<leader>cc", builtin.commands, { desc = "Telescope commands" })
 	set("n", "<leader>ch", builtin.command_history, { desc = "Telescope command history" })
 	set("n", "<leader>cH", builtin.highlights, { desc = "Telescope highlights" })
@@ -44,6 +74,9 @@ if ok then
 	set("n", "<leader>ep", function()
 		builtin.find_files({ cwd = vim.fs.joinpath(vim.fn.stdpath("data"), "site") })
 	end, { desc = "Telescope find files" })
+	set("n", "<leader>es", function()
+		builtin.find_files({ cwd = vim.fs.normalize('~/.config/kitty/sessions') })
+	end, { desc = "Telescope kitty sessions" })
 	set("n", "<leader>fa", builtin.git_files, { desc = "Telescope nvim package files" })
 	set("n", "<leader>F", builtin.find_files, { desc = "Telescope find files" })
 	set("n", "<leader>fh", function()
@@ -56,10 +89,6 @@ if ok then
 	set("n", "<leader>gS", builtin.git_stash, { desc = "Telescope git stash" })
 	set("n", "<leader>ha", builtin.help_tags, { desc = "Telescope help tags" })
 	set("n", "<leader>hk", builtin.keymaps, { desc = "Telescope keymaps" })
-	set("n", "<leader>l", builtin.current_buffer_fuzzy_find, { desc = "Telescope current buffer fuzzy find" })
-	set("n", "<leader>L", function()
-		builtin.live_grep({ grep_open_files = true })
-	end, { desc = "Telescope grep open files" })
 	set("n", "<leader>m", builtin.marks, { desc = "Telescope marks" })
 	set("n", "<leader>M", builtin.man_pages, { desc = "Telescope man pages" })
 	set("n", "<leader>o", builtin.oldfiles, { desc = "Telescope oldfiles" })
@@ -74,9 +103,13 @@ if ok then
 	end, { desc = "Telescope git live grep" })
 	set("n", "<leader>S", builtin.live_grep, { desc = "Telescope live grep" })
 	set("n", "<leader>sh", builtin.search_history, { desc = "Telescope search history" })
+	set("n", "<leader>sl", builtin.current_buffer_fuzzy_find, { desc = "Telescope current buffer fuzzy find" })
 	set("n", "<leader>so", function()
 		builtin.grep_string({ grep_open_files = true })
 	end, { desc = "Telescope grep open files" })
+	set("n", "<leader>su", function()
+		builtin.live_grep({ grep_open_files = true })
+	end, { desc = "Telescope live grep open files" })
 	set({ "n", "v" }, "<leader>sw", function()
 		require("git_grep").grep()
 	end, { desc = "Telescope git grep word" })
@@ -92,7 +125,7 @@ if ok then
 
 	set("n", "gd", builtin.lsp_definitions, { desc = "Goto Definition" })
 	set("n", "grr", builtin.lsp_references, { desc = "References" })
-	set("n", "gI", builtin.lsp_implementations, { desc = "Goto Implementation" })
+	set("n", "grI", builtin.lsp_implementations, { desc = "Goto Implementation" })
 	set("n", "gy", builtin.lsp_type_definitions, { desc = "Goto T[y]pe Definition" })
 else
 	print("plugin builtin missing")

nvim/.config/nvim/lua/plugins/treesitter.lua

@@ -71,10 +71,10 @@ if ok then
 			swap = {
 				enable = true,
 				swap_next = {
-					["<leader>p"] = "@parameter.inner",
+					["<leader>cp"] = "@parameter.inner",
 				},
 				swap_previous = {
-					["<leader>P"] = "@parameter.inner",
+					["<leader>cP"] = "@parameter.inner",
 				},
 			},
 		},

nvim/.config/nvim/nvim-pack-lock.json

@@ -10,11 +10,11 @@
       "src": "https://github.com/otavioschwanck/arrow.nvim"
     },
     "auto-session": {
-      "rev": "292492ab7af4bd8b9e37e28508bc8ce995722fd5",
+      "rev": "62437532b38495551410b3f377bcf4aaac574ebe",
       "src": "https://github.com/rmagatti/auto-session"
     },
     "conform.nvim": {
-      "rev": "8314f4c9e205e7f30b62147069729f9a1227d8bf",
+      "rev": "c2526f1cde528a66e086ab1668e996d162c75f4f",
       "src": "https://github.com/stevearc/conform.nvim"
     },
     "flash.nvim": {
@@ -30,7 +30,7 @@
       "src": "https://github.com/rebelot/kanagawa.nvim"
     },
     "multicursor.nvim": {
-      "rev": "993c6eda70077c5619388900dcffefff73b40c96",
+      "rev": "630dd29dd696bc977cb81d7dd2fa6bb280f60fc4",
       "src": "https://github.com/jake-stewart/multicursor.nvim",
       "version": "'1.0'"
     },
@@ -54,11 +54,11 @@
       "version": "'master'"
     },
     "nvim-various-textobjs": {
-      "rev": "1532de4649c81b88ee0b4e53bdd17e551dd4589a",
+      "rev": "34ca4f6b54cf167554c5792cacc69c930b654136",
       "src": "https://github.com/chrisgrieser/nvim-various-textobjs"
     },
     "oil.nvim": {
-      "rev": "81b8a91735ad5cd24a6b3137f14a89f19176364f",
+      "rev": "f55b25e493a7df76371cfadd0ded5004cb9cd48a",
       "src": "https://github.com/stevearc/oil.nvim"
     },
     "plenary.nvim": {
@@ -66,7 +66,7 @@
       "src": "https://github.com/nvim-lua/plenary.nvim"
     },
     "slimline.nvim": {
-      "rev": "b23d6239ae06d7b422b30b227756971348ffcd68",
+      "rev": "6b1f20780a26813ba3c2f248c6c6f61e7281bb7b",
       "src": "https://github.com/sschleemilch/slimline.nvim"
     },
     "snacks.nvim": {

xsession/.xsession

@@ -28,17 +28,18 @@ xsettingsd &
 
 xsetroot -cursor_name left_ptr
 
-picom -b -I 1 -O 1 -i 1 -e 1 --no-fading-openclose --backend glx || compton -b --no-fading-openclose
+picom -b -I 1 -O 1 -e 1 --no-fading-openclose --backend glx || compton -b --no-fading-openclose
-
-if which dwm > /dev/null; then
-    lupan-clock &
-    exec dwm
-fi
 
 if which awesome > /dev/null; then
     exec awesome
 fi
 
+if which dwm > /dev/null; then
+    dunst &
+    lupan-clock &
+    exec dwm
+fi
+
 if which dk > /dev/null; then
     for m in $(polybar --list-monitors | cut -d: -f1); do
 	MONITOR=$m polybar --reload bar &

xsession/bin/lupan-set-theme

@@ -46,9 +46,9 @@ fi
 
 XSET=$(readlink -e ~/.config/xsettingsd/xsettingsd.conf)
 if [ "$THEME" = dark ]; then
-    kitten themes --reload-in=all Afterglow
+    kitten themes --reload-in=all Kanagawa
 elif [ "$THEME" = light ]; then
-    kitten themes --reload-in=all One Half Light
+    kitten themes --reload-in=all Dayfox
 fi
 
 # GTK