From 8a1978c468daa03806d05ad7573d07bd9bf16953 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Fri, 10 May 2024 18:37:55 +0300
Subject: [PATCH 01/49] flatpak: Install `rest.insomnia.Insomnia`

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/flatpak.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home-manager/flatpak.nix b/home-manager/flatpak.nix
index 4a20bdf..4c438d6 100644
--- a/home-manager/flatpak.nix
+++ b/home-manager/flatpak.nix
@@ -8,6 +8,7 @@
   services.flatpak.uninstallUnmanaged = true;
   services.flatpak.packages = [
     "com.obsproject.Studio"
+    "rest.insomnia.Insomnia"
     "com.github.tchx84.Flatseal"
     "com.github.wwmm.easyeffects"
     "com.prusa3d.PrusaSlicer"

From fdcce63631812726d62a6c2d498e14a9b09e5d22 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Tue, 21 May 2024 14:09:03 +0300
Subject: [PATCH 02/49] kanata: Only manage laptop keyboard

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 nixos/kanata.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/kanata.nix b/nixos/kanata.nix
index ad0813f..653f926 100644
--- a/nixos/kanata.nix
+++ b/nixos/kanata.nix
@@ -5,6 +5,11 @@
   ...
 }: {
   services.kanata.enable = true;
+  services.kanata.keyboards.mykbd.extraDefCfg = ''
+    linux-dev-names-include (
+      "AT Translated Set 2 keyboard"
+    )
+  '';
   services.kanata.keyboards.mykbd.config = ''
 
     (defsrc

From 9e81465bb4c100ba2e91719eb9454f8e3b3f02f5 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Tue, 21 May 2024 14:10:14 +0300
Subject: [PATCH 03/49] kanata: Improve symbols layer

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 nixos/kanata.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/kanata.nix b/nixos/kanata.nix
index 653f926..a585ed2 100644
--- a/nixos/kanata.nix
+++ b/nixos/kanata.nix
@@ -12,6 +12,9 @@
   '';
   services.kanata.keyboards.mykbd.config = ''
 
+    (defvirtualkeys
+      tld S-grv
+    )
     (defsrc
       grv     1    2    3    4    5    6    7    8    9    0    -    =    bspc
       tab     q    w    f    p    b    j    l    u    y    '    [    ]
@@ -63,9 +66,9 @@
     ;;grv  1    2    3    4    5    6    7    8    9    0    -    =    bspc
       XX   XX   XX   XX   XX   XX   XX   XX   XX   XX   XX   XX   XX   XX
     ;;tab  q    w    f    p    b    j    l    u    y    '    [    ]
-      XX   S-1  S-2  S-3  S-4  S-5  S-6  S-7  S-8  S-9  S-0  XX   XX
+      XX   S-1  S-2  S-6  S-5  grv  S-7  S-3  S-8  S-4  XX   XX   XX
     ;;caps a    r    s    t    g    m    n    e    i    o
-      XX   XX   XX   XX   XX   XX   XX   [    S-[  S-9  XX
+      XX   XX   XX   XX   XX   @tld XX   [    S-[  S-9  XX
     ;;lsft z    x    c    d    v         k    h    ,    .    /
       XX   XX   XX   XX   XX   XX        XX   ]    S-]  S-0  XX
     ;;lctl lmet lalt           spc            ;    ret
@@ -80,6 +83,7 @@
       chd (chord example d)
       chspc (chord example spc)
       chret (chord example ret)
+      tld (on-press tap-virtualkey tld)
     )
     (defchords example 500
       (t) t

From 396f4a4b86dbed051dd84e738ef4f564b5bb67a4 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Tue, 21 May 2024 14:11:53 +0300
Subject: [PATCH 04/49] kanata: Rename layer `misc`->`symbols`

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 nixos/kanata.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/kanata.nix b/nixos/kanata.nix
index a585ed2..b0706f4 100644
--- a/nixos/kanata.nix
+++ b/nixos/kanata.nix
@@ -62,7 +62,7 @@
       XX   XX   XX             XX             0    XX
     )
 
-    (deflayer misc
+    (deflayer symbols
     ;;grv  1    2    3    4    5    6    7    8    9    0    -    =    bspc
       XX   XX   XX   XX   XX   XX   XX   XX   XX   XX   XX   XX   XX   XX
     ;;tab  q    w    f    p    b    j    l    u    y    '    [    ]
@@ -77,7 +77,7 @@
     (defalias
       num (layer-while-held num)
       arrows (layer-while-held arrows)
-      misc (layer-while-held misc)
+      symbols (layer-while-held symbols)
       cht (chord example t)
       chs (chord example s)
       chd (chord example d)
@@ -93,7 +93,7 @@
       (ret) ret
       (spc s) @num
       (spc t) @arrows
-      (spc d) @misc
+      (spc d) @symbols
     )
   '';
 }

From d19e2f55ed712551746b89719e9bbc182626a1ac Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 16:23:25 +0300
Subject: [PATCH 05/49] fish: Update nix aliases

* Refer to the home directory by its full path
* Refer to flakes using the `path:` URL
* Add aliases to wipe old generations
* Add `update` alias for calling all other aliases

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/fish.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/home-manager/fish.nix b/home-manager/fish.nix
index bbc6774..ca5c7a5 100644
--- a/home-manager/fish.nix
+++ b/home-manager/fish.nix
@@ -26,10 +26,13 @@
       "df" = "df -x tmpfs -x devtmpfs -x efivarfs -h";
 
       # Nix
-      "nrs" = "sudo nixos-rebuild switch --flake ~gkaklas/nix/nixos/";
-      "upn" = "sudo nix flake update ~gkaklas/nix/nixos/";
-      "hms" = "home-manager switch --flake ~/nix/home-manager/";
-      "uph" = "nix flake update ~/nix/home-manager/ ";
+      "nrs" = "sudo nixos-rebuild switch --flake path:/home/gkaklas/nix/nixos/";
+      "upn" = "sudo nix flake update path:/home/gkaklas/nix/nixos/";
+      "cln" = "sudo nix profile wipe-history --older-than 7d --profile /nix/var/nix/profiles/system";
+      "hms" = "home-manager switch --flake path:/home/gkaklas/nix/home-manager/";
+      "uph" = "nix flake update path:/home/gkaklas/nix/home-manager/ ";
+      "clh" = "nix profile wipe-history --older-than 7d";
+      "update" = "upn && nrs && cln && uph && hms && clh && nix store gc";
 
       # git
       "gc" = "git commit --verbose --gpg-sign --signoff";

From 5bd1676428fc636a7d4d2ede28cf8e748dfd37e5 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 16:32:19 +0300
Subject: [PATCH 06/49] firefox: Add HiDPI-related settings

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/firefox.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/home-manager/firefox.nix b/home-manager/firefox.nix
index 78bba58..3806613 100644
--- a/home-manager/firefox.nix
+++ b/home-manager/firefox.nix
@@ -29,5 +29,7 @@
     "extensions.pocket.enabled" = false;
     "browser.newtabpage.activity-stream.default.sites" = "";
     "browser.compactmode.show" = true;
+    # "ui.textScaleFactor" = 90;
+    "layout.css.devPixelsPerPx" = 1.7;
   };
 }

From 8a7c86893c2095e19afcb7f7ee7da3acf587f9c9 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 16:35:06 +0300
Subject: [PATCH 07/49] disko: Delete unneeded `mountOptions`

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 nixos/disko.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/disko.nix b/nixos/disko.nix
index 3ab6acc..06b87cc 100644
--- a/nixos/disko.nix
+++ b/nixos/disko.nix
@@ -43,7 +43,6 @@
       subvolumes = {
         "gkaklas/.local/share/flatpak" = {
           mountpoint = "/home/gkaklas/.local/share/flatpak";
-          mountOptions = ["defaults" "user"];
         };
       };
       mountpoint = "/home";
@@ -55,7 +54,6 @@
       type = "filesystem";
       format = "btrfs";
       mountpoint = "/mnt/storage";
-      mountOptions = ["defaults" "user"];
     };
   };
 }

