dwm: reformat config.h

nvim: add lazyjj
nvim, alacritty: switch to kanagawa-paper
2025-08-01 00:10:33 +02:00 · 2025-07-22 23:09:32 +02:00 · 2025-07-21 23:59:21 +02:00 · 2025-06-25 23:59:37 +02:00 · 2025-06-25 22:05:48 +02:00 · 2025-06-24 22:51:01 +02:00
9 changed files with 113 additions and 144 deletions
--- a/alacritty/.config/alacritty/dark.toml
+++ b/alacritty/.config/alacritty/dark.toml
@ -1,71 +1,45 @@
-# Nightfox Alacritty Colors
-## name: nightfox
-## upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/nightfox/alacritty.toml
+# -----------------------------------------------------------------------------
+# Kanagawa Paper Ink
+# Upstream: https://github.com/thesimonho/kanagawa-paper.nvim/master/extras/alacritty/kanagawa-paper-ink.toml
+# URL: https://github.com/alacritty/alacritty
+# -----------------------------------------------------------------------------

 [colors.primary]
-background = "#2e3440" # changed
-foreground = "#eceff4" # changed
-dim_foreground = "#aeafb0"
-bright_foreground = "#d6d6d7"
+background = '#1F1F28'
+foreground = '#DCD7BA'

 [colors.cursor]
-text = "#cdcecf"
-cursor = "#aeafb0"
-
-[colors.vi_mode_cursor]
-text = "#cdcecf"
-cursor = "#63cdcf"
-
-[colors.search.matches]
-foreground = "#cdcecf"
-background = "#3c5372"
-
-[colors.search.focused_match]
-foreground = "#cdcecf"
-background = "#81b29a"
-
-[colors.footer_bar]
-foreground = "#cdcecf"
-background = "#29394f"
-
-[colors.hints.start]
-foreground = "#cdcecf"
-background = "#f4a261"
-
-[colors.hints.end]
-foreground = "#cdcecf"
-background = "#29394f"
+cursor = '#c4b28a'
+text = '#1F1F28'

 [colors.selection]
-text = "#cdcecf"
-background = "#2b3b51"
+background = '#363646'
+foreground = '#9e9b93'

 [colors.normal]
-black = "#393b44"
-red = "#c94f6d"
-green = "#81b29a"
-yellow = "#dbc074"
-blue = "#719cd6"
-magenta = "#9d79d6"
-cyan = "#63cdcf"
-white = "#dfdfe0"
+black = '#393836'
+red = '#c4746e'
+green = '#699469'
+yellow = '#c4b28a'
+blue = '#435965'
+magenta = '#a292a3'
+cyan = '#8ea49e'
+white = '#C8C093'

 [colors.bright]
-black = "#575860"
-red = "#d16983"
-green = "#8ebaa4"
-yellow = "#e0c989"
-blue = "#86abdc"
-magenta = "#baa1e2"
-cyan = "#7ad5d6"
-white = "#e4e4e5"
+black = '#aca9a4'
+red = '#cc928e'
+green = '#72a072'
+yellow = '#d4c196'
+blue = '#698a9b'
+magenta = '#b4a7b5'
+cyan = '#96ada7'
+white = '#d5cd9d'

-[colors.dim]
-black = "#30323a"
-red = "#ab435d"
-green = "#6e9783"
-yellow = "#baa363"
-blue = "#6085b6"
-magenta = "#8567b6"
-cyan = "#54aeb0"
-white = "#bebebe"
+[[colors.indexed_colors]]
+index = 16
+color = '#b6927b'
+
+[[colors.indexed_colors]]
+index = 17
+color = '#c4746e'
--- a/alacritty/.config/alacritty/light.toml
+++ b/alacritty/.config/alacritty/light.toml
@ -1,30 +1,45 @@
-# Colors (Alabaster)
-# author tonsky
+# -----------------------------------------------------------------------------
+# Kanagawa Paper Canvas
+# Upstream: https://github.com/thesimonho/kanagawa-paper.nvim/master/extras/alacritty/kanagawa-paper-canvas.toml
+# URL: https://github.com/alacritty/alacritty
+# -----------------------------------------------------------------------------

 [colors.primary]
-background = '#FFFFFF' # changed
-foreground = '#434343'
+background = '#e1e1de'
+foreground = '#595b62'

 [colors.cursor]
-text = '#F7F7F7'
-cursor = '#434343'
+cursor = '#618bb6'
+text = '#e1e1de'
+
+[colors.selection]
+background = '#c4cbdc'
+foreground = '#858479'

 [colors.normal]
