chore: formatter

.gitignore

@@ -1,3 +1,2 @@
 .direnv
 result
-lazy-lock.json

dotfiles/hypr/hosts/blueocean.conf

@@ -1,23 +0,0 @@
-# Host-specific Hyprland config: blueocean
-# Sourced from ../hyprland.conf via ~/.config/hypr/host.conf symlink.
-
-#################
-### AUTOSTART ###
-#################
-
-exec-once = 1password & firefox & thunderbird & slack & zoom &
-exec-once = waybar & mako & hypridle & swww-daemon &
-exec-once = $terminal
-exec-once = systemctl --user start hyprpolkitagent
-
-
-####################
-### WINDOW RULES ###
-####################
-
-windowrule = match:class kitty, workspace 1
-windowrule = match:class firefox, workspace 2
-windowrule = match:class Slack, workspace 3
-windowrule = match:class thunderbird, workspace 5
-windowrule = match:class 1password, workspace 9
-windowrule = match:class zoom, workspace 10

dotfiles/hypr/hosts/rihla.conf

@@ -1,21 +0,0 @@
-# Host-specific Hyprland config: rihla
-# Sourced from ../hyprland.conf via ~/.config/hypr/host.conf symlink.
-
-#################
-### AUTOSTART ###
-#################
-
-exec-once = discord & 1password & firefox &
-exec-once = waybar & mako & hypridle & swww-daemon &
-exec-once = $terminal
-exec-once = systemctl --user start hyprpolkitagent
-
-
-####################
-### WINDOW RULES ###
-####################
-
-windowrule = match:class ghostty, workspace 1
-windowrule = match:class firefox, workspace 2
-windowrule = match:class discord, workspace 3
-windowrule = match:class 1password, workspace 9

dotfiles/hypr/hypridle.conf

@@ -5,7 +5,7 @@ general {
 }
 
 listener {
-  timeout = 300                                # 5min.
+  timeout = 150                                # 2.5min.
   on-timeout = brightnessctl -s set 10         # set monitor backlight to minimum, avoid 0 on OLED monitor.
   on-resume = brightnessctl -r                 # monitor backlight restore.
 }

dotfiles/hypr/hyprland.conf

@@ -30,13 +30,17 @@ $fileManager = dolphin
 $menu = wofi --show drun
 
 
-##############################
+#################
-### HOST-SPECIFIC INCLUDES ###
+### AUTOSTART ###
-##############################
+#################
 
-# Host-specific autostart + window rules.
+# Autostart necessary processes (like notifications daemons, status bars, etc.)
-# Symlinked by home-manager to dotfiles/hypr/hosts/${hostSpec.hostName}.conf.
+# Or execute your favorite apps at launch like this:
-source = ~/.config/hypr/host.conf
+
+exec-once = steam & proton-mail & obsidian & discord & 1password & firefox
+exec-once = waybar & mako & hypridle
+exec-once = $terminal
+exec-once = systemctl --user start hyprpolkitagent
 
 #############################
 ### ENVIRONMENT VARIABLES ###
@@ -134,7 +138,13 @@ animations {
 # uncomment all if you wish to use that.
 # workspace = w[tv1], gapsout:0, gapsin:0
 # workspace = f[1], gapsout:0, gapsin:0
-# Host-specific windowrule match:class entries live in host.conf (sourced above).
+windowrulev2 = workspace 1, class:^(ghostty)$
+windowrulev2 = workspace 2, class:^(firefox)$
+windowrulev2 = workspace 3, class:^(discord)$
+windowrulev2 = workspace 4, class:^(steam)$
+windowrulev2 = workspace 5, class:^(Proton Mail)$
+windowrulev2 = workspace 6, class:^(obsidian)$
+windowrulev2 = workspace 9, class:^(1Password)$
 
 # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
 dwindle {
@@ -199,7 +209,7 @@ bind = $mainMod, E, exec, $fileManager
 bind = $mainMod, V, togglefloating,
 bind = $mainMod, space, exec, $menu
 bind = $mainMod, P, pseudo, # dwindle
-bind = $mainMod, J, layoutmsg, togglesplit, # dwindle
+bind = $mainMod, J, togglesplit, # dwindle
 bind = , PRINT, exec, hyprshot -m window
 bind = shift, PRINT, exec, hyprshot -m region
 bind = $mainMod, L, exec, hyprlock
@@ -274,7 +284,7 @@ bindl = , XF86AudioPrev, exec, playerctl previous
 # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
 
 # Ignore maximize requests from apps. You'll probably like this.
-# windowrulev2 = suppressevent maximize, class:.*
+windowrulev2 = suppressevent maximize, class:.*
 
 # Fix some dragging issues with XWayland
-# windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
+windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0

dotfiles/npm/.npmrc

@@ -1 +0,0 @@
-registry=https://npm.dogar.dev

dotfiles/nvim/flake.nix

@@ -10,39 +10,33 @@
     };
   };
 
-  outputs =
+  outputs = {
-    {
+    self,
-      self,
+    nixpkgs,
-      nixpkgs,
+    flake-utils,
-      flake-utils,
+    fenix,
-      fenix,
+  }:
-    }:
+    flake-utils.lib.eachDefaultSystem (system: let
-    flake-utils.lib.eachDefaultSystem (
+      pkgs = nixpkgs.legacyPackages.${system};
-      system:
+      fenixLib = fenix.packages.${system};
-      let
+      rustToolchain = fenixLib.stable.toolchain;
-        pkgs = nixpkgs.legacyPackages.${system};
+    in {
-        fenixLib = fenix.packages.${system};
+      devShells.default = pkgs.mkShell {
-        rustToolchain = fenixLib.stable.toolchain;
+        buildInputs = with pkgs; [
-      in
+          lua-language-server
-      {
+          stylua
-        devShells.default = pkgs.mkShell {
+          ripgrep
-          buildInputs = with pkgs; [
+          fd
-            lua-language-server
-            stylua
-            ripgrep
-            fd
-            nil
 
-            nodejs_24
+          nodejs_24
-            python313
+          python313
-            rustToolchain
+          rustToolchain
-          ];
+        ];
 
-          shellHook = ''
+        shellHook = ''
-            echo "Neovim development environment"
+          echo "Neovim development environment"
-            echo "nvim is configured with your local config"
+          echo "nvim is configured with your local config"
-          '';
+        '';
-        };
+      };
-      }
+    });
-    );
 }

dotfiles/nvim/init.lua

@@ -1,37 +1,21 @@
-vim.g.base46_cache = vim.fn.stdpath "data" .. "/base46/"
+require "core"
-vim.g.mapleader = " "
 
--- bootstrap lazy and all plugins
+local custom_init_path = vim.api.nvim_get_runtime_file("lua/custom/init.lua", false)[1]
-local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim"
 
-if not vim.uv.fs_stat(lazypath) then
+if custom_init_path then
-  local repo = "https://github.com/folke/lazy.nvim.git"
+  dofile(custom_init_path)
-  vim.fn.system { "git", "clone", "--filter=blob:none", repo, "--branch=stable", lazypath }
 end
 
-vim.opt.rtp:prepend(lazypath)
+require("core.utils").load_mappings()
 
-local lazy_config = require "configs.lazy"
+local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim"
 
--- load plugins
+-- bootstrap lazy.nvim!
-require("lazy").setup({
+if not vim.loop.fs_stat(lazypath) then
-  {
+  require("core.bootstrap").gen_chadrc_template()
-    "NvChad/NvChad",
+  require("core.bootstrap").lazy(lazypath)
-    lazy = false,
+end
-    branch = "v2.5",
-    import = "nvchad.plugins",
-  },
 
-  { import = "plugins" },
-}, lazy_config)
-
--- load theme
 dofile(vim.g.base46_cache .. "defaults")
-dofile(vim.g.base46_cache .. "statusline")
+vim.opt.rtp:prepend(lazypath)
-
+require "plugins"
-require "options"
-require "autocmds"
-
-vim.schedule(function()
-  require "mappings"
-end)

dotfiles/nvim/lazy-lock.json

@@ -1,50 +1,50 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "a62e1083a3cfe8b6b206e7d3d33a51091df25357" },
+  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "NvChad": { "branch": "v2.5", "commit": "d042cc975247c2aa55fcb228e5d146dc1dc6c648" },
+  "LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" },
-  "avante.nvim": { "branch": "main", "commit": "8c84af0f09e5d9058362ac58401a8e7b047d826e" },
+  "base46": { "branch": "v2.0", "commit": "85de6cdb2d3c85d0aee53aea0569e73fdaf3df4e" },
-  "base46": { "branch": "v3.0", "commit": "884b990dcdbe07520a0892da6ba3e8d202b46337" },
   "cloak.nvim": { "branch": "main", "commit": "648aca6d33ec011dc3166e7af3b38820d01a71e4" },
-  "cmp-async-path": { "branch": "main", "commit": "f8af3f726e07f2e9d37672eaa9102581aefce149" },
   "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" },
-  "cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" },
+  "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
+  "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "conform.nvim": { "branch": "master", "commit": "dca1a190aa85f9065979ef35802fb77131911106" },
+  "copilot.vim": { "branch": "release", "commit": "f3d66c148aa60ad04c0a21d3e0a776459de09eb2" },
-  "copilot.lua": { "branch": "master", "commit": "adff470bca742b7658228ed144589250ecb3dc0a" },
+  "crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" },
-  "crates.nvim": { "branch": "main", "commit": "694357861ec9ebf12475ddcdd04ea45a0923c32d" },
+  "formatter.nvim": { "branch": "master", "commit": "b9d7f853da1197b83b8edb4cc4952f7ad3a42e41" },
-  "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
+  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
-  "fzf-lua": { "branch": "main", "commit": "58f52b7df97aa3104db8a6763f4523e3e14e4b9b" },
   "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" },
-  "gitsigns.nvim": { "branch": "main", "commit": "6d808f99bd63303646794406e270bd553ad7792e" },
+  "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" },
   "grpc-nvim": { "branch": "main", "commit": "cd235398a9922ae412f59ebeabb0b13957be0d39" },
-  "img-clip.nvim": { "branch": "main", "commit": "b6ddfb97b5600d99afe3452d707444afda658aca" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "b7aa0aed55887edfaece23f7b46ab22232fc8741" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
-  "lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" },
   "lazydocker.nvim": { "branch": "main", "commit": "b69ff84a6223de39d34a150b980d3b9ef19549fb" },
-  "lazygit.nvim": { "branch": "main", "commit": "a04ad0dbc725134edbee3a5eea29290976695357" },
+  "lazygit.nvim": { "branch": "main", "commit": "3c524ebec6072568064235c407195e9f9fd0cb8a" },
-  "mason.nvim": { "branch": "main", "commit": "12ddd182d9efbdc848b540f16484a583d52da0fb" },
+  "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
-  "menu": { "branch": "main", "commit": "7a0a4a2896b715c066cfbe320bdc048091874cc6" },
+  "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
-  "mini.pick": { "branch": "main", "commit": "437d44eb57312f23e6b931704694fc294922cd88" },
+  "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
-  "minty": { "branch": "main", "commit": "aafc9e8e0afe6bf57580858a2849578d8d8db9e0" },
-  "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
+  "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
-  "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" },
+  "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
-  "nvim-lspconfig": { "branch": "master", "commit": "81878de76c0de4ce289513734ad80c31ec7871b8" },
+  "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
-  "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
+  "nvim-colorizer.lua": { "branch": "master", "commit": "51cf7c995ed1eb6642aecf19067ee634fa1b6ba2" },
-  "nvim-tree.lua": { "branch": "master", "commit": "d277467fc0d1d0e2bca88165a1de6b526f9f6fe8" },
+  "nvim-dap": { "branch": "master", "commit": "968f89f8aac11b6bdbfc942c71d3436658c1435f" },
-  "nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" },
+  "nvim-dap-python": { "branch": "master", "commit": "030385d03363988370adaa5cf21fa465daddb088" },
-  "nvim-web-devicons": { "branch": "master", "commit": "c72328a5494b4502947a022fe69c0c47e53b6aa6" },
+  "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
-  "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
+  "nvim-lspconfig": { "branch": "master", "commit": "3d97ec4174bcc750d70718ddedabf150536a5891" },
-  "render-markdown.nvim": { "branch": "main", "commit": "d67113f11384c0dad96fced2f7b91f1fc811e97f" },
+  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
+  "nvim-notify": { "branch": "master", "commit": "397c7c1184745fca649e5104de659e6392ef5a4d" },
+  "nvim-tree.lua": { "branch": "master", "commit": "fefa335f1c8f690eb668a1efd18ee4fc6d64cd3e" },
+  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
+  "nvim-web-devicons": { "branch": "master", "commit": "4ae47f4fb18e85b80e84b729974fe65483b06aaf" },
+  "nvterm": { "branch": "main", "commit": "9d7ba3b6e368243175d38e1ec956e0476fd86ed9" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" },
   "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
-  "snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" },
+  "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
-  "telescope.nvim": { "branch": "master", "commit": "506338434fec5ad19cb1f8d45bf92d66c4917393" },
+  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
-  "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
+  "ui": { "branch": "v2.0", "commit": "d4f7e64892a24075d5fdd5a58bd0db45e86e38ed" },
-  "ui": { "branch": "v3.0", "commit": "cb75908a86720172594b30de147272c1b3a7f452" },
+  "vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" },
-  "volt": { "branch": "main", "commit": "620de1321f275ec9d80028c68d1b88b409c0c8b1" },
+  "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
-  "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
+  "vim-dadbod-ui": { "branch": "master", "commit": "e8b53c0f3aa6e6127ac2a2d2071d9aade6c6e373" },
+  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
 }

dotfiles/nvim/lua/chadrc.lua

@@ -1,18 +0,0 @@
--- This file needs to have same structure as nvconfig.lua
--- https://github.com/NvChad/ui/blob/v3.0/lua/nvconfig.lua
-
----@type ChadrcConfig
-local M = {}
-
-M.base46 = {
-  theme = "catppuccin",
-}
-
-M.term = {
-  sizes = {
-    sp = 0.4,
-    vsp = 0.5,
-  },
-}
-
-return M

dotfiles/nvim/lua/configs/conform.lua

@@ -1,9 +0,0 @@
-local options = {
-  formatters_by_ft = {
-    lua = { "stylua" },
-    javascript = { "prettier" },
-    typescript = { "prettier" },
-  },
-}
-
-return options

dotfiles/nvim/lua/configs/lspconfig.lua

@@ -1,87 +0,0 @@
-local nvlsp = require "nvchad.configs.lspconfig"
-
--- remove <leader>q from LSP mappings (user override for save+quit)
-local orig_on_attach = nvlsp.on_attach
-nvlsp.on_attach = function(client, bufnr)
-  orig_on_attach(client, bufnr)
-  pcall(vim.keymap.del, "n", "<leader>q", { buffer = bufnr })
-end
-
-nvlsp.defaults()
-
-local custom_on_attach = function(client, bufnr)
-  nvlsp.on_attach(client, bufnr)
-
-  if client.name == "ts_ls" then
-    vim.api.nvim_buf_create_user_command(bufnr, "OrganizeImports", function()
-      vim.lsp.buf.execute_command {
-        command = "_typescript.organizeImports",
-        arguments = { vim.api.nvim_buf_get_name(0) },
-      }
-    end, { desc = "Organize Imports" })
-  end
-end
-
-vim.lsp.config("ts_ls", {
-  on_attach = custom_on_attach,
-  capabilities = nvlsp.capabilities,
-  init_options = {
-    preferences = {
-      disablesuggestions = true,
-    },
-  },
-})
-vim.lsp.enable "ts_ls"
-
-vim.lsp.config("terraformls", {
-  on_attach = nvlsp.on_attach,
-  capabilities = nvlsp.capabilities,
-})
-vim.lsp.enable "terraformls"
-
-vim.lsp.config("tflint", {
-  on_attach = nvlsp.on_attach,
-  capabilities = nvlsp.capabilities,
-})
-vim.lsp.enable "tflint"
-
-vim.lsp.config("gopls", {
-  on_attach = nvlsp.on_attach,
-  capabilities = nvlsp.capabilities,
-  cmd = { "gopls" },
-  filetypes = { "go", "gomod", "gowork", "gotempl" },
-  root_markers = { "go.mod", "go.work" },
-  settings = {
-    gopls = {
-      completeUnimported = true,
-      usePlaceholders = true,
-      analyses = {
-        unusedparams = true,
-      },
-    },
-  },
-})
-vim.lsp.enable "gopls"
-
-vim.lsp.config("pyright", {
-  on_attach = nvlsp.on_attach,
-  capabilities = nvlsp.capabilities,
-  filetypes = { "python" },
-})
-vim.lsp.enable "pyright"
-
-vim.lsp.config("nil_ls", {
-  on_attach = nvlsp.on_attach,
-  capabilities = nvlsp.capabilities,
-  cmd = { "nil" },
-  filetypes = { "nix" },
-  settings = {
-    ["nil"] = {
-      testSetting = 42,
-      formatting = {
-        command = { "nixfmt" },
-      },
-    },
-  },
-})
-vim.lsp.enable "nil_ls"

dotfiles/nvim/lua/core/bootstrap.lua