From e3153ed581d989dde834ecb8e0ef6f1b3aec5ca2 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 16:35:57 +0300
Subject: [PATCH 08/49] disko: Create `build` and `games` logical volumes

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 nixos/disko.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/nixos/disko.nix b/nixos/disko.nix
index 06b87cc..4fcd3ec 100644
--- a/nixos/disko.nix
+++ b/nixos/disko.nix
@@ -56,4 +56,20 @@
       mountpoint = "/mnt/storage";
     };
   };
+  disko.devices.lvm_vg.VolGroup0.lvs.build = {
+    size = "20G";
+    content = {
+      type = "filesystem";
+      format = "btrfs";
+      mountpoint = "/mnt/build";
+    };
+  };
+  disko.devices.lvm_vg.VolGroup0.lvs.games = {
+    size = "20G";
+    content = {
+      type = "filesystem";
+      format = "btrfs";
+      mountpoint = "/mnt/games";
+    };
+  };
 }

From 844bdf54a9a4227c7b348a07b7a3586020e3d87f Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 16:39:23 +0300
Subject: [PATCH 09/49] config: Configure `syncthing` and `gpg-agent`

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/config.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/home-manager/config.nix b/home-manager/config.nix
index 1500485..325aa4a 100644
--- a/home-manager/config.nix
+++ b/home-manager/config.nix
@@ -6,4 +6,19 @@
     ./firefox.nix
     ./cli.nix
   ];
+  services.syncthing = {
+    enable = true;
+    tray.enable = true;
+  };
+
+  services.gpg-agent = {
+    enable = true;
+    enableSshSupport = true;
+    enableFishIntegration = true;
+    pinentryPackage = pkgs.pinentry-tty;
+    maxCacheTtl = 60480000;
+    maxCacheTtlSsh = 60480000;
+    defaultCacheTtl = 60480000;
+    defaultCacheTtlSsh = 60480000;
+  };
 }

From c3084c8898b832ca50e3222f5b9bd70b733a98a6 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 16:40:22 +0300
Subject: [PATCH 10/49] homeFiles: Configure cargo to use `build` partition

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/homeFiles.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/home-manager/homeFiles.nix b/home-manager/homeFiles.nix
index 3b78b5c..6224b34 100644
--- a/home-manager/homeFiles.nix
+++ b/home-manager/homeFiles.nix
@@ -6,6 +6,11 @@
 }: {
   imports = [./zellij.nix];
 
+  home.file.".cargo/config.toml".text = ''
+    [build]
+    target-dir = "/mnt/build"
+  '';
+
   home.file.".config/ripgrep/ignore".text = ''
     -.
   '';

From 31e107a49a85f0671c7a9551911c6fad4d115a4f Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 16:46:41 +0300
Subject: [PATCH 11/49] home flake: Rearrange `nix-flatpak` and
 `plasma-manager` import lines

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/flake.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/home-manager/flake.nix b/home-manager/flake.nix
index 66fa209..1d5d948 100644
--- a/home-manager/flake.nix
+++ b/home-manager/flake.nix
@@ -35,10 +35,10 @@
         ./config.nix
         ./packages.nix
         ./flatpak.nix
-        ./plasma/plasma.nix
-
-        plasma-manager.homeManagerModules.plasma-manager
         nix-flatpak.homeManagerModules.nix-flatpak
+        ./plasma/plasma.nix
+        plasma-manager.homeManagerModules.plasma-manager
+
       ];
     };
   };

From 7b9a071ad9d6e15c7189c5e866ef40be18e3a4a4 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 16:50:12 +0300
Subject: [PATCH 12/49] nixvim: Initial commit

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/flake.nix         | 5 +++++
 home-manager/nixvim/nixvim.nix | 9 +++++++++
 home-manager/packages.nix      | 1 -
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 home-manager/nixvim/nixvim.nix

diff --git a/home-manager/flake.nix b/home-manager/flake.nix
index 1d5d948..754e124 100644
--- a/home-manager/flake.nix
+++ b/home-manager/flake.nix
@@ -16,6 +16,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home-manager";
     };
+    nixvim.url = "github:nix-community/nixvim";
+    nixvim.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = {
@@ -23,6 +25,7 @@
     home-manager,
     plasma-manager,
     nix-flatpak,
+    nixvim,
     ...
   }: let
     system = "x86_64-linux";
@@ -39,6 +42,8 @@
         ./plasma/plasma.nix
         plasma-manager.homeManagerModules.plasma-manager
 
+        nixvim.homeManagerModules.nixvim
+        ./nixvim/nixvim.nix
       ];
     };
   };
diff --git a/home-manager/nixvim/nixvim.nix b/home-manager/nixvim/nixvim.nix
new file mode 100644
index 0000000..99af686
--- /dev/null
+++ b/home-manager/nixvim/nixvim.nix
@@ -0,0 +1,9 @@
+{
+  pkgs,
+  config,
+  ...
+}: {
+  programs.nixvim = {
+    enable = true;
+  };
+}
diff --git a/home-manager/packages.nix b/home-manager/packages.nix
index ceeb4fa..a00d65c 100644
--- a/home-manager/packages.nix
+++ b/home-manager/packages.nix
@@ -11,7 +11,6 @@
 
     # CLI
     fzf
-    neovim
     htop
     nnn
     wl-clipboard