-black = '#000000'
-red = '#AA3731'
-green = '#448C27'
-yellow = '#CB9000'
-blue = '#325CC0'
-magenta = '#7A3E9D'
-cyan = '#0083B2'
-white = '#BBBBBB'
+black = '#4c4c65'
+red = '#b35560'
+green = '#57786c'
+yellow = '#a67337'
+blue = '#719ac2'
+magenta = '#ac7085'
+cyan = '#526c79'
+white = '#858479'

 [colors.bright]
-black = '#777777'
-red = '#F05050'
-green = '#60CB00'
-yellow = '#FFBC5D'
-blue = '#007ACC'
-magenta = '#E64CE6'
-cyan = '#00AACB'
-white = '#FFFFFF'
+black = '#5c5c75'
+red = '#c75f6b'
+green = '#618679'
+yellow = '#b67e3d'
+blue = '#86aed7'
+magenta = '#b57e91'
+cyan = '#5d7a89'
+white = '#919084'
+
+[[colors.indexed_colors]]
+index = 16
+color = '#b8805e'
+
+[[colors.indexed_colors]]
+index = 17
+color = '#b35560'
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@ -20,7 +20,9 @@
  "hlsearch.nvim": { "branch": "main", "commit": "fdeb60b890d15d9194e8600042e5232ef8c29b0e" },
  "incline.nvim": { "branch": "main", "commit": "27040695b3bbfcd3257669037bd008d1a892831d" },
  "iswap.nvim": { "branch": "master", "commit": "e02cc91f2a8feb5c5a595767d208c54b6e3258ec" },
+  "kanagawa-paper.nvim": { "branch": "master", "commit": "b0df20cca3b7087c06f241983b488190cc8e23af" },
  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
+  "lazyjj.nvim": { "branch": "main", "commit": "bba66a1351ff1f1bd078c8a1b00b8d12b3ed0017" },
  "leap.nvim": { "branch": "main", "commit": "08ca7ec9e859856251d56c22ea107f82f563ff3c" },
  "lsp_signature.nvim": { "branch": "master", "commit": "d50e40b3bf9324128e71b0b7e589765ce89466d2" },
  "lspsaga.nvim": { "branch": "main", "commit": "920b1253e1a26732e53fac78412f6da7f674671d" },
@ -28,14 +30,9 @@
  "mason-lspconfig.nvim": { "branch": "main", "commit": "c2682b0d9732bf52cbc34862056f143e71dc4a6d" },
  "mason-tool-installer.nvim": { "branch": "main", "commit": "93a9ff9b34c91c0cb0f7de8d5f7e4abce51d8903" },
  "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
-  "melange-nvim": { "branch": "master", "commit": "a51c6faa4fb09331382f87be99f71a8aa48dd422" },
-  "mellifluous.nvim": { "branch": "v1", "commit": "1637e46585435ebda7963248e0e65422effad8d9" },
  "namu.nvim": { "branch": "main", "commit": "a3a3d81d12b61a38f131253bcd3ce5e2c6599850" },
-  "nano-theme.nvim": { "branch": "main", "commit": "710c86bb90f963a7cf95f3dc15d287b59bc06b59" },
  "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
  "neogit": { "branch": "master", "commit": "7fe60f9aa6eacf2eb730c4e9b83d06a36d028161" },
-  "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" },
-  "nordic.nvim": { "branch": "main", "commit": "6afe957722fb1b0ec7ca5fbea5a651bcca55f3e1" },
  "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
  "nvim-lspconfig": { "branch": "master", "commit": "3ea99227e316c5028f57a4d86a1a7fd01dd876d0" },
  "nvim-surround": { "branch": "main", "commit": "8dd9150ca7eae5683660ea20cec86edcd5ca4046" },
@ -43,7 +40,6 @@
  "nvim-treesitter-textobjects": { "branch": "master", "commit": "0f051e9813a36481f48ca1f833897210dbcfffde" },
  "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
  "oil.nvim": { "branch": "master", "commit": "5b6068aad7d2057dd399fac73b7fb2cdf23ccd6e" },
-  "onenord.nvim": { "branch": "main", "commit": "dbf4c848929c473ec548a080fc32cb85aa2af706" },
  "orgmode": { "branch": "master", "commit": "32ef9e95f43a6e951fb931b438372546a4f0c524" },
  "persisted.nvim": { "branch": "main", "commit": "d35a3ed973e17defd8800acd46a0c893498a2671" },
  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
@ -51,6 +47,7 @@
  "rest.nvim": { "branch": "main", "commit": "2ded89dbda1fd3c1430685ffadf2df8beb28336d" },
  "slimline.nvim": { "branch": "main", "commit": "10dd807685997d1b72b950dfb4ec1a01cb259101" },
  "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