@@ -0,0 +1,54 @@
+local M = {}
+local fn = vim.fn
+
+M.echo = function(str)
+  vim.cmd "redraw"
+  vim.api.nvim_echo({ { str, "Bold" } }, true, {})
+end
+
+local function shell_call(args)
+  local output = fn.system(args)
+  assert(vim.v.shell_error == 0, "External call failed with error code: " .. vim.v.shell_error .. "\n" .. output)
+end
+
+M.lazy = function(install_path)
+  ------------- base46 ---------------
+  local lazy_path = fn.stdpath "data" .. "/lazy/base46"
+
+  M.echo "  Compiling base46 theme to bytecode ..."
+
+  local base46_repo = "https://github.com/NvChad/base46"
+  shell_call { "git", "clone", "--depth", "1", "-b", "v2.0", base46_repo, lazy_path }
+  vim.opt.rtp:prepend(lazy_path)
+
+  require("base46").compile()
+
+  --------- lazy.nvim ---------------
+  M.echo "  Installing lazy.nvim & plugins ..."
+  local repo = "https://github.com/folke/lazy.nvim.git"
+  shell_call { "git", "clone", "--filter=blob:none", "--branch=stable", repo, install_path }
+  vim.opt.rtp:prepend(install_path)
+
+  -- install plugins
+  require "plugins"
+
+  -- mason packages & show post_bootstrap screen
+  require "nvchad.post_install"()
+end
+
+M.gen_chadrc_template = function()
+  local path = fn.stdpath "config" .. "/lua/custom"
+
+  if fn.isdirectory(path) ~= 1 then
+    -- use very minimal chadrc
+    fn.mkdir(path, "p")
+
+    local file = io.open(path .. "/chadrc.lua", "w")
+    if file then
+      file:write "---@type ChadrcConfig\nlocal M = {}\n\nM.ui = { theme = 'onedark' }\n\nreturn M"
+      file:close()
+    end
+  end
+end
+
+return M

dotfiles/nvim/lua/core/default_config.lua

@@ -0,0 +1,92 @@
+local M = {}
+
+M.options = {
+  nvchad_branch = "v2.0",
+}
+
+M.ui = {
+  ------------------------------- base46 -------------------------------------
+  -- hl = highlights
+  hl_add = {},
+  hl_override = {},
+  changed_themes = {},
+  theme_toggle = { "onedark", "one_light" },
+  theme = "onedark", -- default theme
+  transparency = false,
+  lsp_semantic_tokens = false, -- needs nvim v0.9, just adds highlight groups for lsp semantic tokens
+
+  -- https://github.com/NvChad/base46/tree/v2.0/lua/base46/extended_integrations
+  extended_integrations = {}, -- these aren't compiled by default, ex: "alpha", "notify"
+
+  -- cmp themeing
+  cmp = {
+    icons = true,
+    lspkind_text = true,
+    style = "default", -- default/flat_light/flat_dark/atom/atom_colored
+    border_color = "grey_fg", -- only applicable for "default" style, use color names from base30 variables
+    selected_item_bg = "colored", -- colored / simple
+  },
+
+  telescope = { style = "borderless" }, -- borderless / bordered
+
+  ------------------------------- nvchad_ui modules -----------------------------
+  statusline = {
+    theme = "default", -- default/vscode/vscode_colored/minimal
+    -- default/round/block/arrow separators work only for default statusline theme
+    -- round and block will work for minimal theme only
+    separator_style = "default",
+    overriden_modules = nil,
+  },
+
+  -- lazyload it when there are 1+ buffers
+  tabufline = {
+    show_numbers = false,
+    enabled = true,
+    lazyload = true,
+    overriden_modules = nil,
+  },
+
+  -- nvdash (dashboard)
+  nvdash = {
+    load_on_startup = false,
+
+    header = {
+      "           ▄ ▄                   ",
+      "       ▄   ▄▄▄     ▄ ▄▄▄ ▄ ▄     ",
+      "       █ ▄ █▄█ ▄▄▄ █ █▄█ █ █     ",
+      "    ▄▄ █▄█▄▄▄█ █▄█▄█▄▄█▄▄█ █     ",
+      "  ▄ █▄▄█ ▄ ▄▄ ▄█ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄  ",
+      "  █▄▄▄▄ ▄▄▄ █ ▄ ▄▄▄ ▄ ▄▄▄ ▄ ▄ █ ▄",
+      "▄ █ █▄█ █▄█ █ █ █▄█ █ █▄█ ▄▄▄ █ █",
+      "█▄█ ▄ █▄▄█▄▄█ █ ▄▄█ █ ▄ █ █▄█▄█ █",
+      "    █▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄█ █▄█▄▄▄█    ",
+    },
+
+    buttons = {
+      { "  Find File", "Spc f f", "Telescope find_files" },
+      { "󰈚  Recent Files", "Spc f o", "Telescope oldfiles" },
+      { "󰈭  Find Word", "Spc f w", "Telescope live_grep" },
+      { "  Bookmarks", "Spc m a", "Telescope marks" },
+      { "  Themes", "Spc t h", "Telescope themes" },
+      { "  Mappings", "Spc c h", "NvCheatsheet" },
+    },
+  },
+
+  cheatsheet = { theme = "grid" }, -- simple/grid
+
+  lsp = {
+    -- show function signatures i.e args as you type
+    signature = {
+      disabled = false,
+      silent = true, -- silences 'no signature help available' message from appearing
+    },
+  },
+}
+
+M.plugins = "" -- path i.e "custom.plugins", so make custom/plugins.lua file
+
+M.lazy_nvim = require "plugins.configs.lazy_nvim" -- config for lazy.nvim startup options
+
+M.mappings = require "core.mappings"
+
+return M

dotfiles/nvim/lua/core/init.lua

@@ -0,0 +1,141 @@
+local opt = vim.opt
+local g = vim.g
+local config = require("core.utils").load_config()
+
+-------------------------------------- globals -----------------------------------------
+g.nvchad_theme = config.ui.theme
+g.base46_cache = vim.fn.stdpath "data" .. "/nvchad/base46/"
+g.toggle_theme_icon = "   "
+g.transparency = config.ui.transparency
+
+-------------------------------------- options ------------------------------------------
+opt.laststatus = 3 -- global statusline
+opt.showmode = false
+
+opt.clipboard = "unnamedplus"
+opt.cursorline = true
+
+-- Indenting
+opt.expandtab = true
+opt.shiftwidth = 2
+opt.smartindent = true
+opt.tabstop = 2
+opt.softtabstop = 2
+
+opt.fillchars = { eob = " " }
+opt.ignorecase = true
+opt.smartcase = true
+opt.mouse = "a"
+
+-- Numbers
+opt.number = true
+opt.numberwidth = 2
+opt.ruler = false
+
+-- disable nvim intro
+opt.shortmess:append "sI"
+
+opt.signcolumn = "yes"
+opt.splitbelow = true
+opt.splitright = true
+opt.termguicolors = true
+opt.timeoutlen = 400
+opt.undofile = true
+
+-- interval for writing swap file to disk, also used by gitsigns
+opt.updatetime = 250
+
+-- go to previous/next line with h,l,left arrow and right arrow
+-- when cursor reaches end/beginning of line
+opt.whichwrap:append "<>[]hl"
+
+g.mapleader = " "
+
+-- disable some default providers
+for _, provider in ipairs { "node", "perl", "python3", "ruby" } do
+  vim.g["loaded_" .. provider .. "_provider"] = 0
+end
+
+-- add binaries installed by mason.nvim to path
+local is_windows = vim.fn.has("win32") ~= 0
+vim.env.PATH = vim.fn.stdpath "data" .. "/mason/bin" .. (is_windows and ";" or ":") .. vim.env.PATH
+
+-------------------------------------- autocmds ------------------------------------------
+local autocmd = vim.api.nvim_create_autocmd
+
+-- dont list quickfix buffers
+autocmd("FileType", {
+  pattern = "qf",
+  callback = function()
+    vim.opt_local.buflisted = false
+  end,
+})
+
+-- reload some chadrc options on-save
+autocmd("BufWritePost", {
+  pattern = vim.tbl_map(function(path)
+    return vim.fs.normalize(vim.loop.fs_realpath(path))
+  end, vim.fn.glob(vim.fn.stdpath "config" .. "/lua/custom/**/*.lua", true, true, true)),
+  group = vim.api.nvim_create_augroup("ReloadNvChad", {}),
+
+  callback = function(opts)
+    local fp = vim.fn.fnamemodify(vim.fs.normalize(vim.api.nvim_buf_get_name(opts.buf)), ":r") --[[@as string]]
+    local app_name = vim.env.NVIM_APPNAME and vim.env.NVIM_APPNAME or "nvim"
+    local module = string.gsub(fp, "^.*/" .. app_name .. "/lua/", ""):gsub("/", ".")
+
+    require("plenary.reload").reload_module "base46"
+    require("plenary.reload").reload_module(module)
+    require("plenary.reload").reload_module "custom.chadrc"
+
+    config = require("core.utils").load_config()
+
+    vim.g.nvchad_theme = config.ui.theme
+    vim.g.transparency = config.ui.transparency
+
+    -- statusline
+    require("plenary.reload").reload_module("nvchad.statusline." .. config.ui.statusline.theme)
+    vim.opt.statusline = "%!v:lua.require('nvchad.statusline." .. config.ui.statusline.theme .. "').run()"
+
+    -- tabufline
+    if config.ui.tabufline.enabled then
+      require("plenary.reload").reload_module "nvchad.tabufline.modules"
+      vim.opt.tabline = "%!v:lua.require('nvchad.tabufline.modules').run()"
+    end
+
+    require("base46").load_all_highlights()
+    -- vim.cmd("redraw!")
+  end,
+})
+
+-- user event that loads after UIEnter + only if file buf is there
+vim.api.nvim_create_autocmd({ "UIEnter", "BufReadPost", "BufNewFile" }, {
+  group = vim.api.nvim_create_augroup("NvFilePost", { clear = true }),
+  callback = function(args)
+    local file = vim.api.nvim_buf_get_name(args.buf)
+    local buftype = vim.api.nvim_buf_get_option(args.buf, "buftype")
+
+    if not vim.g.ui_entered and args.event == "UIEnter" then
+      vim.g.ui_entered = true
+    end
+
+    if file ~= "" and buftype ~= "nofile" and vim.g.ui_entered then
+      vim.api.nvim_exec_autocmds("User", { pattern = "FilePost", modeline = false })
+      vim.api.nvim_del_augroup_by_name "NvFilePost"
+
+      vim.schedule(function()
+        vim.api.nvim_exec_autocmds("FileType", {})
+
+        if vim.g.editorconfig then
+          require("editorconfig").config(args.buf)
+        end
+      end, 0)
+    end
+  end,
+})
+
+-------------------------------------- commands ------------------------------------------
+local new_cmd = vim.api.nvim_create_user_command
+
+new_cmd("NvChadUpdate", function()
+  require "nvchad.updater"()
+end, {})

dotfiles/nvim/lua/core/mappings.lua

@@ -0,0 +1,468 @@
+-- n, v, i, t = mode names
+
+local M = {}
+
+M.general = {
+  i = {
+    -- go to  beginning and end
+    ["<C-b>"] = { "<ESC>^i", "Beginning of line" },
+    ["<C-e>"] = { "<End>", "End of line" },
+
+    -- navigate within insert mode
+    ["<C-h>"] = { "<Left>", "Move left" },
+    ["<C-l>"] = { "<Right>", "Move right" },
+    ["<C-j>"] = { "<Down>", "Move down" },
+    ["<C-k>"] = { "<Up>", "Move up" },
+  },
+
+  n = {
+    ["<Esc>"] = { "<cmd> noh <CR>", "Clear highlights" },
+    -- switch between windows
+    ["<C-h>"] = { "<C-w>h", "Window left" },
+    ["<C-l>"] = { "<C-w>l", "Window right" },
+    ["<C-j>"] = { "<C-w>j", "Window down" },
+    ["<C-k>"] = { "<C-w>k", "Window up" },
+
+    -- save
+    ["<C-s>"] = { "<cmd> w <CR>", "Save file" },
+
+    -- Copy all
+    ["<C-c>"] = { "<cmd> %y+ <CR>", "Copy whole file" },
+
+    -- line numbers
+    ["<leader>n"] = { "<cmd> set nu! <CR>", "Toggle line number" },
+    ["<leader>rn"] = { "<cmd> set rnu! <CR>", "Toggle relative number" },
+
+    -- Allow moving the cursor through wrapped lines with j, k, <Up> and <Down>
+    -- http://www.reddit.com/r/vim/comments/2k4cbr/problem_with_gj_and_gk/
+    -- empty mode is same as using <cmd> :map
+    -- also don't use g[j|k] when in operator pending mode, so it doesn't alter d, y or c behaviour
+    ["j"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } },
+    ["k"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } },
+    ["<Up>"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } },
+    ["<Down>"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } },
+
+    -- new buffer
+    ["<leader>b"] = { "<cmd> enew <CR>", "New buffer" },
+    ["<leader>ch"] = { "<cmd> NvCheatsheet <CR>", "Mapping cheatsheet" },
+
+    ["<leader>fm"] = {
+      function()
+        vim.lsp.buf.format { async = true }
+      end,
+      "LSP formatting",
+    },
+  },
+
+  t = {
+    ["<C-x>"] = { vim.api.nvim_replace_termcodes("<C-\\><C-N>", true, true, true), "Escape terminal mode" },
+  },
+
+  v = {
+    ["<Up>"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } },
+    ["<Down>"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } },
+    ["<"] = { "<gv", "Indent line" },
+    [">"] = { ">gv", "Indent line" },
+  },
+
+  x = {
+    ["j"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } },
+    ["k"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } },
+    -- Don't copy the replaced text after pasting in visual mode
+    -- https://vim.fandom.com/wiki/Replace_a_word_with_yanked_text#Alternative_mapping_for_paste
+    ["p"] = { 'p:let @+=@0<CR>:let @"=@0<CR>', "Dont copy replaced text", opts = { silent = true } },
+  },
+}
+
+M.tabufline = {
+  plugin = true,
+
+  n = {
+    -- cycle through buffers
+    ["<tab>"] = {
+      function()
+        require("nvchad.tabufline").tabuflineNext()
+      end,
+      "Goto next buffer",
+    },
+
+    ["<S-tab>"] = {
+      function()
+        require("nvchad.tabufline").tabuflinePrev()
+      end,
+      "Goto prev buffer",
+    },
+
+    -- close buffer + hide terminal buffer
+    ["<leader>x"] = {
+      function()
+        require("nvchad.tabufline").close_buffer()
+      end,
+      "Close buffer",
+    },
+  },
+}
+
+M.comment = {
+  plugin = true,
+
+  -- toggle comment in both modes
+  n = {
+    ["<leader>/"] = {
+      function()
+        require("Comment.api").toggle.linewise.current()
+      end,
+      "Toggle comment",
+    },
+  },
+
+  v = {
+    ["<leader>/"] = {
+      "<ESC><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<CR>",
+      "Toggle comment",
+    },
+  },
+}
+
+M.lspconfig = {
+  plugin = true,
+
+  -- See `<cmd> :help vim.lsp.*` for documentation on any of the below functions
+
+  n = {
+    ["gD"] = {
+      function()
+        vim.lsp.buf.declaration()
+      end,
+      "LSP declaration",
+    },
+
+    ["gd"] = {
+      function()
+        vim.lsp.buf.definition()
+      end,
+      "LSP definition",
+    },
+
+    ["K"] = {
+      function()
+        vim.lsp.buf.hover()
+      end,
+      "LSP hover",
+    },
+
+    ["gi"] = {
+      function()
+        vim.lsp.buf.implementation()
+      end,
+      "LSP implementation",
+    },
+
+    ["<leader>ls"] = {
+      function()
+        vim.lsp.buf.signature_help()
+      end,
+      "LSP signature help",
+    },
+
+    ["<leader>D"] = {
+      function()
+        vim.lsp.buf.type_definition()
+      end,
+      "LSP definition type",
+    },
+
+    ["<leader>ra"] = {
+      function()
+        require("nvchad.renamer").open()
+      end,
+      "LSP rename",
+    },
+
+    ["<leader>ca"] = {
+      function()
+        vim.lsp.buf.code_action()
+      end,
+      "LSP code action",
+    },
+
+    ["gr"] = {
+      function()
+        vim.lsp.buf.references()
+      end,
+      "LSP references",
+    },
+
+    ["<leader>lf"] = {
+      function()
+        vim.diagnostic.open_float { border = "rounded" }
+      end,
+      "Floating diagnostic",
+    },
+
+    ["[d"] = {
+      function()
+        vim.diagnostic.goto_prev { float = { border = "rounded" } }
+      end,
+      "Goto prev",
+    },
+
+    ["]d"] = {
+      function()
+        vim.diagnostic.goto_next { float = { border = "rounded" } }
+      end,
+      "Goto next",
+    },
+
+    ["<leader>q"] = {
+      function()
+        vim.diagnostic.setloclist()
+      end,
+      "Diagnostic setloclist",
+    },
+
+    ["<leader>wa"] = {
+      function()
+        vim.lsp.buf.add_workspace_folder()
+      end,
+      "Add workspace folder",
+    },
+
+    ["<leader>wr"] = {
+      function()
+        vim.lsp.buf.remove_workspace_folder()
+      end,
+      "Remove workspace folder",
+    },
+
+    ["<leader>wl"] = {
+      function()
+        print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+      end,
+      "List workspace folders",
+    },
+  },
+
+  v = {
+    ["<leader>ca"] = {
+      function()
+        vim.lsp.buf.code_action()
+      end,
+      "LSP code action",
+    },
+  },
+}
+
+M.nvimtree = {
+  plugin = true,
+
+  n = {
+    -- toggle
+    ["<C-n>"] = { "<cmd> NvimTreeToggle <CR>", "Toggle nvimtree" },
+
+    -- focus
+    ["<leader>e"] = { "<cmd> NvimTreeFocus <CR>", "Focus nvimtree" },
+  },
+}
+
+M.telescope = {
+  plugin = true,
+
+  n = {
+    -- find
+    ["<leader>ff"] = { "<cmd> Telescope find_files <CR>", "Find files" },
+    ["<leader>fa"] = { "<cmd> Telescope find_files follow=true no_ignore=true hidden=true <CR>", "Find all" },
+    ["<leader>fw"] = { "<cmd> Telescope live_grep <CR>", "Live grep" },
+    ["<leader>fb"] = { "<cmd> Telescope buffers <CR>", "Find buffers" },
+    ["<leader>fh"] = { "<cmd> Telescope help_tags <CR>", "Help page" },
+    ["<leader>fo"] = { "<cmd> Telescope oldfiles <CR>", "Find oldfiles" },
+    ["<leader>fz"] = { "<cmd> Telescope current_buffer_fuzzy_find <CR>", "Find in current buffer" },
+
+    -- git
+    ["<leader>cm"] = { "<cmd> Telescope git_commits <CR>", "Git commits" },
+    ["<leader>gt"] = { "<cmd> Telescope git_status <CR>", "Git status" },
+
+    -- pick a hidden term
+    ["<leader>pt"] = { "<cmd> Telescope terms <CR>", "Pick hidden term" },
+
+    -- theme switcher
+    ["<leader>th"] = { "<cmd> Telescope themes <CR>", "Nvchad themes" },
+
+    ["<leader>ma"] = { "<cmd> Telescope marks <CR>", "telescope bookmarks" },
+  },
+}
+
+M.nvterm = {
+  plugin = true,
+
+  t = {
+    -- toggle in terminal mode
+    ["<A-i>"] = {
+      function()
+        require("nvterm.terminal").toggle "float"
+      end,
+      "Toggle floating term",
+    },
+
+    ["<A-h>"] = {
+      function()
+        require("nvterm.terminal").toggle "horizontal"
+      end,
+      "Toggle horizontal term",
+    },
+
+    ["<A-v>"] = {
+      function()
+        require("nvterm.terminal").toggle "vertical"
+      end,
+      "Toggle vertical term",
+    },
+  },
+
+  n = {
+    -- toggle in normal mode
+    ["<A-i>"] = {
+      function()
+        require("nvterm.terminal").toggle "float"
+      end,
+      "Toggle floating term",
+    },
+
+    ["<A-h>"] = {
+      function()
+        require("nvterm.terminal").toggle "horizontal"
+      end,
+      "Toggle horizontal term",
+    },
+
+    ["<A-v>"] = {
+      function()
+        require("nvterm.terminal").toggle "vertical"
+      end,
+      "Toggle vertical term",
+    },
+
+    -- new
+    ["<leader>h"] = {
+      function()
+        require("nvterm.terminal").new "horizontal"
+      end,
+      "New horizontal term",
+    },
+
+    ["<leader>v"] = {
+      function()
+        require("nvterm.terminal").new "vertical"
+      end,
+      "New vertical term",
+    },
+  },
+}
+
+M.whichkey = {
+  plugin = true,
+
+  n = {
+    ["<leader>wK"] = {
+      function()
+        vim.cmd "WhichKey"
+      end,
+      "Which-key all keymaps",
+    },
+    ["<leader>wk"] = {
+      function()
+        local input = vim.fn.input "WhichKey: "
+        vim.cmd("WhichKey " .. input)
+      end,
+      "Which-key query lookup",
+    },
+  },
+}
+
+M.blankline = {
+  plugin = true,
+
+  n = {
+    ["<leader>cc"] = {
+      function()
+        local ok, start = require("indent_blankline.utils").get_current_context(
+          vim.g.indent_blankline_context_patterns,
+          vim.g.indent_blankline_use_treesitter_scope
+        )
+
+        if ok then
+          vim.api.nvim_win_set_cursor(vim.api.nvim_get_current_win(), { start, 0 })
+          vim.cmd [[normal! _]]
+        end
+      end,
+
+      "Jump to current context",
+    },
+  },
+}
+
+M.gitsigns = {
+  plugin = true,
+
+  n = {
+    -- Navigation through hunks
+    ["]c"] = {
+      function()
+        if vim.wo.diff then
+          return "]c"
+        end
+        vim.schedule(function()
+          require("gitsigns").next_hunk()
+        end)
+        return "<Ignore>"
+      end,
+      "Jump to next hunk",
+      opts = { expr = true },
+    },
+
+    ["[c"] = {
+      function()
+        if vim.wo.diff then
+          return "[c"
+        end
+        vim.schedule(function()
+          require("gitsigns").prev_hunk()
+        end)
+        return "<Ignore>"
+      end,
+      "Jump to prev hunk",
+      opts = { expr = true },
+    },
+
+    -- Actions
+    ["<leader>rh"] = {
+      function()
+        require("gitsigns").reset_hunk()
+      end,
+      "Reset hunk",
+    },
+
+    ["<leader>ph"] = {
+      function()
+        require("gitsigns").preview_hunk()
+      end,
+      "Preview hunk",
+    },
+
+    ["<leader>gb"] = {
+      function()
+        package.loaded.gitsigns.blame_line()
+      end,
+      "Blame line",
+    },
+
+    ["<leader>td"] = {
+      function()
+        require("gitsigns").toggle_deleted()
+      end,
+      "Toggle deleted",
+    },
+  },
+}
+
+return M