From 06a2fa756cd1face1a976788b4f704864a662666 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 16:51:54 +0300
Subject: [PATCH 13/49] nixvim: Configure basic settings

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/nixvim/nixvim.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/home-manager/nixvim/nixvim.nix b/home-manager/nixvim/nixvim.nix
index 99af686..9702579 100644
--- a/home-manager/nixvim/nixvim.nix
+++ b/home-manager/nixvim/nixvim.nix
@@ -6,4 +6,16 @@
   programs.nixvim = {
     enable = true;
   };
+  programs.nixvim.opts = {
+    mousemoveevent = true;
+    relativenumber = true;
+    number = true;
+    scroll = 2;
+    foldlevel = 99;
+    foldlevelstart = 99;
+    foldenable = true;
+  };
+  programs.nixvim.globals = {
+    mapleader = ";";
+  };
 }

From 18854b903b59f557ea93590201a6ec3b244e081a Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 16:58:39 +0300
Subject: [PATCH 14/49] nixvim: Add and configure plugins

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/nixvim/nixvim.nix | 68 ++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/home-manager/nixvim/nixvim.nix b/home-manager/nixvim/nixvim.nix
index 9702579..13474a6 100644
--- a/home-manager/nixvim/nixvim.nix
+++ b/home-manager/nixvim/nixvim.nix
@@ -5,7 +5,75 @@
 }: {
   programs.nixvim = {
     enable = true;
+    plugins = {
+      # UI
+      nvim-tree.enable = true;
+      notify.enable = true;
+      which-key.enable = true;
+      headlines.enable = true;
+      neoscroll.enable = true;
+      statuscol.enable = true;
+
+      telescope.enable = true;
+      telescope.extensions = {
+        undo.enable = true;
+        file-browser.enable = true;
+      };
+      lualine = {
+        enable = true;
+        theme = "molokai";
+      };
+      barbar = {
+        enable = true;
+        settings = {
+          preset = "slanted";
+        };
+      };
+
+      # Code visibility
+      rainbow-delimiters.enable = true;
+      indent-blankline.enable = true;
+
+      # Languages
+      nix.enable = true;
+      rustaceanvim.enable = true;
+
+      # Git
+      neogit.enable = true;
+      diffview.enable = true;
+      gitsigns = {
+        enable = true;
+        settings = {
+          current_line_blame = true;
+        };
+      };
+
+      # Uncategorized
+      luasnip.enable = true;
+      cmp.enable = true;
+      cmp_luasnip.enable = true;
+      cmp-path.enable = true;
+      cmp-git.enable = true;
+      friendly-snippets.enable = true;
+      nvim-ufo.enable = true;
+      lazy.enable = true;
+      comment.enable = true;
+      treesitter.enable = true;
+      nvim-colorizer.enable = true;
+    };
   };
+  programs.nixvim.extraPlugins = [
+    pkgs.vimPlugins.legendary-nvim
+    pkgs.vimPlugins.guess-indent-nvim
+    (pkgs.vimUtils.buildVimPlugin {
+      name = "cmp-async-path";
+      src = pkgs.fetchgit {
+        url = "https://codeberg.org/FelipeLema/cmp-async-path";
+        rev = "7df7f3721c45aac26b6e0474087538f4681c9c7a";
+        hash = "sha256-LSWWsn8aKogjWevcbjITXu30a2k3wY3+f2+l7WDAZpY=";
+      };
+    })
+  ];
   programs.nixvim.opts = {
     mousemoveevent = true;
     relativenumber = true;

From 52c106b4be0563f8afa5ba6ba771576dbffe0972 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 17:00:42 +0300
Subject: [PATCH 15/49] nixvim: Set colorscheme to `vim-monokai-tasty`

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/nixvim/nixvim.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/home-manager/nixvim/nixvim.nix b/home-manager/nixvim/nixvim.nix
index 13474a6..e433cd0 100644
--- a/home-manager/nixvim/nixvim.nix
+++ b/home-manager/nixvim/nixvim.nix
@@ -65,6 +65,7 @@
   programs.nixvim.extraPlugins = [
     pkgs.vimPlugins.legendary-nvim
     pkgs.vimPlugins.guess-indent-nvim
+    pkgs.vimPlugins.vim-monokai-tasty
     (pkgs.vimUtils.buildVimPlugin {
       name = "cmp-async-path";
       src = pkgs.fetchgit {
@@ -74,6 +75,8 @@
       };
     })
   ];
+
+  programs.nixvim.colorscheme = "vim-monokai-tasty";
   programs.nixvim.opts = {
     mousemoveevent = true;
     relativenumber = true;

From e9ca2034bca4665f8901d1f3537fe1622ef34d7c Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 17:01:15 +0300
Subject: [PATCH 16/49] nixvim: Use `wl-copy` for clipboard

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/nixvim/nixvim.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home-manager/nixvim/nixvim.nix b/home-manager/nixvim/nixvim.nix
index e433cd0..ff36865 100644
--- a/home-manager/nixvim/nixvim.nix
+++ b/home-manager/nixvim/nixvim.nix
@@ -77,6 +77,7 @@
   ];
 
   programs.nixvim.colorscheme = "vim-monokai-tasty";
+  programs.nixvim.clipboard.providers.wl-copy.enable = true;
   programs.nixvim.opts = {
     mousemoveevent = true;
     relativenumber = true;

From f4b43e3a18012dde61a14f0136a5b077b3f60bbc Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 17:04:29 +0300
Subject: [PATCH 17/49] nixvim: Add initial configuration for keymaps

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/nixvim/keymaps.nix | 50 +++++++++++++++++++++++++++++++++
 home-manager/nixvim/nixvim.nix  |  3 ++
 2 files changed, 53 insertions(+)
 create mode 100644 home-manager/nixvim/keymaps.nix

diff --git a/home-manager/nixvim/keymaps.nix b/home-manager/nixvim/keymaps.nix
new file mode 100644
index 0000000..83da2fd
--- /dev/null
+++ b/home-manager/nixvim/keymaps.nix
@@ -0,0 +1,50 @@
+{
+  pkgs,
+  config,
+  ...
+}: let
+  # Telescope
+  # { key = "<leader>ff";
+  #   action = config.nixvim.helpers.mkRaw "require('telescope.builtin').find_files";
+  # } becomes:
+  # { key = ldr "ff";
+  #   action = mfn "telescope.builtin" "find_files";
+  # } becomes:
+  # (tscope "ff" "find_files")
+  lua = config.nixvim.helpers.mkRaw;
+  ldr = k: "<leader>${k}";
+  key = k: fn: {
+    key = "${k}";
+    action = lua "${fn}";
+  };
+  lkey = k: fn: {
+    key = ldr "${k}";
+    action = lua "${fn}";
+  };
+  luaf = fn: "function() ${fn} end";
+  luafr = m: fn: "function() require('${m}').${fn} end";
+
+  mkey = module: k: fn: (lkey "${k}" "require('${module}').${fn}");
+  tscope = k: fn: mkey "telescope.builtin" "${k}" "${fn}";
+  gs = k: fn: mkey "gitsigns" "${k}" "${fn}";
+in {
+  programs.nixvim.keymaps = [
+    (tscope "ff" "find_files")
+    (tscope "fg" "live_grep")
+    (tscope "fb" "buffers")
+    (tscope "fh" "help_tags")
+
+    (gs "hs" "stage_hunk")
+    (gs "rs" "reset_hunk")
+    (gs "hS" "stage_buffer")
+    (gs "hu" "undo_stage_hunk")
+    (gs "hR" "reset_buffer")
+    (gs "hp" "preview_hunk")
+    (gs "tb" "toggle_current_line_blame")
+    (gs "hd" "diffthis")
+    (gs "td" "toggle_deleted")
+
+    (key "<F5>" (luafr "nvim-tree.api" "tree.toggle()"))
+    (lkey "d" "vim.cmd.bdelete")
+  ];
+}
diff --git a/home-manager/nixvim/nixvim.nix b/home-manager/nixvim/nixvim.nix
index ff36865..c11df2e 100644
--- a/home-manager/nixvim/nixvim.nix
+++ b/home-manager/nixvim/nixvim.nix
@@ -3,6 +3,9 @@
   config,
   ...
 }: {
+  imports = [
+    ./keymaps.nix
+  ];
   programs.nixvim = {
     enable = true;
     plugins = {

From 14e110a06c71b87394186c0cf7bfef98167cd26f Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 17:07:50 +0300
Subject: [PATCH 18/49] home: Enable KDEConnect

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/home.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/home-manager/home.nix b/home-manager/home.nix
index a3a2b50..642547c 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -7,4 +7,6 @@
   home.username = "gkaklas";
   home.homeDirectory = "/home/gkaklas";
   home.stateVersion = "23.11";
+
+  services.kdeconnect.enable = true;
 }

From 678b06ff618ff36e105b03a83dbe330e23e3ea3c Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 17:08:13 +0300
Subject: [PATCH 19/49] home: Add `~/bin` to $PATH

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/home.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/home-manager/home.nix b/home-manager/home.nix
index 642547c..8aa6977 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -9,4 +9,7 @@
   home.stateVersion = "23.11";
 
   services.kdeconnect.enable = true;
+  home.sessionPath = [
+    "$HOME/bin"
+  ];
 }

From 190a7e60ca4d75672060f6e9509314336e9addd3 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 17:08:51 +0300
Subject: [PATCH 20/49] home: Set `EDITOR` environment variable

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/home.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/home-manager/home.nix b/home-manager/home.nix
index 8aa6977..e409c5d 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -9,6 +9,9 @@
   home.stateVersion = "23.11";
 
   services.kdeconnect.enable = true;
+  home.sessionVariables = rec {
+    EDITOR = "nvim";
+  };
   home.sessionPath = [
     "$HOME/bin"
   ];

From 70b112520bb73d13e464fe71621e244e5c4575ec Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 17:09:47 +0300
Subject: [PATCH 21/49] flatpak: Update packages automatically

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/flatpak.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home-manager/flatpak.nix b/home-manager/flatpak.nix
index 4c438d6..fbefa8e 100644
--- a/home-manager/flatpak.nix
+++ b/home-manager/flatpak.nix
@@ -6,6 +6,7 @@
   services.flatpak.enable = true;
   services.flatpak.update.auto.enable = false;
   services.flatpak.uninstallUnmanaged = true;
+  services.flatpak.update.onActivation = true;
   services.flatpak.packages = [
     "com.obsproject.Studio"
     "rest.insomnia.Insomnia"

From 2cf43d5c0e58c4aab043c56be163e40a3d330a04 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 17:10:42 +0300
Subject: [PATCH 22/49] flatpak: Install packages

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/flatpak.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/home-manager/flatpak.nix b/home-manager/flatpak.nix
index fbefa8e..30976bc 100644
--- a/home-manager/flatpak.nix
+++ b/home-manager/flatpak.nix
@@ -29,5 +29,15 @@
     "org.mozilla.Thunderbird"
     "com.github.Eloston.UngoogledChromium"
     "io.podman_desktop.PodmanDesktop"
+    "org.sqlitebrowser.sqlitebrowser"
+    "io.github.jacalz.rymdport" # Wormhole
+    "ca.hamaluik.Timecop"
+    "org.kde.kleopatra"
+    "com.valvesoftware.Steam"
+    "com.github.joseexposito.touche"
+    "io.github.nokse22.Exhibit"
+    "io.github.f3d_app.f3d"
+    "org.dune3d.dune3d"
+    "org.freecadweb.FreeCAD"
   ];
 }

From 71acea9fd3bb66f5649d668fc1d0ac067b8535d2 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 17:11:35 +0300
Subject: [PATCH 23/49] flatpak: Configure global override to fix GTK dark
 theme

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/flatpak.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/home-manager/flatpak.nix b/home-manager/flatpak.nix
index 30976bc..a355432 100644
--- a/home-manager/flatpak.nix
+++ b/home-manager/flatpak.nix
@@ -40,4 +40,7 @@
     "org.dune3d.dune3d"
     "org.freecadweb.FreeCAD"
   ];
+  services.flatpak.overrides = {
+    global.Context.filesystems = ["xdg-config/gtk-3.0"];
+  };
 }