+  "snipe.nvim": { "branch": "main", "commit": "2a1b738dfae8502e6162eddfc774da65ed404142" },
  "sqlite.lua": { "branch": "master", "commit": "50092d60feb242602d7578398c6eb53b4a8ffe7b" },
  "tardis.nvim": { "branch": "main", "commit": "a6ee00a217529490e79d349b1f1a9cf5831180d3" },
  "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
--- a/nvim/.config/nvim/lua/plugins/appearance.lua
+++ b/nvim/.config/nvim/lua/plugins/appearance.lua
@ -1,38 +1,9 @@
 return {
  {
-    "ramojus/mellifluous.nvim",
-    branch = "v1",
-  },
-  {
-    'rmehri01/onenord.nvim',
-  },
-  {
-    'AlexvZyl/nordic.nvim',
-  },
-  {
-    "savq/melange-nvim",
-  },
-  {
-    'EdenEast/nightfox.nvim',
+    'thesimonho/kanagawa-paper.nvim',
    config = function()
-      require('lupan.utils').set_color_schemes('nightfox', 'dayfox')
-      require('lupan.utils').update_color_scheme()
-    end,
-  },
-  {
-    'ronisbr/nano-theme.nvim',
-    config = function()
-      local nano = require('nano-theme.colors')
-      local nano_get = nano.get
-      function nano.get()
-        local t = nano_get()
-        local light = vim.o.background == 'light'
-        if not light then
-          t.nano_strong.fg = '#ECEFF4'
-        end
-        return t
-      end
-    end,
+      vim.cmd.colorscheme('kanagawa-paper')
+    end
  },
  {
    --- Create Color Code
--- a/nvim/.config/nvim/lua/plugins/bookmarks.lua
+++ b/nvim/.config/nvim/lua/plugins/bookmarks.lua
@ -11,6 +11,14 @@ return {
    }
  },

+  {
+    "leath-dub/snipe.nvim",
+    keys = {
+      { "_", function() require("snipe").open_buffer_menu() end, desc = "Open Snipe buffer menu" }
+    },
+    opts = {}
+  },
+
  {
    "chentoast/marks.nvim",
    event = "VeryLazy",
--- a/nvim/.config/nvim/lua/plugins/jj.lua
+++ b/nvim/.config/nvim/lua/plugins/jj.lua
@ -0,0 +1,9 @@
+return {
+  {
+    'swaits/lazyjj.nvim',
+    dependencies = 'nvim-lua/plenary.nvim',
+    opts = {
+      mapping = '<leader>gj'
+    }
+  },
+}
--- a/nvim/.config/nvim/lua/plugins/persisted.lua
+++ b/nvim/.config/nvim/lua/plugins/persisted.lua
@ -11,7 +11,4 @@ return {
      { "/", exact = true },
    },
  },
-  keys = {
-    { "<leader>sP", "<cmd>:Telescope persisted<cr>", desc = "Search [P]ersisted" },
-  },
 }
--- a/nvim/.config/nvim/lua/plugins/telescope.lua
+++ b/nvim/.config/nvim/lua/plugins/telescope.lua
@ -54,12 +54,10 @@ return {
      pcall(telescope.load_extension, 'ui-select')
      pcall(telescope.load_extension, 'whaler')
      pcall(telescope.load_extension, 'git_grep')
-      pcall(telescope.load_extension, 'persisted')

      -- See `:help telescope.builtin`
      local builtin = require 'telescope.builtin'
      vim.keymap.set('n', '<leader>sT', builtin.builtin, { desc = '[S]earch [S]elect Telescope' })
-      vim.keymap.set('n', '<leader>sW', builtin.grep_string, { desc = '[S]earch current [W]ord' })
      vim.keymap.set('n', '<leader>sr', builtin.resume, { desc = '[S]earch [R]esume' })

      vim.keymap.set('n', '<leader>s.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' })
--- a/patches/dwm/config.h
+++ b/patches/dwm/config.h
@ -6,7 +6,7 @@ static const unsigned int snap      = 32;       /* snap pixel */
 static const int showbar            = 1;        /* 0 means no bar */
 static const int topbar             = 1;        /* 0 means bottom bar */
 static const char *fonts[]          = { "FiraCode Nerd Font Ret:size=10" };
-static const char dmenufont[]       = "FiraCode Nerd Font Ret:size=10"; 
+static const char dmenufont[]       = "FiraCode Nerd Font Ret:size=10";
 static const char col_gray1[]       = "#222222";
 static const char col_gray2[]       = "#444444";
 static const char col_gray3[]       = "#bbbbbb";
