Reorganize modules

modules/home/programs/bitwarden.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  home.packages = [
+    pkgs.bitwarden-desktop
+  ];
+}

modules/home/programs/direnv.nix

@@ -0,0 +1,13 @@
+{ pkgs, config, ... }:
+
+{
+  programs.direnv = {
+    enable = true;
+    enableZshIntegration = true;
+    nix-direnv.enable = true;
+  };
+
+  home.file.".config/direnv/direnvrc" = {
+    source = ./direnv/direnvrc;
+  };
+}

modules/home/programs/direnv/direnvrc

@@ -0,0 +1,15 @@
+# Place in ~/.config/direnv/direnvrc
+
+# Two things to know:
+# * `direnv_layour_dir` is called once for every {.direnvrc,.envrc} sourced
+# * The indicator for a different direnv file being sourced is a different $PWD value
+# This means we can hash $PWD to get a fully unique cache path for any given environment
+
+: ${XDG_CACHE_HOME:=$HOME/.cache}
+declare -A direnv_layout_dirs
+direnv_layout_dir() {
+	echo "${direnv_layout_dirs[$PWD]:=$(
+		echo -n "$XDG_CACHE_HOME"/direnv/layouts/
+		echo -n "$PWD" | sha1sum | cut -d ' ' -f 1
+	)}"
+}

modules/home/programs/fastfetch/config.jsonc

@@ -0,0 +1,12 @@
+{
+  "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/master/doc/json_schema.json",
+  "modules": [
+    "os",
+    "uptime",
+    "cpu",
+    "gpu",
+    "memory",
+    "swap",
+    "disk",
+  ]
+}

modules/home/programs/firefox.nix

@@ -0,0 +1,39 @@
+{ pkgs, config, ... }:
+
+{
+  programs.firefox = {
+    enable = true;
+    configPath = "${config.xdg.configHome}/mozilla/firefox";
+    profiles.default = {
+      settings = {
+        "extensions.activeThemeID" = "firefox-compact-dark@mozilla.org";
+      };
+    };
+
+    policies = {
+      # From https://discourse.nixos.org/t/declare-firefox-extensions-and-settings/36265/17
+      ExtensionSettings =
+        with builtins;
+        let
+          extension = shortId: uuid: {
+            name = uuid;
+            value = {
+              install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi";
+              installation_mode = "normal_installed";
+            };
+          };
+        in
+        listToAttrs [
+          (extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}")
+          (extension "ublock-origin" "uBlock0@raymondhill.net")
+          (extension "privacy-badger17" "jid1-MnnxcxisBPnSXQ@jetpack")
+          (extension "i-dont-care-about-cookies" "jid1-KKzOGWgsW3Ao4Q@jetpack")
+        ];
+      # To add additional extensions, find it on addons.mozilla.org, find
+      # the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/)
+      # Then, download the XPI by filling it in to the install_url template, unzip it,
+      # run `jq .browser_specific_settings.gecko.id manifest.json` or
+      # `jq .applications.gecko.id manifest.json` to get the UUID
+    };
+  };
+}

modules/home/programs/git.nix

@@ -0,0 +1,32 @@
+{ lib
+, pkgsUnstable
+, config
+, ...
+}:
+
+{
+  options.home.git = {
+    userName = lib.mkOption {
+      type = lib.types.str;
+      default = "Armel van Ravels";
+      description = "Default git user.name for this user";
+    };
+
+    userEmail = lib.mkOption {
+      type = lib.types.str;
+      default = "armel@armel.nl";
+      description = "Default git user.email for this user";
+    };
+  };
+
+  config = {
+    programs.git = {
+      enable = true;
+      package = pkgsUnstable.git;
+      settings.user = {
+        name = config.home.git.userName;
+        email = config.home.git.userEmail;
+      };
+    };
+  };
+}

modules/home/programs/kitty.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+
+{
+  programs.kitty = {
+    enable = true;
+    settings.confirm_quit = false;
+  };
+}

modules/home/programs/libreoffice.nix

@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    libreoffice
+
+    hunspell
+    hunspellDicts.en_US
+    hunspellDicts.nl_NL
+  ];
+}

modules/home/programs/nvim.nix