From 072a5e511e7967a2af0c951d8cc0abcb3469fca8 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 17:12:04 +0300
Subject: [PATCH 24/49] flatpak: Set override for Steam to have access to
 `games` directory

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/flatpak.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/home-manager/flatpak.nix b/home-manager/flatpak.nix
index a355432..e763b9f 100644
--- a/home-manager/flatpak.nix
+++ b/home-manager/flatpak.nix
@@ -42,5 +42,10 @@
   ];
   services.flatpak.overrides = {
     global.Context.filesystems = ["xdg-config/gtk-3.0"];
+    "com.valvesoftware.Steam".Context = {
+      filesystems = [
+        "/mnt/games:rw"
+      ];
+    };
   };
 }

From ebaa8d06a42af111e25ef05e33da05932fd3155e Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 17:14:14 +0300
Subject: [PATCH 25/49] plasma: Use new kwin configuration module options for
 configuring virtual desktops

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/plasma/configFile.nix | 17 -----------------
 home-manager/plasma/plasma.nix     |  5 +++++
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/home-manager/plasma/configFile.nix b/home-manager/plasma/configFile.nix
index 1225eb8..9f9f5fa 100644
--- a/home-manager/plasma/configFile.nix
+++ b/home-manager/plasma/configFile.nix
@@ -6,23 +6,6 @@
   "kdeglobals"."Shortcuts"."Quit".value = "";
 
   kwinrc = {
-    Desktops = {
-      # uuidgen -rC6
-      "Id_1".value = "1c3962f3-bd6e-42e4-bcaf-9f1dc0a55cab";
-      "Id_2".value = "a76e8497-148d-44d8-96a1-026278642d79";
-      "Id_3".value = "e2f3dcc2-8009-46b0-af71-745daf70b846";
-      "Id_4".value = "4e471453-b165-4c9f-bc56-a2eb9e7f969e";
-      "Id_5".value = "645f9867-ff82-48b3-ac5b-cc389bc9fd31";
-      "Id_6".value = "95e0579d-b58f-47c7-a47f-5caf30cdf399";
-      "Name_1".value = "Web";
-      "Name_2".value = "Main";
-      "Name_3".value = "Comm";
-      "Name_4".value = "Aux1";
-      "Name_5".value = "Aux2";
-      "Name_6".value = "Music";
-      "Number".value = 6;
-      "Rows".value = 1;
-    };
     "Windows"."FocusPolicy".value = "FocusFollowsMouse";
     "Windows"."BorderlessMaximizedWindows".value = true;
   };
