awesome/.config/awesome/rc.lua

@@ -338,8 +338,8 @@ 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() menubar.show() end,
-    { description = "run command", group = "launcher" })
+    { description = "show the menubar", group = "launcher" })
 )
 
 local clientkeys = gears.table.join(

awesome/.config/awesome/theme_dark.lua

@@ -7,7 +7,7 @@ local theme                    = {}
 
 theme.font                     = "Fira Code Nerd Font 10"
 theme.tasklist_disable_icon    = true
-theme.wibar_height             = 30
+theme.wibar_height             = 40
 
 theme.bg_normal                = "#293d38" -- hsl(165deg 20% 20%)
 theme.bg_focus                 = "#478575" -- hsl(165deg 30% 40%)

awesome/.config/awesome/theme_light.lua

@@ -7,7 +7,7 @@ local theme                    = {}
 
 theme.font                     = "Fira Code Nerd Font 10"
 theme.tasklist_disable_icon    = true
-theme.wibar_height             = 30
+theme.wibar_height             = 40
 
 theme.bg_normal                = "#293d38" -- hsl(165deg 20% 20%)
 theme.bg_focus                 = "#a9d6ca" -- hsl(165deg 35% 75%)

nvim/.config/nvim/lazy-lock.json

@@ -19,6 +19,7 @@
   "hererocks": { "branch": "master", "commit": "c9c5444dea1e07e005484014a8231aa667be30b6" },
   "hlsearch.nvim": { "branch": "main", "commit": "fdeb60b890d15d9194e8600042e5232ef8c29b0e" },
   "incline.nvim": { "branch": "main", "commit": "27040695b3bbfcd3257669037bd008d1a892831d" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
   "iswap.nvim": { "branch": "master", "commit": "e02cc91f2a8feb5c5a595767d208c54b6e3258ec" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "leap.nvim": { "branch": "main", "commit": "346a16ef942635a8ca5ff92e603d07e7e8be6cbe" },
@@ -34,21 +35,17 @@
   "nano-theme.nvim": { "branch": "main", "commit": "0b1158c4911f4bd9d5a1e2e7669ebff893435b64" },
   "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
   "neogit": { "branch": "master", "commit": "6d1bd94f7fca92a50a892f494920696b5defa8c8" },
-  "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" },
   "nordic.nvim": { "branch": "main", "commit": "8627750ece357e9670f9e69853091f7fbb8d6523" },
   "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
   "nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" },
   "nvim-lspconfig": { "branch": "master", "commit": "0a1ac55d7d4ec2b2ed9616dfc5406791234d1d2b" },
-  "nvim-paredit": { "branch": "master", "commit": "cfab7ef0b750a8bd1d4daa6ace93a36ebc60f172" },
   "nvim-surround": { "branch": "main", "commit": "caf6f633d4d77a29b6e265b560c5a035d171a913" },
   "nvim-treesitter": { "branch": "master", "commit": "aece1062335a9e856636f5da12d8a06c7615ce8a" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" },
   "nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" },
-  "nvlime": { "branch": "master", "commit": "228e4fa8c7d10b1ed07b1649a63743613b77a828" },
   "oil.nvim": { "branch": "master", "commit": "ab887d926c2665a708fbe9e6c4654042cc5f4c60" },
   "onenord.nvim": { "branch": "main", "commit": "babdcc3da92f0c90703bb612a13a58e5f7669287" },
   "orgmode": { "branch": "master", "commit": "145dce4d2f1bbaed5ff9e353822981b783627b32" },
-  "parsley": { "branch": "main", "commit": "c4100aa449bfa971dcfc56ffe4206ba034db08cc" },
   "persisted.nvim": { "branch": "main", "commit": "b4b7a281307f8b52d47b0fd5b6798a453681d44e" },
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
   "quicker.nvim": { "branch": "master", "commit": "1798be71cdcb15fb84fa8054148a56e17fd391dc" },

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

@@ -1,5 +1,5 @@
 vim.g.mapleader = ' '
-vim.g.maplocalleader = ' \\'
+vim.g.maplocalleader = ' '
 
 local key = vim.keymap.set
 local opts = { silent = true, noremap = true }

nvim/.config/nvim/lua/plugins/appearance.lua

@@ -12,13 +12,6 @@ return {
   {
     "savq/melange-nvim",
   },
-  {
-    'EdenEast/nightfox.nvim',
-    config = function()
-      require('lupan.utils').set_color_schemes('nightfox', 'dayfox')
-      require('lupan.utils').update_color_scheme()
-    end,
-  },
   {
     'ronisbr/nano-theme.nvim',
     config = function()
@@ -32,7 +25,10 @@ return {
         end
         return t
       end
-    end,
+
+      require('lupan.utils').set_color_schemes('nano-theme', 'nano-theme')
+      require('lupan.utils').update_color_scheme()
+    end
   },
   {
     -- Indentation guides (see `:help indent_blankline.txt`)
@@ -40,6 +36,7 @@ return {
     main = "ibl",
     opts = {},
   },
+
   {
     --- Create Color Code
     'uga-rosa/ccc.nvim',

nvim/.config/nvim/lua/plugins/autocompletion.lua

@@ -74,8 +74,5 @@ return {
         { name = 'buffer' },
       },
     })
-    cmp.setup.filetype('lisp', {
-      sources = cmp.config.sources({ { name = 'nvlime' } })
-    })
   end,
 }

nvim/.config/nvim/lua/plugins/lisp.lua

@@ -1,22 +0,0 @@
-return {
-  {
-    'monkoose/nvlime',
-    ft = { 'lisp' },
-    lazy = false,
-    dependencies = {
-      'monkoose/parsley',
-      'hrsh7th/nvim-cmp',
-    },
-    init = function()
-      vim.g.nvlime_config = {
-        cmp = { enabled = true },
-      }
-    end,
-  },
-  {
-    "julienvincent/nvim-paredit",
-    config = function()
-      require("nvim-paredit").setup()
-    end
-  },
-}

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

@@ -15,7 +15,7 @@ return {
 
       ---@diagnostic disable-next-line: missing-fields
       require('nvim-treesitter.configs').setup {
-        ensure_installed = { 'c', 'commonlisp', 'cpp', 'go', 'haskell', 'lua', 'python', 'rust', 'tsx', 'templ', 'typescript', 'vimdoc', 'vim' },
+        ensure_installed = { 'c', 'cpp', 'go', 'haskell', 'lua', 'python', 'rust', 'tsx', 'templ', 'typescript', 'vimdoc', 'vim' },
         auto_install = false,
         highlight = {
           enable = true,

shell/.zshrc

@@ -28,7 +28,7 @@ else
     setopt autocd
 fi
 
-ZVM_VI_INSERT_ESCAPE_BINDKEY=';;'
+ZVM_VI_INSERT_ESCAPE_BINDKEY=jj
 ZSH_HIGHLIGHT_STYLES[comment]=fg=blue
 HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND=bg=magenta,fg=black,bold
 HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND=bg=red,fg=black,bold

tmux/.tmux.conf

@@ -12,7 +12,7 @@ bind-key -n M-6 select-window -t 6
 bind-key -n M-7 select-window -t 7
 bind-key -n M-8 select-window -t 8
 bind-key -n M-9 select-window -t 9
-#bind-key -n M-0 select-window -t 10
+bind-key -n M-0 select-window -t 10
 
 bind-key -n M-! swap-window -t 1
 bind-key -n M-@ swap-window -t 2
@@ -83,5 +83,3 @@ bind-key -T copy-mode-vi C-M-h swap-pane -s "{left-of}"
 bind-key -T copy-mode-vi C-M-j swap-pane -s "{down-of}"
 bind-key -T copy-mode-vi C-M-k swap-pane -s "{up-of}"
 bind-key -T copy-mode-vi C-M-l swap-pane -s "{right-of}"
-
-bind-key -n M-0 run-shell tmux-session-menu

tmux/bin/tmux-session-menu

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-tmux list-sessions -F '#S' \
-| awk 'BEGIN {ORS=" "; print "toggle t \"switch-client -l\""} {print $1, NR, "\"switch-client -t", $1 "\""}' \
-| xargs tmux display-menu -T "Switch session"