dotfiles/nvim/lua/core/utils.lua

@@ -0,0 +1,118 @@
+local M = {}
+local merge_tb = vim.tbl_deep_extend
+
+M.load_config = function()
+  local config = require "core.default_config"
+  local chadrc_path = vim.api.nvim_get_runtime_file("lua/custom/chadrc.lua", false)[1]
+
+  if chadrc_path then
+    local chadrc = dofile(chadrc_path)
+
+    config.mappings = M.remove_disabled_keys(chadrc.mappings, config.mappings)
+    config = merge_tb("force", config, chadrc)
+    config.mappings.disabled = nil
+  end
+
+  return config
+end
+
+M.remove_disabled_keys = function(chadrc_mappings, default_mappings)
+  if not chadrc_mappings then
+    return default_mappings
+  end
+
+  -- store keys in a array with true value to compare
+  local keys_to_disable = {}
+  for _, mappings in pairs(chadrc_mappings) do
+    for mode, section_keys in pairs(mappings) do
+      if not keys_to_disable[mode] then
+        keys_to_disable[mode] = {}
+      end
+      section_keys = (type(section_keys) == "table" and section_keys) or {}
+      for k, _ in pairs(section_keys) do
+        keys_to_disable[mode][k] = true
+      end
+    end
+  end
+
+  -- make a copy as we need to modify default_mappings
+  for section_name, section_mappings in pairs(default_mappings) do
+    for mode, mode_mappings in pairs(section_mappings) do
+      mode_mappings = (type(mode_mappings) == "table" and mode_mappings) or {}
+      for k, _ in pairs(mode_mappings) do
+        -- if key if found then remove from default_mappings
+        if keys_to_disable[mode] and keys_to_disable[mode][k] then
+          default_mappings[section_name][mode][k] = nil
+        end
+      end
+    end
+  end
+
+  return default_mappings
+end
+
+M.load_mappings = function(section, mapping_opt)
+  vim.schedule(function()
+    local function set_section_map(section_values)
+      if section_values.plugin then
+        return
+      end
+
+      section_values.plugin = nil
+
+      for mode, mode_values in pairs(section_values) do
+        local default_opts = merge_tb("force", { mode = mode }, mapping_opt or {})
+        for keybind, mapping_info in pairs(mode_values) do
+          -- merge default + user opts
+          local opts = merge_tb("force", default_opts, mapping_info.opts or {})
+
+          mapping_info.opts, opts.mode = nil, nil
+          opts.desc = mapping_info[2]
+
+          vim.keymap.set(mode, keybind, mapping_info[1], opts)
+        end
+      end
+    end
+
+    local mappings = require("core.utils").load_config().mappings
+
+    if type(section) == "string" then
+      mappings[section]["plugin"] = nil
+      mappings = { mappings[section] }
+    end
+
+    for _, sect in pairs(mappings) do
+      set_section_map(sect)
+    end
+  end)
+end
+
+M.lazy_load = function(plugin)
+  vim.api.nvim_create_autocmd({ "BufRead", "BufWinEnter", "BufNewFile" }, {
+    group = vim.api.nvim_create_augroup("BeLazyOnFileOpen" .. plugin, {}),
+    callback = function()
+      local file = vim.fn.expand "%"
+      local condition = file ~= "NvimTree_1" and file ~= "[lazy]" and file ~= ""
+
+      if condition then
+        vim.api.nvim_del_augroup_by_name("BeLazyOnFileOpen" .. plugin)
+
+        -- dont defer for treesitter as it will show slow highlighting
+        -- This deferring only happens only when we do "nvim filename"
+        if plugin ~= "nvim-treesitter" then
+          vim.schedule(function()
+            require("lazy").load { plugins = plugin }
+
+            if plugin == "nvim-lspconfig" then
+              vim.cmd "silent! do FileType"
+            end
+          end, 0)
+        else
+          require("lazy").load { plugins = plugin }
+        end
+      end
+    end,
+  })
+end
+
+return M

dotfiles/nvim/lua/custom/chadrc.lua

@@ -0,0 +1,9 @@
+---@type ChadrcConfig
+local M = {}
+
+M.ui = { theme = 'catppuccin' }
+
+M.mappings = require('custom.mappings')
+M.plugins = 'custom.plugins'
+
+return M

dotfiles/nvim/lua/custom/configs/dap.lua

@@ -0,0 +1,23 @@
+local dap = require("dap")
+
+dap.adapters["pwa-node"] = {
+  type = "server",
+  host = "127.0.0.1",
+  port = 8123,
+  executable = {
+    command = "js-debug-adapter",
+  },
+}
+
+for _, language in ipairs { "javascript", "typescript" } do
+  dap.configurations[language] = {
+    {
+      type = "pwa-node",
+      request = "launch",
+      name = "Launch file",
+      program = "${file}",
+      cwd = "${workspaceFolder}",
+      runtimeExecutable = "node",
+    },
+  }
+end

dotfiles/nvim/lua/custom/configs/formatter.lua

@@ -0,0 +1,16 @@
+local M = {
+  filetype = {
+    javascript = {
+      require("formatter.filetypes.javascript").prettier,
+    },
+    typescript = {
+      require("formatter.filetypes.javascript").prettier,
+    },
+  },
+}
+
+vim.api.nvim_create_autocmd({ "BufWritePost" }, {
+  command = "FormatWriteLock",
+})
+
+return M

dotfiles/nvim/lua/custom/configs/lspconfig.lua

@@ -0,0 +1,79 @@
+local config = require("plugins.configs.lspconfig")
+local on_attach = config.on_attach
+local capabilities = config.capabilities
+local lspconfig = require("lspconfig")
+
+local function organize_imports()
+  local params = {
+    command = "_typescript.organizeImports",
+    arguments = { vim.api.nvim_buf_get_name(0) },
+  }
+  vim.lsp.buf.execute_command(params)
+end
+
+lspconfig.ts_ls.setup {
+  on_attach = on_attach,
+  capabilities = capabilities,
+  init_options = {
+    preferences = {
+      disablesuggestions = true,
+    }
+  },
+  commands = {
+    OrganizeImports = {
+      organize_imports,
+      description = "Organize Imports",
+    },
+  }
+}
+
+lspconfig.terraformls.setup {
+  on_attach = on_attach,
+  capabilities = capabilities,
+}
+
+lspconfig.tflint.setup {
+  on_attach = on_attach,
+  capabilities = capabilities,
+}
+
+lspconfig.gopls.setup {
+  on_attach = on_attach,
+  capabilities = capabilities,
+  cmd = { "gopls" },
+  filetypes = { "go", "gomod", "gowork", "gotempl" },
+  root_dir = lspconfig.util.root_pattern("go.mod", "go.work"),
+  settings = {
+    gopls = {
+      completeUnimported = true,
+      usePlaceholders = true,
+      analyses = {
+        unusedparams = true,
+      },
+    },
+  },
+}
+
+lspconfig.pyright.setup {
+  on_attach = on_attach,
+  capabilities = capabilities,
+  filetypes = { "python" },
+}
+
+lspconfig.gleam.setup({})
+
+lspconfig.nil_ls.setup {
+  on_attach = on_attach,
+  capabilities = capabilities,
+  autostart = true,
+  cmd = { "nil" },
+  filetypes = { "nix" },
+  settings = {
+    ['nil'] = {
+      testSetting = 42,
+      formatting = {
+        command = { "nixfmt" },
+      },
+    },
+  },
+}

dotfiles/nvim/lua/custom/configs/null-ls.lua

@@ -0,0 +1,28 @@
+local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
+local null_ls = require("null-ls")
+
+local opts = {
+  sources = {
+    null_ls.builtins.formatting.black,
+    null_ls.builtins.diagnostics.mypy,
+    null_ls.builtins.diagnostics.ruff,
+  },
+  on_attach = function(client, bufnr)
+    if client.supports_method("textDocument/formatting") then
+      vim.api.nvim_clear_autocmds({
+        group = augroup,
+        buffer = bufnr,
+      })
+
+      vim.api.nvim_create_autocmd("BufWritePre", {
+        group = augroup,
+        buffer = bufnr,
+        callback = function()
+          vim.lsp.buf.format({ bufnr = bufnr })
+        end,
+      })
+    end
+  end,
+}
+
+return opts

dotfiles/nvim/lua/custom/init.lua

@@ -1,10 +1,18 @@
-require "nvchad.autocmds"
+vim.g.maplocalleader = ","
+vim.opt.colorcolumn = "80"
+vim.g.copilot_no_tab_map = true
+vim.api.nvim_set_keymap("i", "<C-o>", 'copilot#Accept("<CR>")', { silent = true, expr = true, noremap = true, script = true })
+vim.wo.relativenumber = true
+vim.g.scrolloff = 8
 
 -- Auto-reload files when changed externally
+vim.opt.autoread = true
+
+-- Check for file changes when Neovim regains focus
 vim.api.nvim_create_autocmd({ "FocusGained", "BufEnter" }, {
   pattern = "*",
   callback = function()
-    vim.cmd "checktime"
+    vim.cmd("checktime")
   end,
 })
 

dotfiles/nvim/lua/custom/mappings.lua

@@ -0,0 +1,224 @@
+local M = {}
+
+M.disabled = {
+  n = {
+    ["<tab>"] = "",
+    ["<S-tab>"] = "",
+    ["<C-n>"] = "",
+  },
+}
+
+M['rust-tools'] = {
+  n = {
+    ["<C-space>"] = {
+      function ()
+        require("rust-tools.hover_actions").hover_actions()
+      end,
+      "Rust hover actions",
+    },
+    ["<leader>a"] = {
+      function ()
+        require("rust-tools.code_action_group").code_action_group()
+      end,
+      "Rust code action group",
+    },
+  },
+}
+
+M.dap = {
+  n = {
+    ["<leader>dl"] = {
+      function ()
+        require("dap")
+      end,
+      "Load DAP",
+    },
+    ["<leader>dt"] = {
+      "<cmd> DapToggleBreakpoint <CR>",
+      "Toggle breakpoint",
+    },
+    ["<leader>dr"] = {
+      "<cmd> DapContinue <CR>",
+      "Continue Debugging",
+    },
+    ["<leader>dc"] = {
+      "<cmd> DapTerminate <CR>",
+      "Close Debugger",
+    },
+  }
+}
+
+M.dap_python = {
+  plugin = true,
+
+  n = {
+    ["<leader>dpr"] = {
+      function ()
+        require("dap-python").test_method()
+      end,
+      "Debug test method",
+    },
+  }
+}
+
+M.dap_go = {
+  plugin = true,
+
+  n = {
+    ["<leader>gdt"] = {
+      function ()
+        require("dap-go").debug_test()
+      end,
+      "Debug go test",
+    },
+    ["<leader>gdl"] = {
+      function ()
+        require("dap-go").debug_last()
+      end,
+      "Toggle breakpoint",
+    },
+  }
+}
+
+M.lazygit = {
+  n = {
+    ["<leader>gg"] = {
+      "<cmd> LazyGit <CR>",
+      "LazyGit",
+    },
+  },
+}
+
+M.dadbodui = {
+  n = {
+    ["<leader>db"] = {
+      "<cmd> DBUIToggle <CR>",
+      "Toggle DB UI",
+    },
+    ["<leader>dn"] = {
+      "<cmd> DBUIAddConnection <CR>",
+      "Add new database connection",
+    },
+  },
+}
+
+M.noice = {
+  n = {
+    ["<leader>nl"] = {
+      "<cmd> Noice last <CR>",
+      "Show last message",
+    },
+    ["<leader>nt"] ={
+      "<cmd> Noice telescope <CR>",
+      "Noice telescope mode",
+    },
+    ["<leader>nd"] = {
+      "<cmd> Noice dismiss <CR>",
+      "Dismiss messages",
+    },
+    ["<leader>ns"] = {
+      "<cmd> Noice stats <CR>",
+      "Show Noice stats",
+    },
+  },
+}
+
+M.worktree = {
+  n = {
+    ["<leader>gwv"] = {
+      function ()
+        local telescope = require("telescope")
+        telescope.extensions.git_worktree.git_worktrees()
+      end,
+      "View Git Worktrees",
+    },
+    ["<leader>gwn"] = {
+      function ()
+        local telescope = require("telescope")
+        telescope.extensions.git_worktree.create_git_worktree()
+      end,
+      "New Git Worktree",
+    },
+  },
+}
+
+M.neorg = {
+  n = {
+    ["<leader>ni"] = {
+      "<cmd> Neorg index <CR>",
+      "Neorg index",
+    },
+    ["<leader>nr"] = {
+      "<cmd> Neorg return <CR>",
+      "Return from index",
+    },
+  },
+}
+
+M.general = {
+  n = {
+    ["<C-q>"] = {
+      "<cmd> wq <CR>",
+      "Save and exit",
+    },
+    ["<leader>q"] = {
+      "<cmd> wq <CR>",
+      "Save and exit",
+    },
+  },
+}
+
+M.trouble = {
+  n = {
+    ["<leader>tt"] = {
+      "<cmd> Trouble diagnostics toggle <CR>",
+      "Diagnostics (Trouble)",
+    },
+  }
+}
+
+M.tabufline = {
+  n = {
+    ["<S-h>"] = {
+      function()
+        require("nvchad.tabufline").tabuflinePrev()
+      end,
+      "Goto prev buffer",
+    },
+    ["<S-l>"] = {
+      function()
+        require("nvchad.tabufline").tabuflineNext()
+      end,
+      "Goto next buffer",
+    },
+  },
+}
+
+M.nvimtree = {
+  n = {
+    ["<leader>e"] = {
+      "<cmd> NvimTreeToggle <CR>",
+      "Toggle nvimtree",
+    },
+  },
+}
+
+M.lazydocker = {
+  n = {
+    ["<leader>ld"] = {
+      "<cmd> LazyDocker <CR>",
+      "Lazy Docker",
+    },
+  },
+}
+
+M.cloak = {
+  n = {
+    ["<leader>k"] = {
+      "<cmd> CloakToggle <CR>",
+      "Toggle Cloak",
+    },
+  },
+}
+
+return M