diff --git a/home-manager/plasma/plasma.nix b/home-manager/plasma/plasma.nix
index b2783a7..4d5ee2d 100644
--- a/home-manager/plasma/plasma.nix
+++ b/home-manager/plasma/plasma.nix
@@ -16,6 +16,11 @@
       lookAndFeel = "org.kde.breezedark.desktop";
       wallpaper = "${pkgs.libsForQt5.plasma-workspace-wallpapers}/share/wallpapers/MilkyWay/contents/images/1080x1920.png";
     };
+    kwin.virtualDesktops = {
+      rows = 1;
+      number = 6;
+      names = ["Web" "Main" "Comm" "Aux1" "Aux2" "Music"];
+    };
 
     shortcuts = {
       ksmserver = {

From 86fc78a1de292b47474a484f4fbce43348dde15c Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 17:15:51 +0300
Subject: [PATCH 26/49] plasma: Use new `borderlessMaximizedWindows` option

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/plasma/configFile.nix | 1 -
 home-manager/plasma/plasma.nix     | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/home-manager/plasma/configFile.nix b/home-manager/plasma/configFile.nix
index 9f9f5fa..d6fc1e1 100644
--- a/home-manager/plasma/configFile.nix
+++ b/home-manager/plasma/configFile.nix
@@ -7,7 +7,6 @@
 
   kwinrc = {
     "Windows"."FocusPolicy".value = "FocusFollowsMouse";
-    "Windows"."BorderlessMaximizedWindows".value = true;
   };
 
   kcminputrc = {
diff --git a/home-manager/plasma/plasma.nix b/home-manager/plasma/plasma.nix
index 4d5ee2d..acd4fc4 100644
--- a/home-manager/plasma/plasma.nix
+++ b/home-manager/plasma/plasma.nix
@@ -21,6 +21,7 @@
       number = 6;
       names = ["Web" "Main" "Comm" "Aux1" "Aux2" "Music"];
     };
+    kwin.borderlessMaximizedWindows = true;
 
     shortcuts = {
       ksmserver = {

From 1d192e9c05d01e13d5aff2df3b5265e3a8ecde64 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Sat, 3 Aug 2024 17:16:21 +0300
Subject: [PATCH 27/49] plasma: Configure `nightLight`

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/plasma/plasma.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/home-manager/plasma/plasma.nix b/home-manager/plasma/plasma.nix
index acd4fc4..d9f2dbd 100644
--- a/home-manager/plasma/plasma.nix
+++ b/home-manager/plasma/plasma.nix
@@ -22,6 +22,12 @@
       names = ["Web" "Main" "Comm" "Aux1" "Aux2" "Music"];
     };
     kwin.borderlessMaximizedWindows = true;
+    kwin.nightLight = {
+      enable = true;
+      mode = "location";
+      location.latitude = "37.9755648";
+      location.longitude = "23.7348324";
+    };
 
     shortcuts = {
       ksmserver = {

From 607e83faaf64cb563c67f8342b8981a1d9096e2e Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Tue, 25 Feb 2025 12:27:25 +0200
Subject: [PATCH 28/49] packages: Replace `filelight` with Flatpak version

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/flatpak.nix  | 1 +
 home-manager/packages.nix | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/home-manager/flatpak.nix b/home-manager/flatpak.nix
index e763b9f..3b7ae47 100644
--- a/home-manager/flatpak.nix
+++ b/home-manager/flatpak.nix
@@ -24,6 +24,7 @@
     "org.kde.krita"
     "org.kde.kwrite"
     "org.kde.okular"
+    "org.kde.filelight"
     "org.keepassxc.KeePassXC"
     "org.libreoffice.LibreOffice"
     "org.mozilla.Thunderbird"
diff --git a/home-manager/packages.nix b/home-manager/packages.nix
index a00d65c..153adee 100644
--- a/home-manager/packages.nix
+++ b/home-manager/packages.nix
@@ -1,7 +1,6 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
     # GUI
-    filelight
     spotify-qt
     lxqt.pavucontrol-qt
     alacritty

From 6be543225e2194605b31f8e729ea7bcf6c833db2 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Tue, 25 Feb 2025 12:28:17 +0200
Subject: [PATCH 29/49] packages: Uninstall `spotify-qt` and `spotifyd`

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/home-manager/packages.nix b/home-manager/packages.nix
index 153adee..1a39ed6 100644
--- a/home-manager/packages.nix
+++ b/home-manager/packages.nix
@@ -1,7 +1,6 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
     # GUI
-    spotify-qt
     lxqt.pavucontrol-qt
     alacritty
     usbimager
@@ -20,7 +19,6 @@
     ncdu
     dua
     gnupg
-    spotifyd
     mosh
     unzip
     yt-dlp

From 972a44dabd70e5b77686808be0930d6ed3d51ff2 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Tue, 25 Feb 2025 12:31:44 +0200
Subject: [PATCH 30/49] flatpak: Uninstall unused packages

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/flatpak.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/home-manager/flatpak.nix b/home-manager/flatpak.nix
index 3b7ae47..bf6192b 100644
--- a/home-manager/flatpak.nix
+++ b/home-manager/flatpak.nix
@@ -8,8 +8,6 @@
   services.flatpak.uninstallUnmanaged = true;
   services.flatpak.update.onActivation = true;
   services.flatpak.packages = [
-    "com.obsproject.Studio"
-    "rest.insomnia.Insomnia"
     "com.github.tchx84.Flatseal"
     "com.github.wwmm.easyeffects"
     "com.prusa3d.PrusaSlicer"
@@ -29,13 +27,11 @@
     "org.libreoffice.LibreOffice"
     "org.mozilla.Thunderbird"
     "com.github.Eloston.UngoogledChromium"
-    "io.podman_desktop.PodmanDesktop"
     "org.sqlitebrowser.sqlitebrowser"
     "io.github.jacalz.rymdport" # Wormhole
     "ca.hamaluik.Timecop"
     "org.kde.kleopatra"
     "com.valvesoftware.Steam"
-    "com.github.joseexposito.touche"
     "io.github.nokse22.Exhibit"
     "io.github.f3d_app.f3d"
     "org.dune3d.dune3d"

From c91d8bac6b10b569baef24c7c0e624da0ec2e9bd Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Tue, 25 Feb 2025 12:32:24 +0200
Subject: [PATCH 31/49] flatpak: Update package id for `ungoogled_chromium`

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/flatpak.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home-manager/flatpak.nix b/home-manager/flatpak.nix
index bf6192b..cb9834f 100644
--- a/home-manager/flatpak.nix
+++ b/home-manager/flatpak.nix
@@ -26,7 +26,7 @@
     "org.keepassxc.KeePassXC"
     "org.libreoffice.LibreOffice"
     "org.mozilla.Thunderbird"
-    "com.github.Eloston.UngoogledChromium"
+    "io.github.ungoogled_software.ungoogled_chromium"
     "org.sqlitebrowser.sqlitebrowser"
     "io.github.jacalz.rymdport" # Wormhole
     "ca.hamaluik.Timecop"

From b299bb46969549bb95d238d2536fd1f35a847f69 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Tue, 25 Feb 2025 12:36:35 +0200
Subject: [PATCH 32/49] nixvim: Commit updated configuration changes

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/nixvim/keymaps.nix |  4 ++--
 home-manager/nixvim/nixvim.nix  | 12 +++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/home-manager/nixvim/keymaps.nix b/home-manager/nixvim/keymaps.nix
index 83da2fd..2edc976 100644
--- a/home-manager/nixvim/keymaps.nix
+++ b/home-manager/nixvim/keymaps.nix
@@ -5,13 +5,13 @@
 }: let
   # Telescope
   # { key = "<leader>ff";
-  #   action = config.nixvim.helpers.mkRaw "require('telescope.builtin').find_files";
+  #   action = config.lib.nixvim.mkRaw "require('telescope.builtin').find_files";
   # } becomes:
   # { key = ldr "ff";
   #   action = mfn "telescope.builtin" "find_files";
   # } becomes:
   # (tscope "ff" "find_files")
-  lua = config.nixvim.helpers.mkRaw;
+  lua = config.lib.nixvim.mkRaw;
   ldr = k: "<leader>${k}";
   key = k: fn: {
     key = "${k}";
diff --git a/home-manager/nixvim/nixvim.nix b/home-manager/nixvim/nixvim.nix
index c11df2e..9b97893 100644
--- a/home-manager/nixvim/nixvim.nix
+++ b/home-manager/nixvim/nixvim.nix
@@ -20,11 +20,17 @@
       telescope.enable = true;
       telescope.extensions = {
         undo.enable = true;
-        file-browser.enable = true;
+        file-browser = {
+          enable = true;
+          settings = {
+            use_fd = true;
+            hidden = true;
+          };
+        };
       };
       lualine = {
         enable = true;
-        theme = "molokai";
+        settings.options.theme="molokai";
       };
       barbar = {
         enable = true;
@@ -62,7 +68,7 @@
       lazy.enable = true;
       comment.enable = true;
       treesitter.enable = true;
-      nvim-colorizer.enable = true;
+      colorizer.enable = true;
     };
   };
   programs.nixvim.extraPlugins = [

From 0bc9f25a7db8ba8976ea5f2b8bbb5ae355fe5aad Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Tue, 25 Feb 2025 12:41:13 +0200
Subject: [PATCH 33/49] nixvim: Install `noice`

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/nixvim/nixvim.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/home-manager/nixvim/nixvim.nix b/home-manager/nixvim/nixvim.nix
index 9b97893..5d6a0a9 100644
--- a/home-manager/nixvim/nixvim.nix
+++ b/home-manager/nixvim/nixvim.nix
@@ -70,6 +70,12 @@
       treesitter.enable = true;
       colorizer.enable = true;
     };
+    plugins.noice= {
+      enable = true;
+      settings.presets = {
+        command_palette = true;
+      };
+    };
   };
   programs.nixvim.extraPlugins = [
     pkgs.vimPlugins.legendary-nvim

From 85fa60b0af71de47ca5954ff93119250ba656385 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Tue, 25 Feb 2025 12:54:17 +0200
Subject: [PATCH 34/49] packages: Specify package set for KDE packages

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/home-manager/packages.nix b/home-manager/packages.nix
index 1a39ed6..fc5999a 100644
--- a/home-manager/packages.nix
+++ b/home-manager/packages.nix
@@ -4,8 +4,8 @@
     lxqt.pavucontrol-qt
     alacritty
     usbimager
-    kdeplasma-addons
-    plasma-systemmonitor
+    kdePackages.kdeplasma-addons
+    kdePackages.plasma-systemmonitor
 
     # CLI
     fzf

From 170b69666c39c5985537e32bb81d1de954c49385 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Wed, 21 May 2025 15:06:39 +0300
Subject: [PATCH 35/49] fish: Add `--flake` in nix aliases

I remember the commands working without it, but it changed a few months ago

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/fish.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/home-manager/fish.nix b/home-manager/fish.nix
index ca5c7a5..236a5ff 100644
--- a/home-manager/fish.nix
+++ b/home-manager/fish.nix
@@ -27,10 +27,10 @@
 
       # Nix
       "nrs" = "sudo nixos-rebuild switch --flake path:/home/gkaklas/nix/nixos/";
-      "upn" = "sudo nix flake update path:/home/gkaklas/nix/nixos/";
+      "upn" = "sudo nix flake update --flake path:/home/gkaklas/nix/nixos/";
       "cln" = "sudo nix profile wipe-history --older-than 7d --profile /nix/var/nix/profiles/system";
       "hms" = "home-manager switch --flake path:/home/gkaklas/nix/home-manager/";
-      "uph" = "nix flake update path:/home/gkaklas/nix/home-manager/ ";
+      "uph" = "nix flake update --flake path:/home/gkaklas/nix/home-manager/ ";
       "clh" = "nix profile wipe-history --older-than 7d";
       "update" = "upn && nrs && cln && uph && hms && clh && nix store gc";
 

From 0189f06255375d16daff605ead361d95074a3020 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Wed, 21 May 2025 15:09:05 +0300
Subject: [PATCH 36/49] fish: Add plain `home-manager` alias

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/fish.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home-manager/fish.nix b/home-manager/fish.nix
index 236a5ff..db0c9d5 100644
--- a/home-manager/fish.nix
+++ b/home-manager/fish.nix
@@ -30,6 +30,7 @@
       "upn" = "sudo nix flake update --flake path:/home/gkaklas/nix/nixos/";
       "cln" = "sudo nix profile wipe-history --older-than 7d --profile /nix/var/nix/profiles/system";
       "hms" = "home-manager switch --flake path:/home/gkaklas/nix/home-manager/";
+      "hm"  = "home-manager --flake path:/home/gkaklas/nix/home-manager/";
       "uph" = "nix flake update --flake path:/home/gkaklas/nix/home-manager/ ";
       "clh" = "nix profile wipe-history --older-than 7d";
       "update" = "upn && nrs && cln && uph && hms && clh && nix store gc";

From 0fece5e6d1dd045f39ed10b650fc386511bf043f Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Wed, 21 May 2025 15:09:29 +0300
Subject: [PATCH 37/49] fish: Add `home-manager expire-generations` when
 cleaning home profile

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/fish.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home-manager/fish.nix b/home-manager/fish.nix
index db0c9d5..333d44a 100644
--- a/home-manager/fish.nix
+++ b/home-manager/fish.nix
@@ -32,7 +32,7 @@
       "hms" = "home-manager switch --flake path:/home/gkaklas/nix/home-manager/";
       "hm"  = "home-manager --flake path:/home/gkaklas/nix/home-manager/";
       "uph" = "nix flake update --flake path:/home/gkaklas/nix/home-manager/ ";
-      "clh" = "nix profile wipe-history --older-than 7d";
+      "clh" = "nix profile wipe-history --older-than 7d && home-manager expire-generations '-7 days'";
       "update" = "upn && nrs && cln && uph && hms && clh && nix store gc";
 
       # git

From 8d4778c90f02468379589e156b4fd5856c6050ba Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Wed, 21 May 2025 15:10:29 +0300
Subject: [PATCH 38/49] fish: `nix store optimise` after updates, and send an
 ntfy notification

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/fish.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home-manager/fish.nix b/home-manager/fish.nix
index 333d44a..5a55e32 100644
--- a/home-manager/fish.nix
+++ b/home-manager/fish.nix
@@ -33,7 +33,7 @@
       "hm"  = "home-manager --flake path:/home/gkaklas/nix/home-manager/";
       "uph" = "nix flake update --flake path:/home/gkaklas/nix/home-manager/ ";
       "clh" = "nix profile wipe-history --older-than 7d && home-manager expire-generations '-7 days'";
-      "update" = "upn && nrs && cln && uph && hms && clh && nix store gc";
+      "update" = "upn && nrs && cln && uph && hms && clh && nix store gc && nix store optimise && ntfy pub kelly 'Update done!'";
 
       # git
       "gc" = "git commit --verbose --gpg-sign --signoff";

From 7e4325b8bd46ac1006162e3c018b1d04b7382cf4 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Wed, 21 May 2025 15:12:39 +0300
Subject: [PATCH 39/49] fish: Add some `git` aliases

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/fish.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/home-manager/fish.nix b/home-manager/fish.nix
index 5a55e32..ebdb021 100644
--- a/home-manager/fish.nix
+++ b/home-manager/fish.nix
@@ -39,6 +39,10 @@
       "gc" = "git commit --verbose --gpg-sign --signoff";
       "gc!" = "git commit --verbose --gpg-sign --signoff --amend";
       "gst" = "git status";
+      "gd" = "git diff";
+      "grbi" = "git rebase -i";
+      "grba" = "git rebase --abort";
+      "grbc" = "git rebase --continue";
       "gdca" = "git diff --cached";
       "gapa" = "git add --patched";
       "glola" = "git log --graph --pretty=\"%G?-%C(magenta)%h %C(yellow)(%al)%C(cyan): %s\" --color=always";

From 461bcfb9b669c0e3e5b4edb6e612443fb0ffd6f7 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Wed, 21 May 2025 15:15:07 +0300
Subject: [PATCH 40/49] fish: Add some custom aliases

 `zelly`,`e`,`cdt`

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/fish.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/home-manager/fish.nix b/home-manager/fish.nix
index ebdb021..6f82d40 100644
--- a/home-manager/fish.nix
+++ b/home-manager/fish.nix
@@ -46,6 +46,12 @@
       "gdca" = "git diff --cached";
       "gapa" = "git add --patched";
       "glola" = "git log --graph --pretty=\"%G?-%C(magenta)%h %C(yellow)(%al)%C(cyan): %s\" --color=always";
+
+      # zellij + kelly + jelly + it's fun and memorable
+      "zelly" = "zellij attach -c main";
+      # TODO: I tried calling $EDITOR but it wouldn't work
+      "e" = "nvim";
+      "cdt" = "cd (mktemp -d)";
     };
 
     shellAbbrs = {

From 09a595c8db63230478fabdc5b87649805a94c44c Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Wed, 21 May 2025 15:17:53 +0300
Subject: [PATCH 41/49] fish: Add `nix shell` functions

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/fish.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/home-manager/fish.nix b/home-manager/fish.nix
index 6f82d40..7caf1b3 100644
--- a/home-manager/fish.nix
+++ b/home-manager/fish.nix
@@ -53,6 +53,10 @@
       "e" = "nvim";
       "cdt" = "cd (mktemp -d)";
     };
+    functions = {
+      ns = "nix shell nixpkgs#$argv[1]";
+      nss = "nix shell nixpkgs#$argv[1] -c $argv";
+    };
 
     shellAbbrs = {
       "-h" = {

From d5e3af6627e31f9dbdbbdc9e8380871c21fe4ed9 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Wed, 21 May 2025 15:20:03 +0300
Subject: [PATCH 42/49] homeFiles: Use `btrfs` driver for containers

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/homeFiles.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home-manager/homeFiles.nix b/home-manager/homeFiles.nix
index 6224b34..48d1513 100644
--- a/home-manager/homeFiles.nix
+++ b/home-manager/homeFiles.nix
@@ -18,6 +18,7 @@
   home.file.".config/containers/storage.conf".text = ''
     [storage]
     rootless_storage_path="/mnt/storage/.containers"
+    driver="btrfs"
   '';
 
   home.file.".config/keepassxc/keepassxc.ini".text = ''

From 52f81444c9e66421f6801c5d82947714cb6d9f15 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Wed, 21 May 2025 15:24:17 +0300
Subject: [PATCH 43/49] home-manager: Add mpv.nix

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/config.nix |  1 +
 home-manager/mpv.nix    | 45 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 home-manager/mpv.nix

diff --git a/home-manager/config.nix b/home-manager/config.nix
index 325aa4a..f977230 100644
--- a/home-manager/config.nix
+++ b/home-manager/config.nix
@@ -5,6 +5,7 @@
     ./starship.nix
     ./firefox.nix
     ./cli.nix
+    ./mpv.nix
   ];
   services.syncthing = {
     enable = true;
diff --git a/home-manager/mpv.nix b/home-manager/mpv.nix
new file mode 100644
index 0000000..0716f05
--- /dev/null
+++ b/home-manager/mpv.nix
@@ -0,0 +1,45 @@
+{pkgs, ...}: {
+  programs.mpv = {
+    enable = true;
+    config={
+      volume = 50;
+      slang = "en,eng";
+      alang = "en,eng";
+      sub-scale-with-window=true;
+      fullscreen = true;
+      pause = true;
+    };
+
+    bindings = {
+      t = "show-progress";
+
+      UP = "add volume 5";
+      DOWN = "add volume -5";
+      WHEEL_UP = "add volume 5";
+      WHEEL_DOWN = "add volume -5";
+
+      RIGHT = "seek 10 exact";
+      LEFT = "seek -10 exact";
+      "Shift+RIGHT" = "seek 3 exact";
+      "Shift+LEFT" = "seek -3 exact";
+      "Ctrl+RIGHT" = "seek 60 exact";
+      "Ctrl+LEFT" = "seek -60 exact";
+
+      g = "add sub-delay -0.1";
+      h = "add sub-delay 0.1";
+      j = "add audio-delay -0.05";
+      k = "add audio-delay 0.05";
+
+      v = "cycle sub";
+      V = "cycle sub-visibility";
+
+      "[" = "add speed -0.01";
+      "]" = "add speed 0.01";
+
+      n = "playlist-next force";
+      p = "playlist-prev force";
+
+      Enter = "ignore";
+    };
+  };
+}

From 3d19b9c113ba4699f69114abe83dc6f8dc9a11c4 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Wed, 21 May 2025 15:32:22 +0300
Subject: [PATCH 44/49] zellij: Add `df` parameters

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/zellij.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/home-manager/zellij.nix b/home-manager/zellij.nix
index b027634..7b1d1c2 100644
--- a/home-manager/zellij.nix
+++ b/home-manager/zellij.nix
@@ -36,8 +36,8 @@
           pane {
             pane command="htop"
             pane command="watch" {
-    	  args "df" "-h"
-    	}
+              args "df -x tmpfs -x devtmpfs -x efivarfs -h"
+            }
             pane
           }
         }

From a4b0f0847d641c12e43513bd19c50c0d7e6ce9a4 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Wed, 21 May 2025 15:33:24 +0300
Subject: [PATCH 45/49] zellij: Run `sensors` in the main pane

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/zellij.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/home-manager/zellij.nix b/home-manager/zellij.nix
index 7b1d1c2..8ea20ed 100644
--- a/home-manager/zellij.nix
+++ b/home-manager/zellij.nix
@@ -38,7 +38,9 @@
             pane command="watch" {
               args "df -x tmpfs -x devtmpfs -x efivarfs -h"
             }
-            pane
+            pane command="watch" {
+              args "sensors k10temp-pci-00c3"
+            }
           }
         }
       }

From 785d13d7fdab1da736d39b69f84d4ea3a85f712f Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Wed, 21 May 2025 15:34:59 +0300
Subject: [PATCH 46/49] zellij: `rounded_corners true`

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/zellij.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/home-manager/zellij.nix b/home-manager/zellij.nix
index 8ea20ed..a620063 100644
--- a/home-manager/zellij.nix
+++ b/home-manager/zellij.nix
@@ -13,6 +13,10 @@
       normal {
         bind "Ctrl w" { SwitchToMode "pane"; }
         bind "Ctrl '" { SwitchToMode "session"; }
+    }
+    ui {
+      pane_frames {
+          rounded_corners true
       }
     }
   '';

From 6b465331a061ffd100b88518426509b2cf74514c Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Wed, 21 May 2025 15:36:50 +0300
Subject: [PATCH 47/49] zellij: Update `HM` pane

* cd into the home-manager directory
* `watchexec` to apply configuration automatically

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/zellij.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/home-manager/zellij.nix b/home-manager/zellij.nix
index a620063..0b1bcf3 100644
--- a/home-manager/zellij.nix
+++ b/home-manager/zellij.nix
@@ -48,10 +48,14 @@
           }
         }
       }