@@ -0,0 +1,161 @@
+{ pkgs, ... }:
+
+{
+  programs.neovim = {
+    enable = true;
+    withRuby = false;
+    withPython3 = false;
+    defaultEditor = true;
+    extraLuaPackages = ps: [ ps.magick ];
+    extraPackages = [
+      pkgs.ueberzugpp
+      pkgs.imagemagick
+    ];
+
+    plugins = with pkgs.vimPlugins; [
+      neo-tree-nvim
+      catppuccin-nvim
+      tokyonight-nvim
+      nvim-lspconfig
+      nvim-cmp
+      cmp-nvim-lsp
+      cmp-buffer
+      cmp-path
+      plenary-nvim
+      telescope-nvim
+      (nvim-treesitter.withAllGrammars)
+      vim-nix
+      lualine-nvim
+      image-nvim
+    ];
+
+    initLua = ''
+        vim.cmd("colorscheme catppuccin-mocha")
+        -- Basic settings
+        vim.o.number = true
+        vim.o.relativenumber = true
+
+        -- =========================
+        -- LSP (Neovim 0.11+ way)
+        -- =========================
+
+        -- Add cmp capabilities
+        local capabilities = require("cmp_nvim_lsp").default_capabilities()
+
+        vim.lsp.config("nil_ls", {
+          capabilities = capabilities,
+        })
+
+        -- PHP LSP
+        vim.lsp.config("intelephense", {
+          capabilities = capabilities,
+        })
+
+        vim.lsp.enable("intelephense")
+
+
+        vim.lsp.enable("nil_ls")
+
+        -- =========================
+        -- nvim-cmp
+        -- =========================
+
+        local cmp = require("cmp")
+
+        cmp.setup({
+          mapping = cmp.mapping.preset.insert({
+            ["<C-Space>"] = cmp.mapping.complete(),
+            ["<CR>"] = cmp.mapping.confirm({ select = true }),
+          }),
+          sources = {
+            { name = "nvim_lsp" },
+            { name = "buffer" },
+            { name = "path" },
+          }
+        })
+
+        -- =========================
+        -- Telescope
+        -- =========================
+
+        local builtin = require("telescope.builtin")
+        vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
+        vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
+
+        -- =========================
+        -- Lualine (status line with Git branch)
+        -- =========================
+        require('lualine').setup {
+          options = {
+            theme = 'catppuccin',  -- match your colorscheme
+            section_separators = {'', ''},
+            component_separators = {'', ''},
+          },
+          sections = {
+            lualine_a = {'mode'},
+            lualine_b = {'branch'},  -- shows Git branch here
+            lualine_c = {'filename'},
+            lualine_x = {'encoding', 'fileformat', 'filetype'},
+            lualine_y = {'progress'},
+            lualine_z = {'location'}
+          }
+        }
+
+        -- =========================
+        -- image-nvim
+        -- ========================= 
+        require("image").setup({
+          backend = "ueberzug", -- or "ueberzug" or "sixel"
+          processor = "magick_cli", -- or "magick_rock"
+          integrations = {
+          markdown = {
+            enabled = true,
+            clear_in_insert_mode = false,
+            download_remote_images = true,
+            only_render_image_at_cursor = false,
+            only_render_image_at_cursor_mode = "popup", -- or "inline"
+            floating_windows = false, -- if true, images will be rendered in floating markdown windows
+            filetypes = { "markdown", "vimwiki" }, -- markdown extensions (ie. quarto) can go here
+          },
+          asciidoc = {
+            enabled = true,
+            clear_in_insert_mode = false,
+            download_remote_images = true,
+            only_render_image_at_cursor = false,
+            only_render_image_at_cursor_mode = "popup",
+            floating_windows = false,
+            filetypes = { "asciidoc", "adoc" },
+          },
+          neorg = {
+            enabled = true,
+            filetypes = { "norg" },
+          },
+          rst = {
+            enabled = true,
+          },
+          typst = {
+            enabled = true,
+            filetypes = { "typst" },
+          },
+          html = {
+            enabled = false,
+          },
+          css = {
+            enabled = false,
+          },
+        },
+        max_width = nil,
+        max_height = nil,
+        max_width_window_percentage = nil,
+        max_height_window_percentage = 50,
+        scale_factor = 1.0,
+        window_overlap_clear_enabled = false, -- toggles images when windows are overlapped
+        window_overlap_clear_ft_ignore = { "cmp_menu", "cmp_docs", "snacks_notif", "scrollview", "scrollview_sign" },
+        editor_only_render_when_focused = false, -- auto show/hide images when the editor gains/looses focus
+        tmux_show_only_in_active_window = false, -- auto show/hide images in the correct Tmux window (needs visual-activity off)
+        hijack_file_patterns = { "*.png", "*.jpg", "*.jpeg", "*.gif", "*.webp", "*.avif" }, -- render image files as images when opened
+      })
+
+    '';
+  };
+}

modules/home/programs/ripgrep.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    ripgrep
+  ];
+}

modules/home/programs/tmux.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+
+{
+  programs.tmux = {
+    enable = true;
+    mouse = true;
+  };
+}