dotfiles/nvim/lua/custom/plugins.lua

@@ -0,0 +1,270 @@
+local cmp = require "cmp"
+
+local plugins = {
+  { "nvim-neotest/nvim-nio" },
+  {
+    "mfussenegger/nvim-dap",
+  },
+  {
+    "mfussenegger/nvim-dap-python",
+    ft = "python",
+    dependencies = {
+      "mfussenegger/nvim-dap",
+      "rcarriga/nvim-dap-ui",
+      "nvim-neotest/nvim-nio",
+    },
+    config = function (_, opts)
+      local path = "~/.local/share/nvim/mason/packages/debugpy/venv/bin/python"
+      require("dap-python").setup(path)
+    end
+  },
+  {
+    "rcarriga/nvim-dap-ui",
+    dependencies = {
+      "mfussenegger/nvim-dap",
+    },
+    config = function ()
+      local dap = require("dap")
+      local dapui = require("dapui")
+
+      dapui.setup()
+      dap.listeners.after.event_initialized["dapui_config"] = function()
+        dapui.open()
+      end
+      dap.listeners.before.event_terminated["dapui_config"] = function()
+        dapui.close()
+      end
+      dap.listeners.before.event_exited["dapui_config"] = function()
+        dapui.close()
+      end
+    end,
+  },
+  { "folke/neodev.nvim", opts = {} },
+  {
+    "nvim-telescope/telescope.nvim",
+    config = function ()
+      require("telescope").load_extension("git_worktree")
+    end,
+  },
+  {
+    "hudclark/grpc-nvim",
+    dependencies = "nvim-lua/plenary.nvim",
+  },
+  {
+    "ThePrimeagen/git-worktree.nvim",
+  },
+  {
+    "jose-elias-alvarez/null-ls.nvim",
+    ft = { "python" },
+    config = function ()
+      require "custom.configs.null-ls"
+    end,
+  },
+  {
+    "folke/noice.nvim",
+    event = "VeryLazy",
+    opts = {
+      lsp = {
+        -- override markdown rendering so that **cmp** and other plugins use **Treesitter**
+        override = {
+          ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
+          ["vim.lsp.util.stylize_markdown"] = true,
+          ["cmp.entry.get_documentation"] = true,
+        },
+      },
+      -- you can enable a preset for easier configuration
+      presets = {
+        bottom_search = true, -- use a classic bottom cmdline for search
+        command_palette = true, -- position the cmdline and popupmenu together
+        long_message_to_split = true, -- long messages will be sent to a split
+        inc_rename = false, -- enables an input dialog for inc-rename.nvim
+        lsp_doc_border = false, -- add a border to hover docs and signature help
+      },
+      messages = {
+        enabled = false,
+      },
+    },
+    config = function (_, opts)
+      require("noice").setup(opts)
+    end,
+    dependencies = {
+      -- if you lazy-load any plugin below, make sure to add proper `module="..."` entries
+      "MunifTanjim/nui.nvim",
+      -- OPTIONAL:
+      --   `nvim-notify` is only needed, if you want to use the notification view.
+      --   If not available, we use `mini` as the fallback
+      "rcarriga/nvim-notify",
+    },
+  },
+  {
+    "kristijanhusak/vim-dadbod-ui",
+    dependencies = {
+      {
+        "tpope/vim-dadbod",
+        lazy = false,
+      },
+      {
+        "kristijanhusak/vim-dadbod-completion",
+        ft = { "sql", "mysql", "plsql" },
+      },
+    },
+    cmd = {
+      "DBUI",
+      "DBUIToggle",
+      "DBUIAddConnection",
+      "DBUIFindBuffer",
+    },
+    init = function()
+      vim.g.db_ui_use_nerd_fonts = 1
+    end,
+  },
+  {
+    "folke/trouble.nvim",
+    opts = {},
+    cmd = "Trouble",
+  },
+  {
+    "williamboman/mason.nvim",
+    opts = {
+      ensure_installed = {
+        "rust-analyzer",
+        "typescript-language-server",
+        "prettier",
+        "js-debug-adapter",
+        "terraform-ls",
+        "gopls",
+        "pyright",
+        "mypy",
+        "ruff",
+        "black",
+        "debugpy",
+        "lua-language-server",
+        "nil",
+        "phpactor",
+      },
+    },
+  },
+  {
+    "neovim/nvim-lspconfig",
+    config = function ()
+      require("plugins.configs.lspconfig")
+      require("custom.configs.lspconfig")
+    end,
+  },
+  {
+    "github/copilot.vim",
+    lazy = false,
+  },
+  {
+    "rust-lang/rust.vim",
+    ft = "rust",
+    init =function ()
+      vim.g.rustfmt_autosave = 1
+    end,
+  },
+  {
+    "simrat39/rust-tools.nvim",
+    ft = "rust",
+    dependencies = { "neovim/nvim-lspconfig", "nvim-lua/plenary.nvim", "mfussenegger/nvim-dap" },
+    opts = function ()
+      local lspconfig = require("plugins.configs.lspconfig")
+      -- local extension_path = vim.env.HOME .. "/.local/share/nvim/mason/packages/codelldb/extension/"
+      -- local codelldb_path = extension_path .. 'adapter/codelldb'
+      -- local liblldb_path = extension_path .. 'lldb/lib/liblldb.so'
+      return {
+        dap = {
+          adapter = {
+            type = "executable",
+            command = "lldb",
+            name = "rt_lldb",
+          },
+        },
+        server = {
+          tools = {
+            hover_actions = {
+              auto_focus = true,
+            },
+          },
+          on_attach = lspconfig.on_attach,
+          capabilities = lspconfig.capabilities,
+        },
+      }
+    end,
+  },
+  {
+    "kdheepak/lazygit.nvim",
+    lazy = false,
+    dependencies = {
+      "nvim-lua/plenary.nvim",
+    },
+  },
+  {
+    "crnvl96/lazydocker.nvim",
+    opts = {},  -- automatically calls `require("lazydocker").setup()`
+    dependencies = {
+      "MunifTanjim/nui.nvim",
+    },
+  },
+  {
+    "saecki/crates.nvim",
+    event = { "BufRead Cargo.toml" },
+    config = function(_, opts)
+      local crates = require("crates")
+      crates.setup(opts)
+      cmp.setup.buffer({
+        sources = { { name = "crates" }}
+      })
+      crates.show()
+      require("core.utils").load_mappings("crates")
+    end,
+  },
+  {
+    "hrsh7th/nvim-cmp",
+    opts = function()
+      local M = require "plugins.configs.cmp"
+      M.completion.completeopt = "menu,menuone,noselect"
+      M.mapping["<CR>"] = cmp.mapping.confirm {
+        behavior = cmp.ConfirmBehavior.Insert,
+        select = false,
+      }
+      table.insert(M.sources, {name = "crates"})
+      return M
+    end,
+  },
+  {
+    "mhartington/formatter.nvim",
+    event = "VeryLazy",
+    opts = function ()
+      return require("custom.configs.formatter")
+    end
+  },
+  {
+    "laytan/cloak.nvim",
+    lazy = false,
+    config = function ()
+      require("cloak").setup({
+        enabled = true,
+        cloak_character = "*",
+        -- The applied highlight group (colors) on the cloaking, see `:h highlight`.
+        highlight_group = "Comment",
+        patterns = {
+          {
+            -- Match any file starting with ".env".
+            -- This can be a table to match multiple file patterns.
+            file_pattern = {
+                ".env*",
+                "wrangler.toml",
+                ".dev.vars",
+            },
+            -- Match an equals sign and any character after it.
+            -- This can also be a table of patterns to cloak,
+            -- example: cloak_pattern = { ":.+", "-.+" } for yaml files.
+            cloak_pattern = "=.+"
+          },
+        },
+      })
+    end,
+  },
+}
+
+return plugins

dotfiles/nvim/lua/mappings.lua

@@ -1,61 +0,0 @@
-require "nvchad.mappings"
-
-local map = vim.keymap.set
-local nomap = vim.keymap.del
-
--- Disable default mappings
-pcall(nomap, "n", "<tab>")
-pcall(nomap, "n", "<S-tab>")
-pcall(nomap, "n", "<C-n>")
-
--- rust-tools
-map("n", "<C-space>", function()
-  require("rust-tools.hover_actions").hover_actions()
-end, { desc = "Rust hover actions" })
-
-map("n", "<leader>a", function()
-  require("rust-tools.code_action_group").code_action_group()
-end, { desc = "Rust code action group" })
-
--- lazygit
-map("n", "<leader>gg", "<cmd> LazyGit <CR>", { desc = "LazyGit" })
-
--- noice
-map("n", "<leader>nl", "<cmd> Noice last <CR>", { desc = "Show last message" })
-map("n", "<leader>nt", "<cmd> Noice telescope <CR>", { desc = "Noice telescope mode" })
-map("n", "<leader>nd", "<cmd> Noice dismiss <CR>", { desc = "Dismiss messages" })
-map("n", "<leader>ns", "<cmd> Noice stats <CR>", { desc = "Show Noice stats" })
-
--- worktree
-map("n", "<leader>gwv", function()
-  require("telescope").extensions.git_worktree.git_worktrees()
-end, { desc = "View Git Worktrees" })
-
-map("n", "<leader>gwn", function()
-  require("telescope").extensions.git_worktree.create_git_worktree()
-end, { desc = "New Git Worktree" })
-
--- general
-map("n", "<C-q>", "<cmd> wq <CR>", { desc = "Save and exit" })
-map("n", "<leader>q", "<cmd> wq <CR>", { desc = "Save and exit" })
-
--- trouble
-map("n", "<leader>tt", "<cmd> Trouble diagnostics toggle <CR>", { desc = "Diagnostics (Trouble)" })
-
--- tabufline
-map("n", "<S-h>", function()
-  require("nvchad.tabufline").tabuflinePrev()
-end, { desc = "Goto prev buffer" })
-
-map("n", "<S-l>", function()
-  require("nvchad.tabufline").tabuflineNext()
-end, { desc = "Goto next buffer" })
-
--- nvimtree
-map("n", "<leader>e", "<cmd> NvimTreeToggle <CR>", { desc = "Toggle nvimtree" })
-
--- lazydocker
-map("n", "<leader>ld", "<cmd> LazyDocker <CR>", { desc = "Lazy Docker" })
-
--- cloak
-map("n", "<leader>k", "<cmd> CloakToggle <CR>", { desc = "Toggle Cloak" })

dotfiles/nvim/lua/options.lua

@@ -1,10 +0,0 @@
-require "nvchad.options"
-
-local o = vim.o
-local opt = vim.opt
-
-vim.g.maplocalleader = ","
-opt.colorcolumn = "80"
-o.relativenumber = true
-opt.scrolloff = 8
-opt.autoread = true

dotfiles/nvim/lua/plugins/configs/cmp.lua

@@ -0,0 +1,120 @@
+local cmp = require "cmp"
+
+dofile(vim.g.base46_cache .. "cmp")
+
+local cmp_ui = require("core.utils").load_config().ui.cmp
+local cmp_style = cmp_ui.style
+
+local field_arrangement = {
+  atom = { "kind", "abbr", "menu" },
+  atom_colored = { "kind", "abbr", "menu" },
+}
+
+local formatting_style = {
+  -- default fields order i.e completion word + item.kind + item.kind icons
+  fields = field_arrangement[cmp_style] or { "abbr", "kind", "menu" },
+
+  format = function(_, item)
+    local icons = require "nvchad.icons.lspkind"
+    local icon = (cmp_ui.icons and icons[item.kind]) or ""
+
+    if cmp_style == "atom" or cmp_style == "atom_colored" then
+      icon = " " .. icon .. " "
+      item.menu = cmp_ui.lspkind_text and "   (" .. item.kind .. ")" or ""
+      item.kind = icon
+    else
+      icon = cmp_ui.lspkind_text and (" " .. icon .. " ") or icon
+      item.kind = string.format("%s %s", icon, cmp_ui.lspkind_text and item.kind or "")
+    end
+
+    return item
+  end,
+}
+
+local function border(hl_name)
+  return {
+    { "╭", hl_name },
+    { "─", hl_name },
+    { "╮", hl_name },
+    { "│", hl_name },
+    { "╯", hl_name },
+    { "─", hl_name },
+    { "╰", hl_name },
+    { "│", hl_name },
+  }
+end
+
+local options = {
+  completion = {
+    completeopt = "menu,menuone",
+  },
+
+  window = {
+    completion = {
+      side_padding = (cmp_style ~= "atom" and cmp_style ~= "atom_colored") and 1 or 0,
+      winhighlight = "Normal:CmpPmenu,CursorLine:CmpSel,Search:None",
+      scrollbar = false,
+    },
+    documentation = {
+      border = border "CmpDocBorder",
+      winhighlight = "Normal:CmpDoc",
+    },
+  },
+  snippet = {
+    expand = function(args)
+      require("luasnip").lsp_expand(args.body)
+    end,
+  },
+
+  formatting = formatting_style,
+
+  mapping = {
+    ["<C-p>"] = cmp.mapping.select_prev_item(),
+    ["<C-n>"] = cmp.mapping.select_next_item(),
+    ["<C-d>"] = cmp.mapping.scroll_docs(-4),
+    ["<C-f>"] = cmp.mapping.scroll_docs(4),
+    ["<C-Space>"] = cmp.mapping.complete(),
+    ["<C-e>"] = cmp.mapping.close(),
+    ["<CR>"] = cmp.mapping.confirm {
+      behavior = cmp.ConfirmBehavior.Insert,
+      select = true,
+    },
+    ["<Tab>"] = cmp.mapping(function(fallback)
+      if cmp.visible() then
+        cmp.select_next_item()
+      elseif require("luasnip").expand_or_jumpable() then
+        vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<Plug>luasnip-expand-or-jump", true, true, true), "")
+      else
+        fallback()
+      end
+    end, {
+      "i",
+      "s",
+    }),
+    ["<S-Tab>"] = cmp.mapping(function(fallback)
+      if cmp.visible() then
+        cmp.select_prev_item()
+      elseif require("luasnip").jumpable(-1) then
+        vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<Plug>luasnip-jump-prev", true, true, true), "")
+      else
+        fallback()
+      end
+    end, {
+      "i",
+      "s",
+    }),
+  },
+  sources = {
+    { name = "nvim_lsp" },
+    { name = "luasnip" },
+    { name = "buffer" },
+    { name = "nvim_lua" },
+    { name = "path" },
+  },
+}
+
+if cmp_style ~= "atom" and cmp_style ~= "atom_colored" then
+  options.window.completion.border = border "CmpBorder"
+end
+
+return options

dotfiles/nvim/lua/plugins/configs/lspconfig.lua