@ -16,7 +16,7 @@ static const char col_cyan[]        = "#7dcfff";
 static const char *colors[][3]      = {
 	/*               fg         bg         border   */
 	[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
-	[SchemeSel]  = { col_gray4, col_blue,  col_cyan },
+	[SchemeSel]  = { col_gray4, col_blue,  col_cyan  },
 };

 /* tagging */
@ -46,7 +46,7 @@ static const Layout layouts[] = {
 };

 /* key definitions */
-#define MODKEY Mod1Mask
+#define MODKEY Mod4Mask
 #define TAGKEYS(KEY,TAG) \
 	{ MODKEY,                       KEY,      view,           {.ui = 1 << TAG} }, \
 	{ MODKEY|ControlMask,           KEY,      toggleview,     {.ui = 1 << TAG} }, \
@ -58,32 +58,32 @@ static const Layout layouts[] = {

 /* commands */
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_blue, "-sf", col_gray4, NULL };
-static const char *termcmd[]  = { "st", NULL };
-static const char *lockcmd[]  = { "slock", NULL };
+static const char *dmenucmd[]    = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_blue, "-sf", col_gray4, NULL };
+static const char *termcmd[]     = { "st", NULL };
+static const char *lockcmd[]     = { "slock", NULL };
 static const char *suspendcmd[]  = { "systemctl", "suspend", NULL };
 static const char *toggletheme[] = { "lupan-set-theme", "toggle", NULL };

 static const Key keys[] = {
 	/* modifier                     key        function        argument */
-	{ MODKEY|ControlMask,           XK_p,      spawn,          {.v = dmenucmd } },
+	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
 	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
 	{ MODKEY|ControlMask|ShiftMask, XK_l,      spawn,          {.v = lockcmd } },
 	{ MODKEY|ControlMask|ShiftMask, XK_s,      spawn,          {.v = suspendcmd } },
 	{ MODKEY|ShiftMask,             XK_F6,     spawn,          {.v = toggletheme } }, 
-	{ MODKEY|ControlMask,           XK_b,      togglebar,      {0} },
-	{ MODKEY|ControlMask,           XK_j,      focusstack,     {.i = +1 } },
-	{ MODKEY|ControlMask,           XK_k,      focusstack,     {.i = -1 } },
-	{ MODKEY|ControlMask,           XK_i,      incnmaster,     {.i = +1 } },
-	{ MODKEY|ControlMask,           XK_d,      incnmaster,     {.i = -1 } },
-	{ MODKEY|ControlMask,           XK_h,      setmfact,       {.f = -0.05} },
-	{ MODKEY|ControlMask,           XK_l,      setmfact,       {.f = +0.05} },
+	{ MODKEY,                       XK_b,      togglebar,      {0} },
+	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
+	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
+	{ MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
+	{ MODKEY,                       XK_d,      incnmaster,     {.i = -1 } },
+	{ MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
+	{ MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
 	{ MODKEY,                       XK_Return, zoom,           {0} },
 	{ MODKEY,                       XK_Tab,    view,           {0} },
-	{ MODKEY|ControlMask|ShiftMask, XK_c,      killclient,     {0} },
-	{ MODKEY|ControlMask,           XK_t,      setlayout,      {.v = &layouts[0]} },
-	{ MODKEY|ControlMask,           XK_f,      setlayout,      {.v = &layouts[1]} },
-	{ MODKEY|ControlMask,           XK_m,      setlayout,      {.v = &layouts[2]} },
+	{ MODKEY|ShiftMask,             XK_c,      killclient,     {0} },
+	{ MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
+	{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },
+	{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
 	{ MODKEY,                       XK_space,  setlayout,      {0} },
 	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
 	{ MODKEY,                       XK_0,      view,           {.ui = ~0 } },
@ -101,7 +101,7 @@ static const Key keys[] = {
 	TAGKEYS(                        XK_7,                      6)
 	TAGKEYS(                        XK_8,                      7)
 	TAGKEYS(                        XK_9,                      8)
-	{ MODKEY|ControlMask|ShiftMask, XK_q,      quit,           {0} },
+	{ MODKEY|ShiftMask,             XK_q,      quit,           {0} },
 };

 /* button definitions */
Author	SHA1	Message	Date
Łukasz Pankowski	9064a389e9	dwm: reformat config.h	2025-08-01 00:10:33 +02:00
Łukasz Pankowski	e507e258e3	nvim: add lazyjj	2025-07-22 23:09:32 +02:00
Łukasz Pankowski	d138f4c1da	nvim, alacritty: switch to kanagawa-paper	2025-07-21 23:59:21 +02:00
Łukasz Pankowski	fa085ae00c	nvim: add snipe	2025-06-25 23:59:37 +02:00
Łukasz Pankowski	d8a21e78c4	nvim: switch to sweetie colorscheme, also update alacritty themes	2025-06-25 22:05:48 +02:00
Łukasz Pankowski	213a93acd9	nvim: remove telescope persisted key and grep_string	2025-06-24 22:51:01 +02:00