modules/home/programs/vscode.nix

@@ -0,0 +1,47 @@
+{ pkgs, pkgsUnstable, ... }:
+
+let
+  extensions = with pkgs.vscode-extensions; [
+    ms-dotnettools.csharp
+    ms-dotnettools.csdevkit
+    ms-dotnettools.vscode-dotnet-runtime
+    mkhl.direnv
+    catppuccin.catppuccin-vsc
+    bmewburn.vscode-intelephense-client
+    continue.continue
+    vue.volar
+    ms-vscode-remote.remote-containers
+  ];
+
+  userSettings = {
+    "editor.lineNumbers" = "relative";
+    "workbench.colorTheme" = "Catppuccin Mocha";
+    "workbench.editor.enablePreview" = false;
+    "direnv.restart.automatic" = true;
+
+    "terminal.integrated.defaultProfile.linux" = "zsh";
+    "terminal.integrated.profiles.linux".zsh = {
+      path = "${pkgs.zsh}/bin/zsh";
+    };
+  };
+
+  editors = {
+    vscode = pkgsUnstable.vscode.fhs;
+    cursor = pkgsUnstable.code-cursor-fhs;
+    vscodium = pkgsUnstable.vscodium-fhs;
+  };
+
+  mkEditor = package: {
+    enable = true;
+    inherit package;
+
+    profiles.default = {
+      inherit extensions;
+      inherit userSettings;
+    };
+  };
+
+in
+{
+  programs = builtins.mapAttrs (_: mkEditor) editors;
+}

modules/home/programs/zsh.nix

@@ -0,0 +1,22 @@
+{ pkgs, ... }:
+
+{
+  home.file.".zsh/fastfetch.jsonc".source = ./fastfetch/config.jsonc;
+  home.file.".zsh/functions/dex.zsh".source = ./zsh/functions/dex.zsh;
+
+  programs.zsh = {
+    enable = true;
+
+    oh-my-zsh = {
+      enable = true;
+      theme = "agnoster";
+    };
+
+    initContent = ''
+      # Use kitty's ssh helper if running inside kitty
+      [ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"
+
+      source ~/.zsh/functions/dex.zsh
+    '';
+  };
+}

modules/home/programs/zsh/functions/dex.zsh

@@ -0,0 +1,59 @@
+dex() {
+  clear
+  local container
+
+  container=$(
+    docker ps --format '{{.Names}}\t{{.Image}}\t{{.Status}}' |
+      sort |
+      fzf \
+        --delimiter=$'\t' \
+        --with-nth=1,2,3 \
+        --header=$'Ctrl-I: Inspect | Ctrl-L: Logs | Ctrl-R: Refresh | ?: Toggle Preview\n\nNAME\tIMAGE\tSTATUS' \
+        --tabstop=4 \
+        --height=100% \
+        --layout=reverse \
+        --border=rounded \
+        --info=inline-right \
+        --prompt='🐳 Container > ' \
+        --pointer='▶' \
+        --marker='✓' \
+        --preview 'docker logs -f --tail=50 {1} 2>&1' \
+        --preview-label=' Logs ' \
+        --preview-window='right,65%,follow,border-left,wrap' \
+        --bind 'ctrl-r:reload(docker ps --format "{{.Names}}\t{{.Image}}\t{{.Status}}" | sort)' \
+        --bind 'ctrl-u:preview-half-page-up' \
+        --bind 'ctrl-d:preview-half-page-down' \
+        --bind '?:toggle-preview' \
+        --bind 'ctrl-l:change-preview(docker logs -f --tail=50 {1} 2>&1)+change-preview-label(Logs)' \
+        --bind 'ctrl-i:change-preview(
+          docker inspect --format "
+Name:      {{.Name}}
+Image:     {{.Config.Image}}
+Status:    {{.State.Status}}
+Running:   {{.State.Running}}
+Started:   {{.State.StartedAt}}
+Finished:  {{.State.FinishedAt}}
+PID:       {{.State.Pid}}
+Exit Code: {{.State.ExitCode}}
+
+Networks:
+{{range .NetworkSettings.Networks}}  • {{.IPAddress}}
+{{end}}
+
+Mounts:
+{{range .Mounts}}  • {{.Source}} -> {{.Destination}}
+{{end}}
+" {1}
+        )+change-preview-label(Inspect)' |
+      cut -f1
+  ) || return
+
+  docker exec -it "$container" sh -c '
+    for shell in bash ash zsh sh; do
+      command -v "$shell" >/dev/null 2>&1 && exec "$shell"
+    done
+
+    echo "No suitable shell found." >&2
+    exit 1
+  '
+}