-      tab name="HM" cwd="~/nix" {
+      tab name="HM" cwd="~/nix/home-manager" {
         pane split_direction="vertical" {
           pane
-          pane
+          pane command="watchexec" {
+            args "-c" "--" "home-manager" "switch" "--flake" "path:/home/gkaklas/nix/home-manager/"
+          }
+        }
+      }
         }
       }
     }

From fbcdfa19ed10fa2c9544876eeb170cee80ddb545 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Wed, 21 May 2025 15:40:06 +0300
Subject: [PATCH 48/49] config: Add `ssh.nix`

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/config.nix | 1 +
 home-manager/ssh.nix    | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 home-manager/ssh.nix

diff --git a/home-manager/config.nix b/home-manager/config.nix
index f977230..9da135d 100644
--- a/home-manager/config.nix
+++ b/home-manager/config.nix
@@ -6,6 +6,7 @@
     ./firefox.nix
     ./cli.nix
     ./mpv.nix
+    ./ssh.nix
   ];
   services.syncthing = {
     enable = true;
diff --git a/home-manager/ssh.nix b/home-manager/ssh.nix
new file mode 100644
index 0000000..c153dae
--- /dev/null
+++ b/home-manager/ssh.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  programs.ssh.enable = true;
+}

From f930ad59f554ee9fe050bb8c0ddc39f39d236615 Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas@gkaklas.gr>
Date: Wed, 21 May 2025 15:42:41 +0300
Subject: [PATCH 49/49] nixvim: Add `web-devicons` plugin

Signed-off-by: George Kaklamanos <gkaklas@gkaklas.gr>
---
 home-manager/nixvim/nixvim.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home-manager/nixvim/nixvim.nix b/home-manager/nixvim/nixvim.nix
index 5d6a0a9..6a3adc7 100644
--- a/home-manager/nixvim/nixvim.nix
+++ b/home-manager/nixvim/nixvim.nix
@@ -16,6 +16,7 @@
       headlines.enable = true;
       neoscroll.enable = true;
       statuscol.enable = true;
+      web-devicons.enable =true;
 
       telescope.enable = true;
       telescope.extensions = {