@@ -0,0 +1,67 @@
+dofile(vim.g.base46_cache .. "lsp")
+require "nvchad.lsp"
+
+local M = {}
+local utils = require "core.utils"
+
+-- export on_attach & capabilities for custom lspconfigs
+M.on_attach = function(client, bufnr)
+  utils.load_mappings("lspconfig", { buffer = bufnr })
+
+  if client.server_capabilities.signatureHelpProvider then
+    require("nvchad.signature").setup(client)
+  end
+end
+
+-- disable semantic tokens
+M.on_init = function(client, _)
+  if not utils.load_config().ui.lsp_semantic_tokens and client.supports_method "textDocument/semanticTokens" then
+    client.server_capabilities.semanticTokensProvider = nil
+  end
+end
+
+M.capabilities = vim.lsp.protocol.make_client_capabilities()
+
+M.capabilities.textDocument.completion.completionItem = {
+  documentationFormat = { "markdown", "plaintext" },
+  snippetSupport = true,
+  preselectSupport = true,
+  insertReplaceSupport = true,
+  labelDetailsSupport = true,
+  deprecatedSupport = true,
+  commitCharactersSupport = true,
+  tagSupport = { valueSet = { 1 } },
+  resolveSupport = {
+    properties = {
+      "documentation",
+      "detail",
+      "additionalTextEdits",
+    },
+  },
+}
+
+require("lspconfig").lua_ls.setup {
+  on_init = M.on_init,
+  on_attach = M.on_attach,
+  capabilities = M.capabilities,
+
+  settings = {
+    Lua = {
+      diagnostics = {
+        globals = { "vim" },
+      },
+      workspace = {
+        library = {
+          [vim.fn.expand "$VIMRUNTIME/lua"] = true,
+          [vim.fn.expand "$VIMRUNTIME/lua/vim/lsp"] = true,
+          [vim.fn.stdpath "data" .. "/lazy/ui/nvchad_types"] = true,
+          [vim.fn.stdpath "data" .. "/lazy/lazy.nvim/lua/lazy"] = true,
+        },
+        maxPreload = 100000,
+        preloadFileSize = 10000,
+      },
+    },
+  },
+}
+
+return M

dotfiles/nvim/lua/plugins/configs/mason.lua

@@ -0,0 +1,28 @@
+local options = {
+  ensure_installed = { "lua-language-server" }, -- not an option from mason.nvim
+
+  PATH = "skip",
+
+  ui = {
+    icons = {
+      package_pending = " ",
+      package_installed = "󰄳 ",
+      package_uninstalled = " 󰚌",
+    },
+
+    keymaps = {
+      toggle_server_expand = "<CR>",
+      install_server = "i",
+      update_server = "u",
+      check_server_version = "c",
+      update_all_servers = "U",
+      check_outdated_servers = "C",
+      uninstall_server = "X",
+      cancel_installation = "<C-c>",
+    },
+  },
+
+  max_concurrent_installers = 10,
+}
+
+return options

dotfiles/nvim/lua/plugins/configs/nvimtree.lua

@@ -0,0 +1,77 @@
+local options = {
+  filters = {
+    dotfiles = false,
+    exclude = { vim.fn.stdpath "config" .. "/lua/custom" },
+  },
+  disable_netrw = true,
+  hijack_netrw = true,
+  hijack_cursor = true,
+  hijack_unnamed_buffer_when_opening = false,
+  sync_root_with_cwd = true,
+  update_focused_file = {
+    enable = true,
+    update_root = false,
+  },
+  view = {
+    adaptive_size = false,
+    side = "left",
+    width = 30,
+    preserve_window_proportions = true,
+  },
+  git = {
+    enable = false,
+    ignore = true,
+  },
+  filesystem_watchers = {
+    enable = true,
+  },
+  actions = {
+    open_file = {
+      resize_window = true,
+    },
+  },
+  renderer = {
+    root_folder_label = false,
+    highlight_git = false,
+    highlight_opened_files = "none",
+
+    indent_markers = {
+      enable = false,
+    },
+
+    icons = {
+      show = {
+        file = true,
+        folder = true,
+        folder_arrow = true,
+        git = false,
+      },
+
+      glyphs = {
+        default = "󰈚",
+        symlink = "",
+        folder = {
+          default = "",
+          empty = "",
+          empty_open = "",
+          open = "",
+          symlink = "",
+          symlink_open = "",
+          arrow_open = "",
+          arrow_closed = "",
+        },
+        git = {
+          unstaged = "✗",
+          staged = "✓",
+          unmerged = "",
+          renamed = "➜",
+          untracked = "★",
+          deleted = "",
+          ignored = "◌",
+        },
+      },
+    },
+  },
+}
+
+return options

dotfiles/nvim/lua/plugins/configs/others.lua

@@ -0,0 +1,66 @@
+local M = {}
+local utils = require "core.utils"
+
+M.blankline = {
+  indentLine_enabled = 1,
+  filetype_exclude = {
+    "help",
+    "terminal",
+    "lazy",
+    "lspinfo",
+    "TelescopePrompt",
+    "TelescopeResults",
+    "mason",
+    "nvdash",
+    "nvcheatsheet",
+    "",
+  },
+  buftype_exclude = { "terminal" },
+  show_trailing_blankline_indent = false,
+  show_first_indent_level = false,
+  show_current_context = true,
+  show_current_context_start = true,
+}
+
+M.luasnip = function(opts)
+  require("luasnip").config.set_config(opts)
+
+  -- vscode format
+  require("luasnip.loaders.from_vscode").lazy_load()
+  require("luasnip.loaders.from_vscode").lazy_load { paths = vim.g.vscode_snippets_path or "" }
+
+  -- snipmate format
+  require("luasnip.loaders.from_snipmate").load()
+  require("luasnip.loaders.from_snipmate").lazy_load { paths = vim.g.snipmate_snippets_path or "" }
+
+  -- lua format
+  require("luasnip.loaders.from_lua").load()
+  require("luasnip.loaders.from_lua").lazy_load { paths = vim.g.lua_snippets_path or "" }
+
+  vim.api.nvim_create_autocmd("InsertLeave", {
+    callback = function()
+      if
+        require("luasnip").session.current_nodes[vim.api.nvim_get_current_buf()]
+        and not require("luasnip").session.jump_active
+      then
+        require("luasnip").unlink_current()
+      end
+    end,
+  })
+end
+
+M.gitsigns = {
+  signs = {
+    add = { text = "│" },
+    change = { text = "│" },
+    delete = { text = "󰍵" },
+    topdelete = { text = "‾" },
+    changedelete = { text = "~" },
+    untracked = { text = "│" },
+  },
+  on_attach = function(bufnr)
+    utils.load_mappings("gitsigns", { buffer = bufnr })
+  end,
+}
+
+return M

dotfiles/nvim/lua/plugins/configs/telescope.lua

@@ -0,0 +1,54 @@
+local options = {
+  defaults = {
+    vimgrep_arguments = {
+      "rg",
+      "-L",
+      "--color=never",
+      "--no-heading",
+      "--with-filename",
+      "--line-number",
+      "--column",
+      "--smart-case",
+    },
+    prompt_prefix = "   ",
+    selection_caret = "  ",
+    entry_prefix = "  ",
+    initial_mode = "insert",
+    selection_strategy = "reset",
+    sorting_strategy = "ascending",
+    layout_strategy = "horizontal",
+    layout_config = {
+      horizontal = {
+        prompt_position = "top",
+        preview_width = 0.55,
+      },
+      vertical = {
+        mirror = false,
+      },
+      width = 0.87,
+      height = 0.80,
+      preview_cutoff = 120,
+    },
+    file_sorter = require("telescope.sorters").get_fuzzy_file,
+    file_ignore_patterns = { "node_modules" },
+    generic_sorter = require("telescope.sorters").get_generic_fuzzy_sorter,
+    path_display = { "truncate" },
+    winblend = 0,
+    border = {},
+    borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" },
+    color_devicons = true,
+    set_env = { ["COLORTERM"] = "truecolor" }, -- default = nil,
+    file_previewer = require("telescope.previewers").vim_buffer_cat.new,
+    grep_previewer = require("telescope.previewers").vim_buffer_vimgrep.new,
+    qflist_previewer = require("telescope.previewers").vim_buffer_qflist.new,
+    -- Developer configurations: Not meant for general override
+    buffer_previewer_maker = require("telescope.previewers").buffer_previewer_maker,
+    mappings = {
+      n = { ["q"] = require("telescope.actions").close },
+    },
+  },
+
+  extensions_list = { "themes", "terms" },
+}
+
+return options

dotfiles/nvim/lua/plugins/configs/treesitter.lua

@@ -0,0 +1,12 @@
+local options = {
+  ensure_installed = { "lua", "vim", "vimdoc" },
+
+  highlight = {
+    enable = true,
+    use_languagetree = true,
+  },
+
+  indent = { enable = true },
+}
+
+return options

dotfiles/nvim/lua/plugins/init.lua

@@ -1,293 +1,252 @@
-return {
+-- All plugins have lazy=true by default,to load a plugin on startup just lazy=false
-  -- Formatting
+-- List of all default plugins & their definitions
-  {
+local default_plugins = {
-    "stevearc/conform.nvim",
+
-    event = "BufWritePre",
+  "nvim-lua/plenary.nvim",
-    opts = require "configs.conform",
-  },
 
-  -- LSP
   {
-    "neovim/nvim-lspconfig",
+    "NvChad/base46",
-    config = function()
+    branch = "v2.0",
-      require "configs.lspconfig"
+    build = function()
+      require("base46").load_all_highlights()
+    end,
+  },
+
+  {
+    "NvChad/ui",
+    branch = "v2.0",
+    lazy = false,
+  },
+
+  {
+    "zbirenbaum/nvterm",
+    init = function()
+      require("core.utils").load_mappings "nvterm"
+    end,
+    config = function(_, opts)
+      require "base46.term"
+      require("nvterm").setup(opts)
+    end,
+  },
+
+  {
+    "NvChad/nvim-colorizer.lua",
+    event = "User FilePost",
+    config = function(_, opts)
+      require("colorizer").setup(opts)
+
+      -- execute colorizer as soon as possible
+      vim.defer_fn(function()
+        require("colorizer").attach_to_buffer(0)
+      end, 0)
+    end,
+  },
+
+  {
+    "nvim-tree/nvim-web-devicons",
+    opts = function()
+      return { override = require "nvchad.icons.devicons" }
+    end,
+    config = function(_, opts)
+      dofile(vim.g.base46_cache .. "devicons")
+      require("nvim-web-devicons").setup(opts)
+    end,
+  },
+
+  {
+    "lukas-reineke/indent-blankline.nvim",
+    version = "2.20.7",
+    event = "User FilePost",
+    opts = function()
+      return require("plugins.configs.others").blankline
+    end,
+    config = function(_, opts)
+      require("core.utils").load_mappings "blankline"
+      dofile(vim.g.base46_cache .. "blankline")
+      require("indent_blankline").setup(opts)
     end,
   },
 
-  -- Treesitter
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    event = { "BufReadPost", "BufNewFile" },
-      opts.ensure_installed = vim.list_extend(opts.ensure_installed or {}, {
+    cmd = { "TSInstall", "TSBufEnable", "TSBufDisable", "TSModuleInfo" },
-        "lua",
+    build = ":TSUpdate",
-        "vim",
+    opts = function()
-        "vimdoc",
+      return require "plugins.configs.treesitter"
-      })
+    end,
-      return opts
+    config = function(_, opts)
+      dofile(vim.g.base46_cache .. "syntax")
+      require("nvim-treesitter.configs").setup(opts)
     end,
   },
 
-  -- lazydev
+  -- git stuff
-  { "folke/lazydev.nvim", ft = "lua", opts = {} },
-
-  -- grpc-nvim
   {
-    "hudclark/grpc-nvim",
+    "lewis6991/gitsigns.nvim",
-    dependencies = "nvim-lua/plenary.nvim",
+    event = "User FilePost",
-  },
+    opts = function()
-
+      return require("plugins.configs.others").gitsigns
-  -- git-worktree
+    end,
-  { "ThePrimeagen/git-worktree.nvim" },
+    config = function(_, opts)
-
+      dofile(vim.g.base46_cache .. "git")
-  -- Telescope extension
+      require("gitsigns").setup(opts)
-  {
-    "nvim-telescope/telescope.nvim",
-    opts = function(_, opts)
-      opts.extensions_list = opts.extensions_list or {}
-      table.insert(opts.extensions_list, "git_worktree")
-      return opts
     end,
   },
 
-  -- noice
+  -- lsp stuff
-  {
-    "folke/noice.nvim",
-    event = "VeryLazy",
-    opts = {
-      lsp = {
-        override = {
-          ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
-          ["vim.lsp.util.stylize_markdown"] = true,
-          ["cmp.entry.get_documentation"] = true,
-        },
-      },
-      presets = {
-        bottom_search = true,
-        command_palette = true,
-        long_message_to_split = true,
-        inc_rename = false,
-        lsp_doc_border = false,
-      },
-      messages = {
-        enabled = false,
-      },
-    },
-    dependencies = {
-      "MunifTanjim/nui.nvim",
-      "rcarriga/nvim-notify",
-    },
-  },
-
-  -- trouble
-  {
-    "folke/trouble.nvim",
-    opts = {},
-    cmd = "Trouble",
-  },
-
-  -- Mason
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    cmd = { "Mason", "MasonInstall", "MasonInstallAll", "MasonUpdate" },
-      opts.ensure_installed = vim.list_extend(opts.ensure_installed or {}, {
-        "rust-analyzer",
-        "typescript-language-server",
-        "prettier",
-        "js-debug-adapter",
-        "terraform-ls",
-        "gopls",
-        "pyright",
-        "mypy",
-        "ruff",
-        "black",
-        "lua-language-server",
-        "nil",
-        "phpactor",
-      })
-      return opts
-    end,
-  },
-
-  -- copilot
-  {
-    "zbirenbaum/copilot.lua",
-    cmd = "Copilot",
-    event = "InsertEnter",
-    opts = {
-      suggestion = {
-        enabled = true,
-        auto_trigger = true,
-        keymap = {
-          accept = "<C-o>",
-        },
-      },
-      panel = { enabled = false },
-    },
-  },
-
-  -- rust.vim
-  {
-    "rust-lang/rust.vim",
-    ft = "rust",
-    init = function()
-      vim.g.rustfmt_autosave = 1
-    end,
-  },
-
-  -- rust-tools
-  {
-    "simrat39/rust-tools.nvim",
-    ft = "rust",
-    dependencies = { "neovim/nvim-lspconfig", "nvim-lua/plenary.nvim" },
     opts = function()
-      local nvlsp = require "nvchad.configs.lspconfig"
+      return require "plugins.configs.mason"
-      return {
-        server = {
-          tools = {
-            hover_actions = {
-              auto_focus = true,
-            },
-          },
-          on_attach = nvlsp.on_attach,
-          capabilities = nvlsp.capabilities,
-        },
-      }
     end,
-  },
-
-  -- lazygit
-  {
-    "kdheepak/lazygit.nvim",
-    lazy = false,
-    dependencies = {
-      "nvim-lua/plenary.nvim",
-    },
-  },
-
-  -- lazydocker
-  {
-    "crnvl96/lazydocker.nvim",
-    opts = {},
-    dependencies = {
-      "MunifTanjim/nui.nvim",
-    },
-  },
-
-  -- crates
-  {
-    "saecki/crates.nvim",
-    event = { "BufRead Cargo.toml" },
     config = function(_, opts)
-      local crates = require "crates"
+      dofile(vim.g.base46_cache .. "mason")
-      crates.setup(opts)
+      require("mason").setup(opts)
-      local cmp = require "cmp"
+
-      local sources = vim.deepcopy(cmp.get_config().sources or {})
+      -- custom nvchad cmd to install all mason binaries listed
-      table.insert(sources, { name = "crates" })
+      vim.api.nvim_create_user_command("MasonInstallAll", function()
-      cmp.setup.buffer { sources = sources }
+        if opts.ensure_installed and #opts.ensure_installed > 0 then
-      crates.show()
+          vim.cmd("MasonInstall " .. table.concat(opts.ensure_installed, " "))
+        end
+      end, {})
+
+      vim.g.mason_binaries_list = opts.ensure_installed
     end,
   },
 
-  -- cmp override
+  {
+    "neovim/nvim-lspconfig",
+    event = "User FilePost",
+    config = function()
+      require "plugins.configs.lspconfig"
+    end,
+  },
+
+  -- load luasnips + cmp related in insert mode only
   {
     "hrsh7th/nvim-cmp",
-    opts = function(_, opts)
+    event = "InsertEnter",
-      local cmp = require "cmp"
+    dependencies = {
-      opts.completion.completeopt = "menu,menuone,noselect"
+      {
-      opts.mapping["<CR>"] = cmp.mapping.confirm {
+        -- snippet plugin
-        behavior = cmp.ConfirmBehavior.Insert,
+        "L3MON4D3/LuaSnip",
-        select = false,
+        dependencies = "rafamadriz/friendly-snippets",
-      }
+        opts = { history = true, updateevents = "TextChanged,TextChangedI" },
-      table.insert(opts.sources, { name = "crates" })
+        config = function(_, opts)
-      return opts
+          require("plugins.configs.others").luasnip(opts)
+        end,
+      },
+
+      -- autopairing of (){}[] etc
+      {
+        "windwp/nvim-autopairs",
+        opts = {
+          fast_wrap = {},
+          disable_filetype = { "TelescopePrompt", "vim" },
+        },
+        config = function(_, opts)
+          require("nvim-autopairs").setup(opts)
+
+          -- setup cmp for autopairs
+          local cmp_autopairs = require "nvim-autopairs.completion.cmp"
+          require("cmp").event:on("confirm_done", cmp_autopairs.on_confirm_done())
+        end,
+      },
+
+      -- cmp sources plugins
+      {
+        "saadparwaiz1/cmp_luasnip",
+        "hrsh7th/cmp-nvim-lua",
+        "hrsh7th/cmp-nvim-lsp",
+        "hrsh7th/cmp-buffer",
+        "hrsh7th/cmp-path",
+      },
+    },
+    opts = function()
+      return require "plugins.configs.cmp"
+    end,
+    config = function(_, opts)
+      require("cmp").setup(opts)
     end,
   },
 
-  -- cloak
   {
-    "laytan/cloak.nvim",
+    "numToStr/Comment.nvim",
-    lazy = false,
+    keys = {
-    opts = {
+      { "gcc", mode = "n", desc = "Comment toggle current line" },
-      enabled = true,
+      { "gc", mode = { "n", "o" }, desc = "Comment toggle linewise" },
-      cloak_character = "*",
+      { "gc", mode = "x", desc = "Comment toggle linewise (visual)" },
-      highlight_group = "Comment",
+      { "gbc", mode = "n", desc = "Comment toggle current block" },
-      patterns = {
+      { "gb", mode = { "n", "o" }, desc = "Comment toggle blockwise" },
-        {
+      { "gb", mode = "x", desc = "Comment toggle blockwise (visual)" },
-          file_pattern = {
-            ".env*",
-            "wrangler.toml",
-            ".dev.vars",
-          },
-          cloak_pattern = "=.+",
-        },
-      },
     },
+    init = function()
+      require("core.utils").load_mappings "comment"
+    end,
+    config = function(_, opts)
+      require("Comment").setup(opts)
+    end,
   },
 
-  -- avante
+  -- file managing , picker etc
   {
-    "yetone/avante.nvim",
+    "nvim-tree/nvim-tree.lua",
-    build = vim.fn.has "win32" ~= 0
+    cmd = { "NvimTreeToggle", "NvimTreeFocus" },
-        and "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false"
+    init = function()
-      or "make",
+      require("core.utils").load_mappings "nvimtree"
-    event = "VeryLazy",
+    end,
-    version = false,
+    opts = function()
-    opts = {
+      return require "plugins.configs.nvimtree"
-      instructions_file = "avante.md",
+    end,
-      provider = "claude",
+    config = function(_, opts)
-      providers = {
+      dofile(vim.g.base46_cache .. "nvimtree")
-        claude = {
+      require("nvim-tree").setup(opts)
-          endpoint = "https://api.anthropic.com",
+    end,
-          model = "claude-sonnet-4-20250514",
+  },
-          timeout = 30000,
+
-          extra_request_body = {
+  {
-            temperature = 0.75,
+    "nvim-telescope/telescope.nvim",
-            max_tokens = 20480,
+    dependencies = { "nvim-treesitter/nvim-treesitter" },
-          },
+    cmd = "Telescope",
-        },
+    init = function()
-        moonshot = {
+      require("core.utils").load_mappings "telescope"
-          endpoint = "https://api.moonshot.ai/v1",
+    end,
-          model = "kimi-k2-0711-preview",
+    opts = function()
-          timeout = 30000,
+      return require "plugins.configs.telescope"
-          extra_request_body = {
+    end,
-            temperature = 0.75,
+    config = function(_, opts)
-            max_tokens = 32768,
+      dofile(vim.g.base46_cache .. "telescope")
-          },
+      local telescope = require "telescope"
-        },
+      telescope.setup(opts)
-      },
+
-    },
+      -- load extensions
-    dependencies = {
+      for _, ext in ipairs(opts.extensions_list) do
-      "nvim-lua/plenary.nvim",
+        telescope.load_extension(ext)
-      "MunifTanjim/nui.nvim",
+      end
-      "echasnovski/mini.pick",
+    end,
-      "nvim-telescope/telescope.nvim",
+  },
-      "hrsh7th/nvim-cmp",
+
-      "ibhagwan/fzf-lua",
+  -- Only load whichkey after all the gui
-      "stevearc/dressing.nvim",
+  {
-      "folke/snacks.nvim",
+    "folke/which-key.nvim",
-      "nvim-tree/nvim-web-devicons",
+    keys = { "<leader>", "<c-r>", "<c-w>", '"', "'", "`", "c", "v", "g" },
-      "zbirenbaum/copilot.lua",
+    init = function()
-      {
+      require("core.utils").load_mappings "whichkey"
-        "HakonHarnes/img-clip.nvim",
+    end,
-        event = "VeryLazy",
+    cmd = "WhichKey",
-        opts = {
+    config = function(_, opts)
-          default = {
+      dofile(vim.g.base46_cache .. "whichkey")
-            embed_image_as_base64 = false,
+      require("which-key").setup(opts)
-            prompt_for_file_name = false,
+    end,
-            drag_and_drop = {
-              insert_mode = true,
-            },
-            use_absolute_path = true,
-          },
-        },
-      },
-      {
-        "MeanderingProgrammer/render-markdown.nvim",
-        opts = {
-          file_types = { "markdown", "Avante" },
-        },
-        ft = { "markdown", "Avante" },
-      },
-    },
   },
 }
+
+local config = require("core.utils").load_config()
+
+if #config.plugins > 0 then
+  table.insert(default_plugins, { import = config.plugins })
+end
+
+require("lazy").setup(default_plugins, config.lazy_nvim)

dotfiles/rclone/rclone.conf

@@ -1,4 +0,0 @@
-# Encrypted rclone configuration File
-
-RCLONE_ENCRYPT_V0:
-uMYVgWtMpT3JnNYfhnE4Lg01opGVNp6Wfx1q0+MfBTUfn+i2nivqEHgL6I/ubbkncXnXWN6uDyjMAMTEZBiRA1EIBt3Sgpj5GHlKJlhr+B6f6YSCuC1OAOZUlxCU/iR/JI0vpkpqZ/QHy6JXpP5kYYHUaur+UGkRbTf9Ds+U59nzhhi4Hr7WsNwt8Tq/e4N3O4dCmhCcRHlJhKx60NtHtbS6qAfyNYRgarohUQg9SKGFXmj9OY046qEMX9kKeUJ+kphGO4glmqJuah+WUTEAREru/8/5lfwk0JPt+64+8/C4tk9rPKvZO0EEUztO4oG2nATNGhvG4eb3qS5tGl9yjwaC7TJvoU2ZOi63g/cZ//HnKK+PwzqxuzKZI407UJ0gdGQAs9+0Vy0Joxx14oyjfe0AsR90gKKboGfwni4Kg2CsC1Id/J8c71363PaPjU4+BUcU5/xqXtMcZ8QLGp0zbc+c2RC+sBtszhyN5Qc71megXgVcqZBhiWVJROYIC09PL9ZggAK5xAlympT2jK6ok5nE6d9cFMSLigtWMTK2b2rUiUlQJQNeAvrgKt8zDDGhRuhjjISj6IsJ2h4R1de7p8AllQrk8/gSRHCFj/hl84RIXRuqAfA4T1nC6Kw7U7PIkOz7VpTZaLziMcDCAavHR3CpqZAdJunwJWRoEe5+Xl2/rWG0Ppu+/+6r/6dbTq/Pbh8Pf5STuduFQUd2jjyntXhMBIrM0s9J+p9GPUWx/d96jDl8kz37qJpKYdzXpUWECEyx7IuC2LhxNeWL5IdfCR1l7vdejPpv27unxuItKODddESrKORA/o97mbKgTaKLxbZGEj0DXizo+7dxIWZJse+W+THoHfdyBMpV4dPcYYsva/zDwne65rGoVePZIKvqI0yqPBRbnb1QdVrnKODV8xIkdBnb8d4FknGGsUuTMFsYabUc84kXxfQ97psgrggsAkbWjzg1ufVjTyyvxPZH6OAJVoQKK2fT+/wbMeJxu6Himg3bFPKq70Vcw9JE1mFPv6B5+sZKwYMXJj3VuOaINu9TQltiGnm/t0QKN+qDLlyRvFRlJO5Hz89E7GmLwOd0KSNjpA71BO/JpCMwFrzblcCn5hFd6xMAfgTXyo0apCbxty2zA+rqrT2nzvit1gAafZyq2rPEPN6vj+ISuI8+f1QW8rrK/NV3bT7dmnhfMMkvSggNVJ/0dgOqF6GZdeX4acxfKkSDih1aOfCNFKbvgXFNKYeQ9qV0x7sR89NGkXFl9jhlxsPa61UrgGBLEO5dYsrTik45YFkF34XTQKSQaLzcXldNcQ9XH8/RUVfMOJQwVkPsbijoklAwrPKNRytoxWgXTfjZuH1wjdWRM6qPtHezlj5Uv9GdC14df8HDCplURYK0dQaVeB4EnR9NM+qT0f8g2AktD2me1qtUampKv3bBTfTdZ39Ow5+hASv8zkDpb+YXTUk+5XpvFK8=

dotfiles/waybar/config.jsonc

@@ -67,8 +67,8 @@
         "format": "{}% "
     },
     "temperature": {
-        "hwmon-path-abs": "/sys/devices/platform/coretemp.0/hwmon",
+        // "thermal-zone": 2,
-        "input-filename": "temp1_input",
+        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
         "critical-threshold": 80,
         // "format-critical": "{temperatureC}°C {icon}",
         "format": "{temperatureC}°C",

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776702787,
+        "lastModified": 1760101617,
-        "narHash": "sha256-qc5uwEWbuubzYthmZcfCapooZGXhoYZWfTQ24TozbCQ=",
+        "narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "9a1ca6b8cb4d86a599787a55b78f2ddf809bf945",
+        "rev": "1826a9923881320306231b1c2090379ebf9fa4f8",
         "type": "github"
       },
       "original": {
@@ -55,11 +55,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776613567,
+        "lastModified": 1761899396,
-        "narHash": "sha256-gC9Cp5ibBmGD5awCA9z7xy6MW6iJufhazTYJOiGlCUI=",
+        "narHash": "sha256-XOpKBp6HLzzMCbzW50TEuXN35zN5WGQREC7n34DcNMM=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "32f4236bfc141ae930b5ba2fb604f561fed5219d",
+        "rev": "6f4cf5abbe318e4cd1e879506f6eeafd83f7b998",
         "type": "github"
       },
       "original": {
@@ -71,15 +71,15 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1767039857,
+        "lastModified": 1747046372,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
-        "owner": "NixOS",
+        "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "edolstra",
         "repo": "flake-compat",
         "type": "github"
       }
@@ -172,11 +172,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776950293,
+        "lastModified": 1761878381,
-        "narHash": "sha256-t6KMARLILjPuTBSRoYanUxV+FU50IFZ7L5XVdOcdtaY=",
+        "narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6837e0d6c5eda81fd26308489799fbf83a160465",
+        "rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa",
         "type": "github"
       },
       "original": {
@@ -201,11 +201,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776511930,
+        "lastModified": 1753964049,
-        "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=",
+        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "39435900785d0c560c6ae8777d29f28617d031ef",
+        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
         "type": "github"
       },
       "original": {
@@ -230,11 +230,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776426399,
+        "lastModified": 1760445448,
-        "narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=",
+        "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84",
+        "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
         "type": "github"
       },
       "original": {
@@ -248,23 +248,22 @@
         "aquamarine": "aquamarine",
         "hyprcursor": "hyprcursor",
         "hyprgraphics": "hyprgraphics",
-        "hyprland-guiutils": "hyprland-guiutils",
         "hyprland-protocols": "hyprland-protocols",
+        "hyprland-qtutils": "hyprland-qtutils",
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
-        "hyprwire": "hyprwire",
         "nixpkgs": "nixpkgs",
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1776889279,
+        "lastModified": 1761869718,
-        "narHash": "sha256-oKSqtplor0a6xzWRq6KL2um504x5VZ0Afw1N6ZiiC48=",
+        "narHash": "sha256-jLfwwlPGpnGRAtVDyoGj9FgH2D9hWwyEu0yHkflG2EI=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "300cdb7c3241969ac04cd02a5e13010a28ebb830",
+        "rev": "8e9add2afda58d233a75e4c5ce8503b24fa59ceb",
         "type": "github"
       },
       "original": {
@@ -273,52 +272,6 @@
         "type": "github"
       }
     },
-    "hyprland-guiutils": {
-      "inputs": {
-        "aquamarine": [
-          "hyprland",
-          "aquamarine"
-        ],
-        "hyprgraphics": [
-          "hyprland",
-          "hyprgraphics"
-        ],
-        "hyprlang": [
-          "hyprland",
-          "hyprlang"
-        ],
-        "hyprtoolkit": "hyprtoolkit",
-        "hyprutils": [
-          "hyprland",
-          "hyprutils"
-        ],
-        "hyprwayland-scanner": [
-          "hyprland",
-          "hyprwayland-scanner"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1776426575,
-        "narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=",
-        "owner": "hyprwm",
-        "repo": "hyprland-guiutils",
-        "rev": "a968d211048e3ed538e47b84cb3649299578f19d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-guiutils",
-        "type": "github"
-      }
-    },
     "hyprland-protocols": {
       "inputs": {
         "nixpkgs": [
@@ -331,11 +284,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772460177,
+        "lastModified": 1759610243,
-        "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=",
+        "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917",
+        "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
         "type": "github"
       },
       "original": {
@@ -344,6 +297,74 @@
         "type": "github"
       }
     },
+    "hyprland-qt-support": {
+      "inputs": {
+        "hyprlang": [
+          "hyprland",
+          "hyprland-qtutils",
+          "hyprlang"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "hyprland-qtutils",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "hyprland-qtutils",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1749154592,
+        "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=",
+        "owner": "hyprwm",
+        "repo": "hyprland-qt-support",
+        "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-qt-support",
+        "type": "github"
+      }
+    },
+    "hyprland-qtutils": {
+      "inputs": {
+        "hyprland-qt-support": "hyprland-qt-support",
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprland",
+          "hyprland-qtutils",
+          "hyprlang",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1759080228,
+        "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=",
+        "owner": "hyprwm",
+        "repo": "hyprland-qtutils",
+        "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-qtutils",
+        "type": "github"
+      }
+    },
     "hyprlang": {
       "inputs": {
         "hyprutils": [
@@ -360,11 +381,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776426736,
+        "lastModified": 1758927902,
-        "narHash": "sha256-rl7i4aY+9p8LysJp7o8uRWahCkpFznCgGHXszlTw7b0=",
+        "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "7833ff33b2e82d3406337b5dcf0d1cec595d83e9",
+        "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
         "type": "github"
       },
       "original": {
@@ -373,58 +394,6 @@
         "type": "github"
       }
     },
-    "hyprtoolkit": {
-      "inputs": {
-        "aquamarine": [
-          "hyprland",
-          "hyprland-guiutils",
-          "aquamarine"
-        ],
-        "hyprgraphics": [
-          "hyprland",
-          "hyprland-guiutils",
-          "hyprgraphics"
-        ],
-        "hyprlang": [
-          "hyprland",
-          "hyprland-guiutils",
-          "hyprlang"
-        ],
-        "hyprutils": [
-          "hyprland",
-          "hyprland-guiutils",
-          "hyprutils"
-        ],
-        "hyprwayland-scanner": [
-          "hyprland",
-          "hyprland-guiutils",
-          "hyprwayland-scanner"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "hyprland-guiutils",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "hyprland-guiutils",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1772462885,
-        "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=",
-        "owner": "hyprwm",
-        "repo": "hyprtoolkit",
-        "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprtoolkit",
-        "type": "github"
-      }
-    },
     "hyprutils": {
       "inputs": {
         "nixpkgs": [
@@ -437,11 +406,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776428866,
+        "lastModified": 1759619523,
-        "narHash": "sha256-XfRlBolGtjvalTHJp3XvvpYLBjkMhaZLLU0WqZ91Fcg=",
+        "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "eedd60805cd96d4442586f2ba5fe51d549b12674",
+        "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef",
         "type": "github"
       },
       "original": {
@@ -462,11 +431,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776430932,
+        "lastModified": 1755184602,
-        "narHash": "sha256-Yv3RPiUvl7CAsJgwIVsqcj7akn1gLyJP1F/mocof5hA=",
+        "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "4c2fcc06dc9722c97dbb54ba649c69b18ce83d2e",
+        "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
         "type": "github"
       },
       "original": {
@@ -475,35 +444,6 @@
         "type": "github"
       }
     },
-    "hyprwire": {
-      "inputs": {
-        "hyprutils": [
-          "hyprland",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1776728575,
-        "narHash": "sha256-z9eGphrArEBpl1O/GCH0wlY6z4K9vA6yWh2gAS6qytU=",
-        "owner": "hyprwm",
-        "repo": "hyprwire",
-        "rev": "f3a80888783702a39691b684d099e16b83ed4702",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprwire",
-        "type": "github"
-      }
-    },
     "lanzaboote": {
       "inputs": {
         "crane": "crane",
@@ -539,22 +479,22 @@
         "rev": "314b4c2745e277d28132d7988f7e3e6f3424fddb",
         "shallow": true,
         "type": "git",
-        "url": "ssh://git@git.dogar.dev:2222/shahab/nix-secrets"
+        "url": "ssh://git@git.dogar.dev/shahab/nix-secrets"
       },
       "original": {
         "ref": "main",
         "shallow": true,
         "type": "git",
-        "url": "ssh://git@git.dogar.dev:2222/shahab/nix-secrets"
+        "url": "ssh://git@git.dogar.dev/shahab/nix-secrets"
       }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1776830795,
+        "lastModified": 1761933221,
-        "narHash": "sha256-PAfvLwuHc1VOvsLcpk6+HDKgMEibvZjCNvbM1BJOA7o=",
+        "narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "72674a6b5599e844c045ae7449ba91f803d44ebc",
+        "rev": "7467f155fcba189eb088a7601f44fbef7688669b",
         "type": "github"
       },
       "original": {
@@ -565,11 +505,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1776548001,
+        "lastModified": 1761114652,
-        "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
+        "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
+        "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
         "type": "github"
       },
       "original": {
@@ -597,11 +537,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1776548001,
+        "lastModified": 1761672384,
-        "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
+        "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
+        "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
         "type": "github"
       },
       "original": {
@@ -621,11 +561,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776796298,
+        "lastModified": 1760663237,
-        "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=",
+        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad",
+        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
         "type": "github"
       },
       "original": {
@@ -701,11 +641,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776771786,
+        "lastModified": 1760998189,
-        "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=",
+        "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598",
+        "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
         "type": "github"
       },
       "original": {
@@ -757,11 +697,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776608502,
+        "lastModified": 1760713634,
-        "narHash": "sha256-UH8YoQxx4hFOm6qjMdjRQNRvSejFIR/wBZ8fW1p9sME=",
+        "narHash": "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "4a293523d36dfa367e67ec304cc718ea66a8fec2",
+        "rev": "753bbbdf6a052994da94062e5b753288cef28dfb",
         "type": "github"
       },
       "original": {

flake.nix

@@ -9,12 +9,12 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # Hyprland cachix flake
+    hyprland.url = "github:hyprwm/Hyprland";
+
     # NixOS community managed hardware specific features/fixes
     nixos-hardware.url = "github:NixOS/nixos-hardware";
 
-    # Hyprland
-    hyprland.url = "github:hyprwm/Hyprland";
-
     # Secure boot
     lanzaboote = {
       url = "github:nix-community/lanzaboote/v0.4.2";
@@ -35,49 +35,39 @@
 
     # Secrets
     nix-secrets = {
-      url = "git+ssh://git@git.dogar.dev:2222/shahab/nix-secrets?shallow=1&ref=main";
+      url = "git+ssh://git@git.dogar.dev/shahab/nix-secrets?shallow=1&ref=main";
       flake = false;
     };
   };
 
-  outputs =
+  outputs = {nixpkgs, ...} @ inputs: let
-    { nixpkgs, ... }@inputs:
+    inherit (nixpkgs) lib;
-    let
+    mkHost = host: {
-      inherit (nixpkgs) lib;
+      ${host} = nixpkgs.lib.nixosSystem {
-      mkHost = host: {
+        specialArgs = {
-        ${host} = nixpkgs.lib.nixosSystem {
+          inherit inputs;
-          specialArgs = {
-            inherit inputs;
 
-            # Extend lib with lib.custom
+          # Extend lib with lib.custom
-            lib = nixpkgs.lib.extend (
+          lib = nixpkgs.lib.extend (self: super: {
-              self: super: {
+            custom = import ./lib {inherit (nixpkgs) lib;};
-                custom = import ./lib { inherit (nixpkgs) lib; };
+          });
-              }
-            );
-          };
-
-          modules = [ ./hosts/nixos/${host} ];
         };
+
+        modules = [./hosts/nixos/${host}];
       };
-      mkHostConfigs = hosts: lib.foldl (acc: set: acc // set) { } (lib.map (host: mkHost host) hosts);
-      readHosts = folder: lib.attrNames (builtins.readDir ./hosts/${folder});
-    in
-    {
-      nixosConfigurations = mkHostConfigs (readHosts "nixos");
-
-      devShells.x86_64-linux.default =
-        let
-          pkgs = nixpkgs.legacyPackages.x86_64-linux;
-        in
-        pkgs.mkShell {
-          buildInputs = with pkgs; [
-            nil
-            nodejs
-            lua-language-server
-            kubernetes-helm
-            kubectl
-          ];
-        };
     };
+    mkHostConfigs = hosts:
+      lib.foldl (acc: set: acc // set) {}
+      (lib.map (host: mkHost host) hosts);
+    readHosts = folder: lib.attrNames (builtins.readDir ./hosts/${folder});
+  in {
+    nixosConfigurations = mkHostConfigs (readHosts "nixos");
+
+    devShells.x86_64-linux.default = let
+      pkgs = nixpkgs.legacyPackages.x86_64-linux;
+    in
+      pkgs.mkShell {
+        buildInputs = with pkgs; [nil lua-language-server kubernetes-helm kubectl];
+      };
+  };
 }

home/dogar/blueocean.nix

@@ -1,44 +0,0 @@
-{ config, lib, ... }:
-{
-  imports = lib.flatten [
-    #
-    # ========== Required Configs ==========
-    #
-    ./common/core
-
-    #
-    # ========== Host-specific Optional Configs ==========
-    #
-    (map (config: "${builtins.toString ./.}/common/optional/${config}.nix") [
-      "btop"
-      "direnv"
-      "firefox"
-      "fonts"
-      "ghostty"
-      "git"
-      "hyprland"
-      "kitty"
-      "misc-packages"
-      "nvim"
-      "ssh"
-      "starship"
-      "tmux"
-      "uv"
-      "zsh"
-    ])
-  ];
-
-  services.yubikey-touch-detector.enable = true;
-
-  home = {
-    # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-    stateVersion = "25.05";
-    sessionVariables = {
-      EDITOR = "nvim";
-      NIXOS_OZONE_WL = "1";
-      GOPROXY = "https://go.dogar.dev";
-    };
-    file.".npmrc".source =
-      config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/git/nix-config/dotfiles/npm/.npmrc";
-  };
-}

home/dogar/common/core/default.nix

@@ -1,46 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  hostSpec,
-  ...
-}:
-{
-  imports = lib.flatten [
-    (map lib.custom.relativeToRoot [
-      "modules/common"
-      "modules/home-manager"
-    ])
-  ];
-
-  inherit hostSpec;
-
-  home = {
-    username = lib.mkDefault config.hostSpec.username;
-    homeDirectory = lib.mkDefault config.hostSpec.home;
-    stateVersion = lib.mkDefault "25.05";
-    sessionPath = [ "$HOME/.local/bin" ];
-    sessionVariables = {
-      FLAKE = "$HOME/src/nix/nix-config";
-      SHELL = "zsh";
-      VISUAL = "nvim";
-      EDITOR = "nvim";
-    };
-  };
-
-  nix = {
-    package = lib.mkDefault pkgs.nix;
-    settings = {
-      experimental-features = [
-        "nix-command"
-        "flakes"
-      ];
-      warn-dirty = false;
-    };
-  };
-
-  programs.home-manager.enable = true;
-
-  # Nicely reload system units when changing configs
-  systemd.user.startServices = "sd-switch";
-}

home/dogar/common/optional/btop.nix

@@ -1,6 +0,0 @@
-{ ... }:
-{
-  programs.btop = {
-    enable = true;
-  };
-}

home/dogar/common/optional/direnv.nix

@@ -1,8 +0,0 @@
-{
-  programs.direnv = {
-    enable = true;
-    enableBashIntegration = true;
-    enableZshIntegration = true;
-    nix-direnv.enable = true;
-  };
-}

home/dogar/common/optional/firefox.nix

@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.firefox = {
-    enable = true;
-    package = pkgs.firefox.override {
-      cfg = {
-        # Gnome shell native connector
-        enableGnomeExtensions = true;
-      };
-    };
-  };
-}

home/dogar/common/optional/fonts.nix

@@ -1,5 +0,0 @@
-{ pkgs, ... }:
-{
-  fonts.fontconfig.enable = true;
-  home.packages = with pkgs; [ nerd-fonts.jetbrains-mono ];
-}

home/dogar/common/optional/ghostty.nix

@@ -1,13 +0,0 @@
-{ config, ... }:
-{
-  programs.ghostty = {
-    enable = false;
-
-    settings = {
-      theme = "catppuccin-mocha";
-      font-family = config.hostSpec.font;
-      font-size = 14;
-      initial-command = "tmux";
-    };
-  };
-}

home/dogar/common/optional/git.nix

@@ -1,46 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-{
-  programs.git = {
-    enable = true;
-    lfs.enable = true;
-
-    settings = {
-      core = {
-        excludesfile = "~/.gitignore";
-      };
-      user = {
-        name = config.hostSpec.userFullName;
-        email = config.hostSpec.email.user;
-      };
-      gpg = {
-        format = "ssh";
-      };
-      "gpg \"ssh\"" = {
-        program = "${lib.getExe' pkgs._1password-gui "op-ssh-sign"}";
-      };
-      commit = {
-        gpgsign = true;
-      };
-      user = {
-        signingKey = "~/.ssh/id_ed25519.pub";
-      };
-      pull = {
-        rebase = true;
-      };
-      init = {
-        defaultBranch = "main";
-      };
-      lfs = {
-        locksverify = true;
-      };
-      "url \"ssh://git@github.com/\"" = {
-        insteadOf = "https://github.com/";
-      };
-    };
-  };
-}

home/dogar/common/optional/hyprland.nix

@@ -1,37 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  hostSpec,
-  ...
-}:
-{
-  home = {
-    file = {
-      "${config.xdg.configHome}/hypr/hyprland.conf".source =
-        config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hyprland.conf"}";
-      "${config.xdg.configHome}/hypr/host.conf".source =
-        config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hosts/${hostSpec.hostName}.conf"}";
-      "${config.xdg.configHome}/hypr/hypridle.conf".source =
-        config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hypridle.conf"}";
-      "${config.xdg.configHome}/hypr/hyprlock.conf".source =
-        config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hyprlock.conf"}";
-      "${config.xdg.configHome}/waybar".source =
-        config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/waybar"}";
-      "${config.xdg.configHome}/wofi".source =
-        config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/wofi"}";
-      "${config.xdg.configHome}/mako".source =
-        config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/mako"}";
-    };
-
-    packages = with pkgs; [
-      hyprshot
-      hyprlock
-      hypridle
-      hyprpolkitagent
-      waybar
-      wofi
-      mako
-    ];
-  };
-}

home/dogar/common/optional/kitty.nix

@@ -1,15 +0,0 @@
-{ config, ... }:
-{
-  programs.kitty = {
-    enable = true;
-
-    shellIntegration.enableZshIntegration = true;
-    settings = {
-      font = config.hostSpec.font;
-      shell = "tmux";
-      font-size = 16.0;
-      active_border_color = "#44ffff";
-      single_window_margin_width = 0;
-    };
-  };
-}

home/dogar/common/optional/misc-packages.nix

@@ -1,40 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    awscli2
-    btop
-    lm_sensors
-    zoxide
-    unzip
-    tmux
-    gcc
-    zig
-    gparted
-    gnupg
-    dig
-    bash
-    kdePackages.dolphin
-    font-awesome
-    tree
-    wl-clipboard-rs
-    brightnessctl
-    age
-    nerd-fonts.jetbrains-mono
-    lazygit
-    gh
-    dbeaver-bin
-    cloudflare-warp
-    rpi-imager
-    kubectl
-    k9s
-    postgresql_17
-    kitty
-    waybar
-    obsidian
-    yq
-    jq
-    opencode
-    ollama
-    postman
-  ];
-}

home/dogar/common/optional/nvim.nix

@@ -1,13 +0,0 @@
-{ config, pkgs, ... }:
-{
-  home.packages = [ pkgs.neovim ];
-
-  home.sessionVariables.EDITOR = "nvim";
-
-  home.file = {
-    ".local/bin/vi".source = "${pkgs.neovim}/bin/nvim";
-    ".local/bin/vim".source = "${pkgs.neovim}/bin/nvim";
-    ".config/nvim".source =
-      config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/git/nix-config/dotfiles/nvim";
-  };
-}

home/dogar/common/optional/ssh.nix

@@ -1,12 +0,0 @@
-{ ... }:
-let
-  onePassPath = "~/.1password/agent.sock";
-in
-{
-  programs.ssh = {
-    enable = true;
-    enableDefaultConfig = false;
-    extraConfig = "IdentityAgent ${onePassPath}";
-    matchBlocks."*" = { };
-  };
-}

home/dogar/common/optional/starship.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-  programs.starship.enable = true;
-}

home/dogar/common/optional/tmux.nix

@@ -1,15 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  home = {
-    file = {
-      "${config.xdg.configHome}/tmux".source = lib.custom.relativeToRoot "dotfiles/tmux";
-    };
-
-    packages = with pkgs; [ tmux ];
-  };
-}

home/dogar/common/optional/uv.nix

@@ -1,11 +0,0 @@
-{
-  ...
-}:
-{
-  programs.uv = {
-    enable = true;
-    settings = {
-      pip.index-url = "https://pip.dogar.dev/root/pypi/+simple";
-    };
-  };
-}

home/dogar/common/optional/zsh.nix

@@ -1,45 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}:
-{
-  home.packages = with pkgs; [
-    eza
-    ripgrep
-    rm-improved
-    dust
-    xcp
-    nh
-    zoxide
-  ];
-
-  programs.zsh = {
-    enable = true;
-    enableCompletion = true;
-    autosuggestion.enable = true;
-    syntaxHighlighting.enable = true;
-
-    initContent = ''
-      eval "$(zoxide init zsh)"
-      export PATH=/home/dogar/.opencode/bin:$PATH
-    '';
-
-    shellAliases = {
-      ".." = "cd ..";
-      ls = "exa";
-      vim = "nvim";
-      grep = "rg";
-      du = "dust";
-      rm = "rip";
-      cp = "xcp";
-      uo = "nh os switch ~/git/nix-config";
-      k = "kubectl";
-    };
-
-    history = {
-      size = 10000;
-      path = "${config.xdg.dataHome}/zsh/history";
-    };
-  };
-}

home/shahab/aamil-1.nix

@@ -1,5 +1,4 @@
-{ lib, ... }:
+{lib, ...}: {
-{
   imports = lib.flatten [
     #
     # ========== Required Configs ==========

home/shahab/aamil-2.nix

@@ -1,5 +1,4 @@
-{ lib, ... }:
+{lib, ...}: {
-{
   imports = lib.flatten [
     #
     # ========== Required Configs ==========

home/shahab/aamil-3.nix

@@ -1,5 +1,4 @@
-{ lib, ... }:
+{lib, ...}: {
-{
   imports = lib.flatten [
     #
     # ========== Required Configs ==========

home/shahab/common/core/default.nix

@@ -4,13 +4,9 @@
   pkgs,
   hostSpec,
   ...
-}:
+}: {
-{
   imports = lib.flatten [
-    (map lib.custom.relativeToRoot [
+    (map lib.custom.relativeToRoot ["modules/common" "modules/home-manager"])
-      "modules/common"
-      "modules/home-manager"
-    ])
   ];
 
   inherit hostSpec;
@@ -19,7 +15,7 @@
     username = lib.mkDefault config.hostSpec.username;
     homeDirectory = lib.mkDefault config.hostSpec.home;
     stateVersion = lib.mkDefault "25.05";
-    sessionPath = [ "$HOME/.local/bin" ];
+    sessionPath = ["$HOME/.local/bin"];
     sessionVariables = {
       FLAKE = "$HOME/src/nix/nix-config";
       SHELL = "zsh";
@@ -31,10 +27,7 @@
   nix = {
     package = lib.mkDefault pkgs.nix;
     settings = {
-      experimental-features = [
+      experimental-features = ["nix-command" "flakes"];
-        "nix-command"
-        "flakes"
-      ];
       warn-dirty = false;
     };
   };

home/shahab/common/optional/btop.nix

@@ -1,6 +1,3 @@
-{ ... }:
+{...}: {
-{
+  programs.btop = {enable = true;};
-  programs.btop = {
-    enable = true;
-  };
 }

home/shahab/common/optional/firefox.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   programs.firefox = {
     enable = true;
     package = pkgs.firefox.override {

home/shahab/common/optional/fonts.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   fonts.fontconfig.enable = true;
-  home.packages = with pkgs; [ nerd-fonts.jetbrains-mono ];
+  home.packages = with pkgs; [nerd-fonts.jetbrains-mono];
 }

home/shahab/common/optional/ghostty.nix

@@ -1,5 +1,4 @@
-{ config, ... }:
+{config, ...}: {
-{
   programs.ghostty = {
     enable = true;
 

home/shahab/common/optional/git.nix

@@ -3,8 +3,7 @@
   pkgs,
   config,
   ...
-}:
+}: {
-{
   programs.git = {
     enable = true;
     lfs.enable = true;
@@ -14,27 +13,15 @@
         name = config.hostSpec.userFullName;
         email = config.hostSpec.email.user;
       };
-      gpg = {
+      gpg = {format = "ssh";};
-        format = "ssh";
-      };
       "gpg \"ssh\"" = {
         program = "${lib.getExe' pkgs._1password-gui "op-ssh-sign"}";
       };
-      commit = {
+      commit = {gpgsign = true;};
-        gpgsign = true;
+      user = {signingKey = "~/.ssh/id_rihla.pub";};
-      };
+      pull = {rebase = true;};
-      user = {
+      init = {defaultBranch = "main";};
-        signingKey = "~/.ssh/id_rihla.pub";
+      lfs = {locksverify = true;};
-      };
-      pull = {
-        rebase = true;
-      };
-      init = {
-        defaultBranch = "main";
-      };
-      lfs = {
-        locksverify = true;
-      };
     };
   };
 }

home/shahab/common/optional/hyprland.nix

@@ -2,16 +2,12 @@
   config,
   lib,
   pkgs,
-  hostSpec,
   ...
-}:
+}: {
-{
   home = {
     file = {
       "${config.xdg.configHome}/hypr/hyprland.conf".source =
         config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hyprland.conf"}";
-      "${config.xdg.configHome}/hypr/host.conf".source =
-        config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hosts/${hostSpec.hostName}.conf"}";
       "${config.xdg.configHome}/hypr/hypridle.conf".source =
         config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hypridle.conf"}";
       "${config.xdg.configHome}/hypr/hyprlock.conf".source =
@@ -25,10 +21,13 @@
     };
 
     packages = with pkgs; [
-      sassc
+      hyprshot
-      nwg-look
+      hyprlock
+      hypridle
+      hyprpolkitagent
+      waybar
+      wofi
+      mako
     ];
   };
-
-  services.swww.enable = true;
 }

home/shahab/common/optional/kitty.nix

@@ -1,5 +1,4 @@
-{ config, ... }:
+{config, ...}: {
-{
   programs.kitty = {
     enable = true;
 

home/shahab/common/optional/misc-packages.nix

@@ -1,8 +1,7 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   home.packages = with pkgs; [
+    uv
     btop
-    discord
     zoxide
     unzip
     tmux
@@ -24,7 +23,7 @@
     dbeaver-bin
     cloudflare-warp
     protonmail-desktop
-    rpi-imager
+    protonvpn-gui
     kubectl
     k9s
     postgresql_17
@@ -33,7 +32,5 @@
     obsidian
     yq
     jq
-    postman
-    ollama
   ];
 }

home/shahab/common/optional/nvim.nix

@@ -1,13 +1,13 @@
-{ config, pkgs, ... }:
+{config, ...}: {
-{
+  programs.neovim = {
-  home.packages = [ pkgs.neovim ];
+    enable = true;
-
+    defaultEditor = true;
-  home.sessionVariables.EDITOR = "nvim";
+    viAlias = true;
-
+    vimAlias = true;
-  home.file = {
-    ".local/bin/vi".source = "${pkgs.neovim}/bin/nvim";
-    ".local/bin/vim".source = "${pkgs.neovim}/bin/nvim";
-    "${config.xdg.configHome}/nvim".source =
-      config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/git/nix-config/dotfiles/nvim";
   };
+
+  # Create a symlink from ~/.config/nvim to the dotfiles directory
+  home.file.".config/nvim".source =
+    config.lib.file.mkOutOfStoreSymlink
+    "${config.home.homeDirectory}/git/nix-config/dotfiles/nvim";
 }

home/shahab/common/optional/ssh.nix

@@ -1,12 +1,10 @@
-{ ... }:
+{...}: let
-let
   onePassPath = "~/.1password/agent.sock";
-in
+in {
-{
   programs.ssh = {
     enable = true;
     enableDefaultConfig = false;
     extraConfig = "IdentityAgent ${onePassPath}";
-    matchBlocks."*" = { };
+    matchBlocks."*" = {};
   };
 }

home/shahab/common/optional/starship.nix

@@ -1,4 +1 @@
-{ ... }:
+{...}: {programs.starship.enable = true;}
-{
-  programs.starship.enable = true;
-}

home/shahab/common/optional/tmux.nix

@@ -3,13 +3,13 @@
   lib,
   pkgs,
   ...
-}:
+}: {
-{
   home = {
     file = {
-      "${config.xdg.configHome}/tmux".source = lib.custom.relativeToRoot "dotfiles/tmux";
+      "${config.xdg.configHome}/tmux".source =
+        lib.custom.relativeToRoot "dotfiles/tmux";
     };
 
-    packages = with pkgs; [ tmux ];
+    packages = with pkgs; [tmux];
   };
 }

home/shahab/common/optional/uv.nix

@@ -1,11 +0,0 @@
-{
-  ...
-}:
-{
-  programs.uv = {
-    enable = true;
-    settings = {
-      pip.index-url = "https://pip.dogar.dev";
-    };
-  };
-}

home/shahab/common/optional/zsh.nix

@@ -2,8 +2,7 @@
   config,
   pkgs,
   ...
-}:
+}: {
-{
   home.packages = with pkgs; [
     eza
     ripgrep
@@ -22,7 +21,6 @@
 
     initContent = ''
       eval "$(zoxide init zsh)"
-      export PATH=/home/shahab/.opencode/bin:$PATH
     '';
 
     shellAliases = {

home/shahab/rihla.nix

@@ -1,5 +1,4 @@
-{ config, lib, ... }:
+{lib, ...}: {
-{
   imports = lib.flatten [
     #
     # ========== Required Configs ==========
@@ -23,7 +22,6 @@
       "ssh"
       "starship"
       "tmux"
-      "uv"
       "zsh"
     ])
   ];
@@ -36,9 +34,6 @@
     sessionVariables = {
       EDITOR = "nvim";
       NIXOS_OZONE_WL = "1";
-      GOPROXY = "https://go.dogar.dev,direct";
     };
-    file.".npmrc".source =
-      config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/git/nix-config/dotfiles/npm/.npmrc";
   };
 }

home/shahab/specialisations/gaming.nix

@@ -1,6 +1,10 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   home.packages = with pkgs; [
+    discord
+    protonmail-desktop
+    protonvpn-gui
+    kitty
+    waybar
     prismlauncher
   ];
 }

hosts/common/core/default.nix

@@ -4,8 +4,7 @@
   config,
   lib,
   ...
-}:
+}: {
-{
   imports = lib.flatten [
     inputs.home-manager.nixosModules.home-manager
     inputs.sops-nix.nixosModules.sops
@@ -17,6 +16,9 @@
   ];
 
   hostSpec = {
+    username = "shahab";
+    handle = "shahab96";
+    email = {user = "shahab@dogar.dev";};
     userFullName = "Shahab Dogar";
     networking.ports.tcp.ssh = 22;
   };
@@ -51,20 +53,13 @@
 
       auto-optimise-store = true;
       warn-dirty = false;
-      trusted-users = [ "@wheel" ];
+      trusted-users = ["@wheel"];
 
-      substituters = [
+      substituters = ["https://hyprland.cachix.org" "https://nix.dogar.dev"];
-        "https://hyprland.cachix.org"
-        "https://nix.dogar.dev"
-      ];
-      trusted-substituters = [ "https://hyprland.cachix.org" ];
       trusted-public-keys = [
         "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
       ];
-      experimental-features = [
+      experimental-features = ["nix-command" "flakes"];
-        "nix-command"
-        "flakes"
-      ];
     };
   };
 
@@ -74,11 +69,11 @@
     enable = true;
     clean.enable = true;
     clean.extraArgs = "--keep-since 10d --keep 10";
-    flake = "${config.hostSpec.home}/nix-config";
+    flake = "/home/user/${config.hostSpec.home}/nix-config";
   };
 
   # ========= Sops =========
-  environment.systemPackages = with pkgs; [ sops ];
+  environment.systemPackages = with pkgs; [sops];
 
   #
   # ========== Localization ==========

hosts/common/disks/aamil.nix

@@ -27,10 +27,7 @@
                 passwordFile = "/tmp/secret.key";
                 settings = {
                   allowDiscards = true;
-                  crypttabExtraOpts = [
+                  crypttabExtraOpts = ["fido2-device=auto" "token-timeout=10"];
-                    "fido2-device=auto"
-                    "token-timeout=10"
-                  ];
                 };
                 content = {
                   type = "filesystem";

hosts/common/disks/blueocean.nix

@@ -1,135 +0,0 @@
-{
-  lib,
-  primary,
-  nix,
-  withSwap,
-  swapSize,
-  label,
-  ...
-}:
-{
-  disko = {
-    devices = {
-      disk = {
-        main = {
-          device = primary;
-
-          type = "disk";
-          content = {
-            type = "gpt";
-            partitions = {
-              boot = {
-                name = "boot";
-                size = "1M";
-                type = "EF02";
-              };
-              esp = {
-                name = "ESP";
-                size = "500M";
-                type = "EF00";
-                content = {
-                  type = "filesystem";
-                  format = "vfat";
-                  mountpoint = "/boot";
-                };
-              };
-              luks = {
-                size = "100%";
-                content = {
-                  name = "crypted";
-                  type = "luks";
-                  passwordFile = "/tmp/secret.key";
-                  settings = {
-                    allowDiscards = true;
-                    crypttabExtraOpts = [
-                      "fido2-device=auto"
-                      "token-timeout=10"
-                    ];
-                  };
-                  content = {
-                    type = "lvm_pv";
-                    vg = "crypt_vg";
-                  };
-                };
-              };
-            };
-          };
-        };
-        secondary = {
-          device = nix;
-
-          type = "disk";
-          content = {
-            type = "gpt";
-            partitions = {
-              luks = {
-                size = "100%";
-                content = {
-                  name = "crypt-nix";
-                  type = "luks";
-                  passwordFile = "/tmp/secret.key";
-                  settings = {
-                    allowDiscards = true;
-                    crypttabExtraOpts = [
-                      "fido2-device=auto"
-                      "token-timeout=10"
-                    ];
-                  };
-                  content = {
-                    type = "btrfs";
-                    extraArgs = [ "-L nix -f" ];
-                    subvolumes = {
-                      "@nix" = {
-                        mountpoint = "/nix";
-                        mountOptions = [
-                          "subvol=nix"
-                          "compress=zstd"
-                          "noatime"
-                        ];
-                      };
-                    };
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-      lvm_vg = {
-        crypt_vg = {
-          type = "lvm_vg";
-          lvs = {
-            swap = lib.mkIf withSwap {
-              size = "${swapSize}G";
-              content = {
-                type = "swap";
-                resumeDevice = true;
-              };
-            };
-            main = {
-              size = "100%";
-              content = {
-                type = "btrfs";
-                extraArgs = [
-                  "-L"
-                  label
-                  "-f"
-                ];
-                subvolumes = {
-                  "@root" = {
-                    mountpoint = "/";
-                    mountOptions = [
-                      "subvol=root"
-                      "compress=zstd"
-                      "noatime"
-                    ];
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}

hosts/common/disks/rihla.nix

@@ -6,8 +6,7 @@
   swapSize,
   label,
   ...
-}:
+}: {
-{
   disko = {
     devices = {
       disk = {
@@ -41,10 +40,7 @@
                   passwordFile = "/tmp/secret.key";
                   settings = {
                     allowDiscards = true;
-                    crypttabExtraOpts = [
+                    crypttabExtraOpts = ["fido2-device=auto" "token-timeout=10"];
-                      "fido2-device=auto"
-                      "token-timeout=10"
-                    ];
                   };
                   content = {
                     type = "lvm_pv";
@@ -71,35 +67,19 @@
               size = "100%";
               content = {
                 type = "btrfs";
-                extraArgs = [
+                extraArgs = ["-L" label "-f"];
-                  "-L"
-                  label
-                  "-f"
-                ];
                 subvolumes = {
                   "@root" = {
                     mountpoint = "/";
-                    mountOptions = [
+                    mountOptions = ["subvol=root" "compress=zstd" "noatime"];
-                      "subvol=root"
-                      "compress=zstd"
-                      "noatime"
-                    ];
                   };
                   "@persist" = {
                     mountpoint = config.hostSpec.persist;
-                    mountOptions = [
+                    mountOptions = ["subvol=persist" "compress=zstd" "noatime"];
-                      "subvol=persist"
-                      "compress=zstd"
-                      "noatime"
-                    ];
                   };
                   "@nix" = {
                     mountpoint = "/nix";
-                    mountOptions = [
+                    mountOptions = ["subvol=nix" "compress=zstd" "noatime"];
-                      "subvol=nix"
-                      "compress=zstd"
-                      "noatime"
-                    ];
                   };
                 };
               };

hosts/common/optional/1password.nix

@@ -1,10 +1,9 @@
-{ config, ... }:
+{config, ...}: {
-{
   programs = {
     _1password.enable = true;
     _1password-gui = {
       enable = true;
-      polkitPolicyOwners = [ config.hostSpec.username ];
+      polkitPolicyOwners = [config.hostSpec.username];
     };
   };
 }

hosts/common/optional/android-studio.nix

@@ -1,24 +0,0 @@
-{ pkgs, ... }:
-let
-  androidComposition = pkgs.androidenv.composeAndroidPackages {
-    includeNDK = true;
-  };
-  androidSdk = androidComposition.androidsdk;
-in
-{
-  environment = {
-    systemPackages = with pkgs; [
-      androidSdk
-      android-studio
-    ];
-
-    variables = let
-      sdkPath = "${androidSdk}/libexec/android-sdk";
-    in {
-      ANDROID_HOME = sdkPath;
-      ANDROID_SDK_ROOT = sdkPath;
-      ANDROID_NDK_ROOT = "${sdkPath}/ndk-bundle";
-      ANDROID_USER_HOME = "\${HOME}/.android";
-    };
-  };
-}

hosts/common/optional/claude-code.nix

@@ -1,4 +1,3 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
+  environment.systemPackages = with pkgs; [claude-code];
-  environment.systemPackages = with pkgs; [ claude-code ];
 }

hosts/common/optional/dconf.nix

@@ -1,4 +1,3 @@
-{ ... }:
+{...}: {
-{
   programs.dconf.enable = true;
 }

hosts/common/optional/docker.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   virtualisation = {
     docker = {
       enable = true;
@@ -12,11 +11,7 @@
       };
     };
 
-    containers = {
+    containers = {registries = {search = ["docker.io"];};};
-      registries = {
-        search = [ "docker.io" ];
-      };
-    };
 
     libvirtd = {
       enable = true;

hosts/common/optional/hoppscotch.nix

@@ -1,4 +1,3 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
+  environment.systemPackages = with pkgs; [hoppscotch];
-  environment.systemPackages = with pkgs; [ hoppscotch ];
 }

hosts/common/optional/hyprland.nix

@@ -2,25 +2,19 @@
   inputs,
   pkgs,
   ...
-}:
+}: {
-{
+  programs.hyprland = {
-  programs = {
+    enable = true;
-    hyprland = {
+    package =
-      enable = true;
+      inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-      xwayland.enable = true;
+    portalPackage =
-      systemd.setPath.enable = true;
+      inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
-      package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-      portalPackage =
-        inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
-    };
-
-    hyprlock.enable = true;
   };
 
-  services.hypridle.enable = true;
-
   environment.systemPackages = with pkgs; [
     hyprshot
+    hyprlock
+    hypridle
     hyprpolkitagent
     mako
     waybar

hosts/common/optional/nix-ld.nix

@@ -1,4 +1,3 @@
-{ ... }:
+{...}: {
-{
   programs.nix-ld.enable = true;
 }

hosts/common/optional/obs.nix

@@ -1,14 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.obs-studio = {
-    enable = true;
-
-    plugins = with pkgs.obs-studio-plugins; [
-      wlrobs
-      obs-backgroundremoval
-      obs-pipewire-audio-capture
-      obs-gstreamer
-      obs-vkcapture
-    ];
-  };
-}

hosts/common/optional/postman.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [ postman ];
-}

hosts/common/optional/rclone.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [ rclone ];
-}

hosts/common/optional/secure-boot.nix

@@ -1,4 +1,3 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
+  environment.systemPackages = with pkgs; [sbctl];
-  environment.systemPackages = with pkgs; [ sbctl ];
 }

hosts/common/optional/services/audio.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   services = {
     # Enable sound with pipewire.
     pulseaudio.enable = false;
@@ -13,5 +12,6 @@
   };
   security.rtkit.enable = true;
 
-  environment.systemPackages = builtins.attrValues { inherit (pkgs) pavucontrol; };
+  environment.systemPackages =
+    builtins.attrValues {inherit (pkgs) pavucontrol;};
 }

hosts/common/optional/services/bluetooth.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   services.blueman.enable = true;
   hardware = {
     bluetooth.enable = true;

hosts/common/optional/services/firmware.nix

@@ -1,4 +1,3 @@
-{ ... }:
+{...}: {
-{
   services.fwupd.enable = true;
 }

hosts/common/optional/services/greetd.nix

@@ -1,10 +1,9 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   services.greetd = {
     enable = true;
     settings = {
       default_session = {
-        command = "${pkgs.tuigreet}/bin/tuigreet --greeting 'Welcome to NixOS!' --asterisks --remember --remember-user-session --time --cmd start-hyprland";
+        command = "${pkgs.tuigreet}/bin/tuigreet --greeting 'Welcome to NixOS!' --asterisks --remember --remember-user-session --time --cmd ${pkgs.hyprland}/bin/Hyprland";
         user = "greeter";
       };
     };

hosts/common/optional/services/k3s.nix

@@ -1,7 +1,6 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   environment.systemPackages = with pkgs; [
-    k3s_1_35
+    k3s
     cifs-utils
     nfs-utils
   ];
@@ -9,8 +8,7 @@
   services.k3s = {
     enable = true;
     role = "agent";
-    # Add this before running
+    token = "K10aad4485a9e2a872775c6560ab812ac1a05d2dc4c86f189fdf56e5fdc673dcc10::server:G7zhbpu7iSUYvM2e";
-    token = "";
     serverAddr = "https://rashid:6443";
   };
 }

hosts/common/optional/services/openiscsi.nix

@@ -1,8 +1,6 @@
-{ config, ... }:
+{config, ...}: let
-let
   hostName = config.hostSpec.hostName;
-in
+in {
-{
   services.openiscsi = {
     enable = true;
     name = "iqn.2016-04.com.open-iscsi:${hostName}";

hosts/common/optional/services/openssh.nix

@@ -1,11 +1,9 @@
-{ config, ... }:
+{config, ...}: let
-let
   sshPort = config.hostSpec.networking.ports.tcp.ssh;
-in
+in {
-{
   services.openssh = {
     enable = true;
-    ports = [ sshPort ];
+    ports = [sshPort];
 
     settings = {
       PermitRootLogin = "no";
@@ -16,5 +14,5 @@ in
     openFirewall = true;
   };
 
-  networking.firewall.allowedTCPPorts = [ sshPort ];
+  networking.firewall.allowedTCPPorts = [sshPort];
 }