server: add forgejo and postgresql

- add `.cargo/bin` to PATH

flake.lock

@@ -318,11 +318,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1751271578,
+        "lastModified": 1755186698,
-        "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=",
+        "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df",
+        "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
         "type": "github"
       },
       "original": {

hosts/thegeneralist-central/acme/default.nix

@@ -17,6 +17,9 @@ in {
         extraDomainNames = [ "*.${domain}" ];
         group = "acme";
       };
+      "git.${domain}" = {
+        group = "acme";
+      };
       "internal.${domain}" = {
         group = "acme";
       };

hosts/thegeneralist-central/archive/archivebox.nix

@@ -20,14 +20,14 @@
       };
     };
 
-    pywb = {
+    # pywb = {
-      image = "docker.io/webrecorder/pywb";
+    #   image = "docker.io/webrecorder/pywb";
-      ports = [ "127.0.0.1:8001:8001" ];
+    #   ports = [ "127.0.0.1:8001:8001" ];
-      volumes = [
+    #   volumes = [
-        "/mnt/usb/services/browsertrix/webrecorder/:/"
+    #     "/mnt/usb/services/browsertrix/webrecorder/:/"
-        "/mnt/usb/services/browsertrix/webrecorder/webarchive:/webarchive"
+    #     "/mnt/usb/services/browsertrix/webrecorder/webarchive:/webarchive"
-      ];
+    #   ];
-    };
+    # };
   };
 
   environment.systemPackages = [ pkgs.docker ];

hosts/thegeneralist-central/archive/default.nix

@@ -5,7 +5,7 @@ let
   ssl = {
     forceSSL = true;
     quic = true;
-    useACMEHost = domain;
+    useACMEHost = acmeDomain;
   };
 in
 {

hosts/thegeneralist-central/configuration.nix

@@ -5,7 +5,7 @@
 { config, pkgs, inputs, ... }:
 
 {
-  imports = [ ./hardware-configuration.nix ./site.nix ./cache ./archive ];
+  imports = [ ./hardware-configuration.nix ./site.nix ./cache ./archive ./forgejo ];
 
   age.secrets.password.file = ./password.age;
   users.users = {

hosts/thegeneralist-central/credentials_personal.age

@@ -0,0 +1,5 @@
+<EFBFBD>
+<EFBFBD>
+<EFBFBD>
+<EFBFBD>
+<EFBFBD>

hosts/thegeneralist-central/dns.nix

@@ -1,75 +1,42 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 let
-  internalZoneFile = pkgs.writeText "internal.zone" ''
+  subdomains = [ "internal" "archive" "crawler" "r" "b" "s" "p" "q" "cloud" ];
-    $ORIGIN internal.thegeneralist01.com.
+
-    @   IN SOA  ns.internal.thegeneralist01.com. thegeneralist01.proton.me. (
+  mainZoneFile = pkgs.writeText "thegeneralist01.zone" ''
-          2025071801 ; serial (yyyymmddXX)
+    $ORIGIN thegeneralist01.com.
+    @   IN SOA  ns.thegeneralist01.com. thegeneralist01.proton.me. (
+          2025081501 ; serial (yyyymmddXX)
           3600       ; refresh
           600        ; retry
           86400      ; expire
           3600       ; minimum
     )
-        IN NS   ns.internal.thegeneralist01.com.
+        IN NS   ns.thegeneralist01.com.
     ns  IN A    100.86.129.23
     @   IN A    100.86.129.23
+    ${lib.concatStringsSep "\n" (lib.map (sub: "${sub} IN A 100.86.129.23") subdomains)}
   '';
 
-  archiveZoneFile = pkgs.writeText "archive.zone" ''
+  forwarderBlock = ''
-    $ORIGIN archive.thegeneralist01.com.
+    .:53 {
-    @   IN SOA  ns.archive.thegeneralist01.com. thegeneralist01.proton.me. (
+      forward . 100.100.100.100 45.90.28.181 45.90.30.181
-          2025073101 ; serial (yyyymmddXX)
+      cache
-          3600       ; refresh
+      log
-          600        ; retry
+      errors
-          86400      ; expire
+    }
-          3600       ; minimum
-    )
-        IN NS   ns.archive.thegeneralist01.com.
-    ns  IN A    100.86.129.23
-    @   IN A    100.86.129.23
-  '';
-
-  crawlerZoneFile = pkgs.writeText "crawler.zone" ''
-    $ORIGIN crawler.thegeneralist01.com.
-    @   IN SOA  ns.crawler.thegeneralist01.com. thegeneralist01.proton.me. (
-          2025080801 ; serial (yyyymmddXX)
-          3600       ; refresh
-          600        ; retry
-          86400      ; expire
-          3600       ; minimum
-    )
-        IN NS   ns.crawler.thegeneralist01.com.
-    ns  IN A    100.86.129.23
-    @   IN A    100.86.129.23
   '';
 in
 {
   services.coredns = {
     enable = true;
     config = ''
-      internal.thegeneralist01.com:53 {
+      thegeneralist01.com:53 {
-        file ${internalZoneFile}
+        file ${mainZoneFile}
         log
         errors
       }
 
-      archive.thegeneralist01.com:53 {
+      ${forwarderBlock}
-        file ${archiveZoneFile}
-        log
-        errors
-      }
-
-      crawler.thegeneralist01.com:53 {
-        file ${crawlerZoneFile}
-        log
-        errors
-      }
-
-      .:53 {
-        forward . 100.100.100.100 45.90.28.181 45.90.30.181
-        cache
-        log
-        errors
-      }
     '';
   };
 

hosts/thegeneralist-central/forgejo/default.nix

@@ -0,0 +1,94 @@
+let
+  forgejo_root_dir = "/var/lib/forgejo";
+  domain = "git.thegeneralist01.com";
+
+  forgejo_folder = folder_name: "${forgejo_root_dir}/${folder_name}";
+in
+{
+  imports = [ ../../../modules/postgresql.nix ];
+
+  services.forgejo = {
+    enable = true;
+    stateDir = forgejo_folder "state";
+
+    lfs.enable = true;
+
+    settings =
+      let
+        title = "thegeneralist01's forgejo";
+        desc = "the attic of thegeneralist01's random repositories";
+      in
+      {
+        default.APP_NAME = title;
+        "ui.meta" = {
+          AUTHOR = title;
+          DESCRIPTION = desc;
+        };
+
+        attachment.ALLOWED_TYPES = "*/*";
+        cache.ENABLED = true;
+
+        "cron.archive_cleanup" =
+          let
+            interval = "4h";
+          in
+          {
+            SCHEDULE = "@every ${interval}";
+            OLDER_THAN = interval;
+          };
+
+        packages.ENABLED = true;
+        mailer = {
+          ENABLED = false;
+
+          # PROTOCOL = "smtps";
+          # SMTP_ADDR = self.disk.mailserver.fqdn;
+          # USER = "git@${domain}";
+        };
+
+        other = {
+          SHOW_FOOTER_TEMPLATE_LOAD_TIME = false;
+          SHOW_FOOTER_VERSION = false;
+        };
+
+        repository = {
+          DEFAULT_BRANCH = "master";
+          DEFAULT_MERGE_STYLE = "rebase-merge";
+          DEFAULT_REPO_UNITS = "repo.code, repo.issues, repo.pulls";
+
+          DEFAULT_PUSH_CREATE_PRIVATE = false;
+          ENABLE_PUSH_CREATE_ORG = true;
+          ENABLE_PUSH_CREATE_USER = true;
+
+          DISABLE_STARS = true;
+        };
+
+        "repository.upload" = {
+          FILE_MAX_SIZE = 100;
+          MAX_FILES = 10;
+        };
+
+        server = {
+          ROOT_URL = "https://${domain}/";
+          DOMAIN = domain;
+          LANDING_PAGE = "/explore";
+
+          HTTP_ADDR = "127.0.0.1";
+          HTTP_PORT = 3000;
+
+          SSH_LISTEN_HOST = "0.0.0.0";
+          SSH_PORT = 2222;
+          SSH_LISTEN_PORT = 2222;
+        };
+
+        service.DISABLE_REGISTRATION = true;
+
+        session = {
+          COOKIE_SECURE = true;
+          SAME_SITE = "strict";
+        };
+      };
+  };
+
+  networking.firewall.allowedTCPPorts = [ 2222 ];
+}

hosts/thegeneralist-central/site.nix

@@ -1,31 +1,38 @@
-{ config, pkgs, ... }: let
+{ config, pkgs, ... }:
+let
   domain = "thegeneralist01.com";
+	family_domain = builtins.getEnv "FAMILY_DOMAIN";
 
   ssl = {
-    quic        = true;
+    quic = true;
     useACMEHost = domain;
   };
-in {
+in
-  imports = [ ./acme ./dns.nix ./jellyfin ];
+{
+  imports = [
+    ./acme
+    ./dns.nix
+    ./jellyfin
+  ];
 
   # Nginx
   services.nginx = {
-    enable                        = true;
+    enable = true;
-    package                       = pkgs.nginxQuic;
+    package = pkgs.nginxQuic;
-    enableQuicBPF                 = true;
+    enableQuicBPF = true;
 
-    recommendedZstdSettings       = true;
+    experimentalZstdSettings = true;
-    recommendedUwsgiSettings      = true;
+    recommendedUwsgiSettings = true;
-    recommendedTlsSettings        = true;
+    recommendedTlsSettings = true;
-    recommendedProxySettings      = true;
+    recommendedProxySettings = true;
-    recommendedOptimisation       = true;
+    recommendedOptimisation = true;
-    recommendedGzipSettings       = true;
+    recommendedGzipSettings = true;
-    recommendedBrotliSettings     = true;
+    recommendedBrotliSettings = true;
 
-    statusPage                    = true;
+    statusPage = true;
-    validateConfigFile            = true;
+    validateConfigFile = true;
 
-    virtualHosts."${domain}"      = ssl // {
+    virtualHosts."${domain}" = ssl // {
       root = "/var/www/${domain}";
       locations."/".tryFiles = "$uri $uri.html $uri/ $uri/index.html =404";
 
@@ -43,13 +50,35 @@ in {
       '';
     };
 
-    virtualHosts."www.${domain}"  = ssl // {
+    virtualHosts."www.${domain}" = ssl // {
       locations."/".return = "306 https://${domain}$request_uri";
     };
 
-    virtualHosts._ = ssl // {
+    virtualHosts."${family_domain}" = {
-      locations."/".return = "307 https://${domain}/404";
+      root = "/var/www/${family_domain}";
+      locations."/".tryFiles = "$uri $uri.html $uri/ $uri/index.html =404";
+
+      extraConfig = ''
+        if ($http_x_forwarded_proto = "http") {
+          return 301 https://${family_domain}$request_uri;
+        }
+
+        location ~* \.(html|css|js|jpg|jpeg|png|gif|svg|ico|woff2?)$ {
+          expires 1d;
+          add_header Cache-Control "public";
+        }
+
+        error_page 404 /404.html;
+      '';
     };
+
+    virtualHosts."www.${family_domain}" = {
+      locations."/".return = "306 https://${family_domain}$request_uri";
+    };
+
+    # virtualHosts._ = ssl // {
+    #   locations."/".return = "307 https://${domain}/404";
+    # };
   };
 
   # Cloudflare
@@ -57,21 +86,35 @@ in {
 
   age.secrets.cftcert.file = ./cert.pem.age;
   age.secrets.cftcredentials.file = ./credentials.age;
+  age.secrets.cftcredentials_personal.file = ./credentials_personal.age;
 
   services.cloudflared = {
     enable = true;
     certificateFile = config.age.secrets.cftcert.path;
 
-    tunnels."site" = {
+    tunnels = {
-      ingress = {
+      "site" = {
-        "thegeneralist01.com" = "http://localhost:80";
+        ingress = {
-        "www.thegeneralist01.com" = "http://localhost:80";
+          "thegeneralist01.com" = "http://localhost:80";
-        "cache.thegeneralist01.com" = "http://localhost:80";
+          "www.thegeneralist01.com" = "http://localhost:80";
-      };
+          "cache.thegeneralist01.com" = "http://localhost:80";
-      default = "http_status:404";
+          "git.thegeneralist01.com" = "http://localhost:3000";
+        };
+        default = "http_status:404";
 
-      credentialsFile = config.age.secrets.cftcredentials.path;
+        credentialsFile = config.age.secrets.cftcredentials.path;
-      certificateFile = config.age.secrets.cftcert.path;
+        certificateFile = config.age.secrets.cftcert.path;
+      };
+      "personal" = {
+        ingress = {
+          "${family_domain}" = "http://localhost:80";
+          "www.${family_domain}" = "http://localhost:80";
+        };
+        default = "http_status:404";
+
+        credentialsFile = config.age.secrets.cftcredentials_personal.path;
+        certificateFile = config.age.secrets.cftcert.path;
+      };
     };
   };
 }

lib/default.nix

@@ -1,5 +1,6 @@
 inputs: self: super:
 let
   system = import ./system.nix inputs self super;
+  option = import ./option.nix inputs self super;
 in
-system
+system // option

lib/option.nix

@@ -0,0 +1,12 @@
+_: _: super: let
+  inherit (super) mkOption;
+in {
+  mkConst = value: mkOption {
+    default  = value;
+    readOnly = true;
+  };
+
+  mkValue = default: mkOption {
+    inherit default;
+  };
+}

modules/common/ghostty.nix

@@ -11,7 +11,7 @@
       clearDefaultKeybinds = false;
       settings = {
         # theme = "tokyonight";
-        theme = "GruvboxDarkHard";
+        theme = "Gruvbox Dark Hard";
         font-family = "Berkeley Mono";
         font-size = 16;
 

modules/common/neovim.nix

@@ -19,7 +19,10 @@ in {
 
       python313
       python313Packages.pip
+      uv
       python313Packages.virtualenv
+      basedpyright
+      black
 
       nodejs
       nodePackages."sass"

modules/common/nix.nix

@@ -25,7 +25,7 @@ in {
       "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
     ];
 
-    trusted-users = [ "thegeneralist" "central" "root" "@build" "@wheel" "@admin" ];
+    trusted-users = [ "thegeneralist" "central" "root" "@build" "@wheel" "@admin" "jellyfin" "git" ];
 
     builders-use-substitutes = true;
   };

modules/common/nushell/config.nu

@@ -22,7 +22,7 @@ $env.config.completions = {
     enable:      true
     max_results: 100
     completer:   {|tokens: list<string>|
-      let expanded = scope aliases | where name == $tokens.0 | get --ignore-errors expansion.0
+      let expanded = scope aliases | where name == $tokens.0 | get --optional expansion.0
 
       mut expanded_tokens = if $expanded != null and $tokens.0 != "cd" {
         $expanded | split row " " | append ($tokens | skip 1)
@@ -67,3 +67,12 @@ alias ah = cd ~/dotfiles/hosts/thegeneralist
 alias ai3 = nvim /home/thegeneralist/dotfiles/hosts/thegeneralist/dotfiles/i3/config
 # alias rb = sudo nixos-rebuild switch --flake ~/dotfiles#thegeneralist
 alias rb = nh os switch . -v -- --show-trace --verbose
+
+def greeting [] {
+  let quotes = [
+    "What is impossible for you is not impossible for me."
+  ]
+  echo ($quotes | get (random int 0..(($quotes | length) - 1)))
+}
+
+greeting

modules/common/nushell/default.nix

@@ -21,6 +21,7 @@ in {
       fzf
       gh
       fastfetch
+      carapace
     ];
 
     shellAliases = {
@@ -73,10 +74,16 @@ in {
         envFile.text = readFile ./env.nu;
         environmentVariables = config.environment.variables // homeArgs.config.home.sessionVariables;
       };
+      programs.carapace = {
+        enable = true;
+        enableZshIntegration = true;
+        enableNushellIntegration = true;
+      };
       programs.zsh = {
         enable = true;
         sessionVariables = config.environment.variables // homeArgs.config.home.sessionVariables;
       };
+      home.sessionPath = [ "/Users/thegeneralist/.cargo/bin" ];
     })
   ];
 }

modules/common/rust.nix

@@ -26,6 +26,9 @@
       nixfmt-rfc-style
 
       libiconv
+
+      clang
+      clang-analyzer
     ];
   };
 }

modules/common/tailscale.nix

@@ -1,7 +1,7 @@
 {
-  services.tailscale = {
+  # services.tailscale = {
-    enable = true;
+  #   enable = true;
-  };
+  # };
-
+  #
-  networking.search = [ "shorthair-wall.ts.net" ];
+  # networking.search = [ "shorthair-wall.ts.net" ];
 }

modules/darwin/karabiner.nix

@@ -1,18 +1,31 @@
 let
   numbers = [
-    "1" "2" "3" "4" "5" "6" "7" "8" "9" "0"
+    "1"
+    "2"
+    "3"
+    "4"
+    "5"
+    "6"
+    "7"
+    "8"
+    "9"
+    "0"
   ];
 
   number_to_symbol = num: {
     type = "basic";
     from = {
       key_code = num;
-      modifiers = { optional = [ "caps_lock" ]; };
+      modifiers = {
+        optional = [ "caps_lock" ];
+      };
     };
-    to = [{
+    to = [
-      key_code = num;
+      {
-      modifiers = ["left_shift"];
+        key_code = num;
-    }];
+        modifiers = [ "left_shift" ];
+      }
+    ];
   };
 
   symbol_to_number = num: {
@@ -24,55 +37,80 @@ let
         optional = [ "caps_lock" ];
       };
     };
-    to = [{
+    to = [
-      key_code = num;
+      {
-    }];
+        key_code = num;
+      }
+    ];
   };
 
-  manipulators = builtins.concatLists (map (n: [
+  manipulators = builtins.concatLists (
-    (number_to_symbol n)
+    map (n: [
-    (symbol_to_number n)
+      (number_to_symbol n)
-  ]) numbers);
+      (symbol_to_number n)
+    ]) numbers
+  );
 
   simple_modifications = [
     {
       from.apple_vendor_top_case_key_code = "keyboard_fn";
-      to = [{ key_code = "left_control"; }];
+      to = [ { key_code = "left_control"; } ];
     }
     {
       from.key_code = "left_control";
-      to = [{ apple_vendor_top_case_key_code = "keyboard_fn"; }];
+      to = [ { apple_vendor_top_case_key_code = "keyboard_fn"; } ];
     }
   ];
 
   complex_modifications = {
     name = "Complex Modifications";
-    rules = [{
+    rules = [
-      description = "Change numbers to symbols and vice versa";
+      # {
-      manipulators = manipulators;
+      #   description = "Change numbers to symbols and vice versa";
-    }];
+      #   manipulators = manipulators;
+      # }
+      {
+        description = "Toggle Focus Mode with F6";
+        manipulators = [
+          {
+            from = {
+              "key_code" = "f6";
+            };
+            to = [ { "shell_command" = "shortcuts run 'Reduced Interruptions'"; } ];
+            type = "basic";
+          }
+        ];
+      }
+    ];
   };
 
   config = builtins.toJSON {
     global.show_in_menu_bar = false;
 
-    profiles = [{
+    profiles = [
-      name     = "default";
+      {
-      selected = true;
+        name = "default";
-      virtual_hid_keyboard.keyboard_type_v2 = "ansi";
+        selected = true;
-      inherit simple_modifications;
+        virtual_hid_keyboard.keyboard_type_v2 = "ansi";
-      inherit complex_modifications;
+        inherit simple_modifications;
+        inherit complex_modifications;
 
-      devices = [{
+        devices = [
-        identifiers.is_keyboard = true;
+          {
-      }];
+            identifiers.is_keyboard = true;
-    }];
+          }
+        ];
+      }
+    ];
   };
-in {
+in
-  home-manager.sharedModules = [{
+{
-    home.file.".config/karabiner/karabiner.json" = {
+  home-manager.sharedModules = [
-      force = true;
+    {
-      text = config;
+      home.file.".config/karabiner/karabiner.json" = {
-    };
+        force = true;
-  }];
+        text = config;
+      };
+    }
+  ];
 }

modules/darwin/packages.nix

@@ -1,5 +1,5 @@
 { pkgs, ... }: {
   homebrew.enable = true;
-  homebrew.casks = [ "ungoogled-chromium" ];
+  homebrew.casks = [ "google-chrome" ];
   environment.systemPackages = [ pkgs.iina ];
 }

modules/dotfiles/nvim/lua/thegeneralist/lazy/autopairs.lua

@@ -0,0 +1,7 @@
+return {
+  "windwp/nvim-autopairs",
+  event = "InsertEnter",
+  config = true,
+  -- use opts = {} for passing setup options
+  -- this is equivalent to setup({}) function
+}

modules/dotfiles/nvim/lua/thegeneralist/lazy/blink.lua

@@ -1,84 +1,86 @@
 return {
-	{
+  {
-		"saghen/blink.cmp",
+    "saghen/blink.cmp",
-		dependencies = { "rafamadriz/friendly-snippets" },
+    dependencies = { "rafamadriz/friendly-snippets" },
-		version = "1.*",
+    version = "1.*",
-		opts = {
+    opts = {
-			-- 'default' (recommended) for mappings similar to built-in completions (C-y to accept)
+      -- 'default' (recommended) for mappings similar to built-in completions (C-y to accept)
-			-- 'super-tab' for mappings similar to vscode (tab to accept)
+      -- 'super-tab' for mappings similar to vscode (tab to accept)
-			-- 'enter' for enter to accept
+      -- 'enter' for enter to accept
-			-- 'none' for no mappings
+      -- 'none' for no mappings
-			--
+      --
-			-- All presets have the following mappings:
+      -- All presets have the following mappings:
-			-- C-space: Open menu or open docs if already open
+      -- C-space: Open menu or open docs if already open
-			-- C-n/C-p or Up/Down: Select next/previous item
+      -- C-n/C-p or Up/Down: Select next/previous item
-			-- C-e: Hide menu
+      -- C-e: Hide menu
-			-- C-k: Toggle signature help (if signature.enabled = true)
+      -- C-k: Toggle signature help (if signature.enabled = true)
-			--
+      --
-			-- See :h blink-cmp-config-keymap for defining your own keymap
+      -- See :h blink-cmp-config-keymap for defining your own keymap
-			keymap = { preset = "default" },
+      keymap = {
+        preset = "default",
+      },
 
-			appearance = {
+      appearance = {
-				nerd_font_variant = "mono",
+        nerd_font_variant = "mono",
-			},
+      },
 
-			-- (Default) Only show the documentation popup when manually triggered
+      -- (Default) Only show the documentation popup when manually triggered
-			completion = { documentation = { auto_show = false } },
+      completion = { documentation = { auto_show = false } },
 
-			-- Default list of enabled providers defined so that you can extend it
+      -- Default list of enabled providers defined so that you can extend it
-			-- elsewhere in your config, without redefining it, due to `opts_extend`
+      -- elsewhere in your config, without redefining it, due to `opts_extend`
-			sources = {
+      sources = {
-				default = { "lsp", "path", "snippets", "buffer" },
+        default = { "lsp", "path", "snippets", "buffer" },
-			},
+      },
 
-			-- (Default) Rust fuzzy matcher for typo resistance and significantly better performance
+      -- (Default) Rust fuzzy matcher for typo resistance and significantly better performance
-			-- You may use a lua implementation instead by using `implementation = "lua"` or fallback to the lua implementation,
+      -- You may use a lua implementation instead by using `implementation = "lua"` or fallback to the lua implementation,
-			-- when the Rust fuzzy matcher is not available, by using `implementation = "prefer_rust"`
+      -- when the Rust fuzzy matcher is not available, by using `implementation = "prefer_rust"`
-			--
+      --
-			-- See the fuzzy documentation for more information
+      -- See the fuzzy documentation for more information
-			fuzzy = { implementation = "prefer_rust_with_warning" },
+      fuzzy = { implementation = "prefer_rust_with_warning" },
-		},
+    },
-		opts_extend = { "sources.default" },
+    opts_extend = { "sources.default" },
-	},
+  },
 
-	-- {
+  -- {
-	--   'neovim/nvim-lspconfig',
+  --   'neovim/nvim-lspconfig',
-	--   dependencies = {
+  --   dependencies = {
-	--     'saghen/blink.cmp',
+  --     'saghen/blink.cmp',
-	-- 	'williamboman/mason.nvim',
+  -- 	'williamboman/mason.nvim',
-	-- 	'mason-org/mason-registry',
+  -- 	'mason-org/mason-registry',
-	-- 	'williamboman/mason-lspconfig.nvim',
+  -- 	'williamboman/mason-lspconfig.nvim',
-	-- 	'L3MON4D3/LuaSnip',
+  -- 	'L3MON4D3/LuaSnip',
-	-- 	'saadparwaiz1/cmp_luasnip',
+  -- 	'saadparwaiz1/cmp_luasnip',
-	-- 	'j-hui/fidget.nvim',
+  -- 	'j-hui/fidget.nvim',
-	--   },
+  --   },
-	--
+  --
-	--   -- example using `opts` for defining servers
+  --   -- example using `opts` for defining servers
-	--   opts = {
+  --   opts = {
-	--     servers = {
+  --     servers = {
-	--       lua_ls = {}
+  --       lua_ls = {}
-	--     }
+  --     }
-	--   },
+  --   },
-	--   config = function(_, opts)
+  --   config = function(_, opts)
-	-- 	require("fidget").setup({})
+  -- 	require("fidget").setup({})
-	-- 	require("mason").setup()
+  -- 	require("mason").setup()
-	--
+  --
-	--     local lspconfig = require('mason-lspconfig')
+  --     local lspconfig = require('mason-lspconfig')
-	--     for server, config in pairs(opts.servers) do
+  --     for server, config in pairs(opts.servers) do
-	--       -- passing config.capabilities to blink.cmp merges with the capabilities in your
+  --       -- passing config.capabilities to blink.cmp merges with the capabilities in your
-	--       -- `opts[server].capabilities, if you've defined it
+  --       -- `opts[server].capabilities, if you've defined it
-	--       print('configuring server:', server)
+  --       print('configuring server:', server)
-	--       config.capabilities = require('blink.cmp').get_lsp_capabilities(config.capabilities)
+  --       config.capabilities = require('blink.cmp').get_lsp_capabilities(config.capabilities)
-	--       require("lspconfig")[server].setup(config)
+  --       require("lspconfig")[server].setup(config)
-	--     end
+  --     end
-	--   end
+  --   end
-	--
+  --
-	-- example calling setup directly for each LSP
+  -- example calling setup directly for each LSP
-	-- config = function()
+  -- config = function()
-	--   local capabilities = require('blink.cmp').get_lsp_capabilities()
+  --   local capabilities = require('blink.cmp').get_lsp_capabilities()
-	--   local lspconfig = require('lspconfig')
+  --   local lspconfig = require('lspconfig')
-	--
+  --
-	--   lspconfig['lua_ls'].setup({ capabilities = capabilities })
+  --   lspconfig['lua_ls'].setup({ capabilities = capabilities })
-	-- end
+  -- end
-	-- },
+  -- },
 }

modules/dotfiles/nvim/lua/thegeneralist/lazy/init.lua

@@ -1,101 +1,106 @@
 return {
-  {
+	{
-    "lukas-reineke/indent-blankline.nvim",
+		"lukas-reineke/indent-blankline.nvim",
-    main = "ibl",
+		main = "ibl",
-    ---@module "ibl"
+		---@module "ibl"
-    ---@type ibl.config
+		---@type ibl.config
-    opts = {},
+		opts = {},
-  },
+	},
-  --[[ {
+	--[[ {
     'boganworld/crackboard.nvim',
     dependencies = { 'nvim-lua/plenary.nvim' },
     opts = {
       session_key = 'redacted',
     },
   }, ]]
-  {
+	{
-    "onsails/lspkind-nvim",
+		"onsails/lspkind-nvim",
-  },
+	},
-  -- {
+	-- {
-  --   "ziglang/zig.vim",
+	--   "ziglang/zig.vim",
-  -- },
+	-- },
-  {
+	{
-    "nvim-lua/plenary.nvim",
+		"nvim-lua/plenary.nvim",
-    name = "plenary",
+		name = "plenary",
-  },
+	},
-  {
+	{
-    "stevearc/oil.nvim",
+		"stevearc/oil.nvim",
-    config = function()
+		config = function()
-      require("oil").setup()
+			require("oil").setup()
-    end,
+		end,
-  },
+	},
-  -- {
+	-- {
-  --   -- https://github.com/zbirenbaum/copilot.lua
+	--   -- https://github.com/zbirenbaum/copilot.lua
-  --   "zbirenbaum/copilot.lua",
+	--   "zbirenbaum/copilot.lua",
-  --   cmd = "Copilot",
+	--   cmd = "Copilot",
-  --   event = "InsertEnter",
+	--   event = "InsertEnter",
-  --   config = function()
+	--   config = function()
-  --     require("copilot").setup({
+	--     require("copilot").setup({
-  --       panel = {
+	--       panel = {
-  --         keymap = {
+	--         keymap = {
-  --           jump_prev = "]]",
+	--           jump_prev = "]]",
-  --           jump_next = "[[",
+	--           jump_next = "[[",
-  --           accept = "<Tab>",
+	--           accept = "<Tab>",
-  --           refresh = "gr",
+	--           refresh = "gr",
-  --           open = "<M-]>",
+	--           open = "<M-]>",
-  --         },
+	--         },
-  --       },
+	--       },
-  --       suggestion = {
+	--       suggestion = {
-  --         auto_trigger = true,
+	--         auto_trigger = true,
-  --         keymap = {
+	--         keymap = {
-  --           accept = "<M-Tab>",
+	--           accept = "<M-Tab>",
-  --         },
+	--         },
-  --       },
+	--       },
-  --     })
+	--     })
-  --     -- vim.keymap.set("n", "<leader>cpe", "<cmd>Copilot enable<CR>")
+	--     -- vim.keymap.set("n", "<leader>cpe", "<cmd>Copilot enable<CR>")
-  --     -- vim.keymap.set("n", "<leader>cpd", "<cmd>Copilot disable<CR>")
+	--     -- vim.keymap.set("n", "<leader>cpd", "<cmd>Copilot disable<CR>")
-  --   end,
+	--   end,
-  -- },
+	-- },
-  {
+	{
-    "github/copilot.vim",
+		"github/copilot.vim",
-    config = function()
+		config = function()
-      -- set <leader>cpd and <leader>cpe to disable/enable copilot
+			-- set <leader>cpd and <leader>cpe to disable/enable copilot
-      vim.keymap.set("n", "<leader>cpe", "<cmd>Copilot enable<CR>")
+			vim.keymap.set("n", "<leader>cpe", "<cmd>Copilot enable<CR>")
-      vim.keymap.set("n", "<leader>cpd", "<cmd>Copilot disable<CR>")
+			vim.keymap.set("n", "<leader>cpd", "<cmd>Copilot disable<CR>")
-    end,
+			vim.keymap.set("i", "<C-J>", 'copilot#Accept("\\<CR>")', {
-  },
+				expr = true,
-  -- {
+				replace_keycodes = false,
-  --   "Exafunction/codeium.nvim",
+			})
-  --   dependencies = {
+			vim.g.copilot_no_tab_map = true
-  --     "nvim-lua/plenary.nvim",
+		end,
-  --     "hrsh7th/nvim-cmp",
+	},
-  --   },
+	-- {
-  --   config = function()
+	--   "Exafunction/codeium.nvim",
-  --     require("codeium").setup({
+	--   dependencies = {
-  --       -- https://github.com/Exafunction/codeium.vim
+	--     "nvim-lua/plenary.nvim",
-  --     })
+	--     "hrsh7th/nvim-cmp",
-  --   end
+	--   },
-  -- },
+	--   config = function()
-  {
+	--     require("codeium").setup({
-    "ldelossa/gh.nvim",
+	--       -- https://github.com/Exafunction/codeium.vim
-    dependencies = {
+	--     })
-      "ldelossa/litee.nvim",
+	--   end
-    },
+	-- },
-  },
+	{
-  "eandrju/cellular-automaton.nvim",
+		"ldelossa/gh.nvim",
-  "gpanders/editorconfig.nvim",
+		dependencies = {
+			"ldelossa/litee.nvim",
+		},
+	},
+	"eandrju/cellular-automaton.nvim",
+	"gpanders/editorconfig.nvim",
 
-  -- Useful for getting pretty icons, but requires a Nerd Font.
+	-- Useful for getting pretty icons, but requires a Nerd Font.
-  { "nvim-tree/nvim-web-devicons", enabled = vim.g.have_nerd_font },
+	{ "nvim-tree/nvim-web-devicons", enabled = vim.g.have_nerd_font },
-  "lambdalisue/nerdfont.vim",
+	"lambdalisue/nerdfont.vim",
-  "junegunn/vim-easy-align",
+	"junegunn/vim-easy-align",
-  "rcarriga/nvim-notify",
+	"rcarriga/nvim-notify",
 
-  -- Highlight todo, notes, etc in comments
+	-- Highlight todo, notes, etc in comments
-  {
+	{
-    "folke/todo-comments.nvim",
+		"folke/todo-comments.nvim",
-    event = "VimEnter",
+		event = "VimEnter",
-    dependencies = { "nvim-lua/plenary.nvim" },
+		dependencies = { "nvim-lua/plenary.nvim" },
-    opts = { signs = false },
+		opts = { signs = false },
-  },
+	},
 }

modules/dotfiles/nvim/lua/thegeneralist/lazy/lsp.lua

@@ -1,286 +1,287 @@
 return {
-	{
+  {
-		"neovim/nvim-lspconfig",
+    "neovim/nvim-lspconfig",
-		dependencies = {
+    dependencies = {
-			"saghen/blink.cmp",
+      "saghen/blink.cmp",
-			-- "folke/neodev.nvim",
+      -- "folke/neodev.nvim",
-			"williamboman/mason.nvim",
+      "williamboman/mason.nvim",
-			"mason-org/mason-registry",
+      "mason-org/mason-registry",
-			"williamboman/mason-lspconfig.nvim",
+      "williamboman/mason-lspconfig.nvim",
-			"hrsh7th/cmp-nvim-lsp",
+      "hrsh7th/cmp-nvim-lsp",
-			"hrsh7th/cmp-buffer",
+      "hrsh7th/cmp-buffer",
-			"hrsh7th/cmp-path",
+      "hrsh7th/cmp-path",
-			"hrsh7th/cmp-cmdline",
+      "hrsh7th/cmp-cmdline",
-			-- "hrsh7th/nvim-cmp",
+      -- "hrsh7th/nvim-cmp",
-			"L3MON4D3/LuaSnip",
+      "L3MON4D3/LuaSnip",
-			"saadparwaiz1/cmp_luasnip",
+      "saadparwaiz1/cmp_luasnip",
-			"j-hui/fidget.nvim",
+      "j-hui/fidget.nvim",
-		},
+    },
-		config = function()
+    config = function()
-			local lspkind = require("lspkind")
+      local lspkind = require("lspkind")
-			-- local cmp = require("cmp")
+      -- local cmp = require("cmp")
-			-- local cmp_lsp = require("cmp_nvim_lsp")
+      -- local cmp_lsp = require("cmp_nvim_lsp")
-			-- local capabilities = vim.tbl_deep_extend(
+      -- local capabilities = vim.tbl_deep_extend(
-			-- 	"force",
+      -- 	"force",
-			-- 	{},
+      -- 	{},
-			-- 	vim.lsp.protocol.make_client_capabilities(),
+      -- 	vim.lsp.protocol.make_client_capabilities(),
-			-- 	cmp_lsp.default_capabilities()
+      -- 	cmp_lsp.default_capabilities()
-			-- )
+      -- )
 
-			require("fidget").setup({})
+      require("fidget").setup({})
-			require("mason").setup()
+      require("mason").setup()
 
-			-- local vue_typescript_plugin = require("mason-registry")
+      -- local vue_typescript_plugin = require("mason-registry")
-			-- 	.get_package("vue-language-server")
+      -- 	.get_package("vue-language-server")
-			-- 	:get_install_path() .. "/node_modules/@vue/language-server" .. "/node_modules/@vue/typescript-plugin"
+      -- 	:get_install_path() .. "/node_modules/@vue/language-server" .. "/node_modules/@vue/typescript-plugin"
 
-			local capabilities = require("blink.cmp").get_lsp_capabilities()
+      local capabilities = require("blink.cmp").get_lsp_capabilities()
-			vim.lsp.enable("nixd")
+      vim.lsp.enable("nixd")
-			require("mason-lspconfig").setup({
+      vim.lsp.enable("clangd")
-				automatic_enable = true,
+      vim.lsp.enable("basedpyright")
-				ensure_installed = {
+      require("mason-lspconfig").setup({
-					"lua_ls",
+        automatic_enable = true,
-					"ts_ls",
+        ensure_installed = {
-					"cssls",
+          "lua_ls",
-					"tailwindcss",
+          "ts_ls",
-					"pyright",
+          "cssls",
-				},
+          "tailwindcss",
-				handlers = {
+        },
-					function(server_name) -- default handler (optional)
+        handlers = {
-						-- if server_name == "rust_analyzer" then
+          function(server_name) -- default handler (optional)
-						-- 	return
+            -- if server_name == "rust_analyzer" then
-						-- end
+            -- 	return
-						require("lspconfig")[server_name].setup({
+            -- end
-							capabilities = capabilities,
+            require("lspconfig")[server_name].setup({
-						})
+              capabilities = capabilities,
-					end,
+            })
+          end,
 
-					["lua_ls"] = function()
+          ["lua_ls"] = function()
-						local lspconfig = require("lspconfig")
+            local lspconfig = require("lspconfig")
-						lspconfig.lua_ls.setup({
+            lspconfig.lua_ls.setup({
-							capabilities = capabilities,
+              capabilities = capabilities,
-							settings = {
+              settings = {
-								Lua = {
+                Lua = {
-									diagnostics = {
+                  diagnostics = {
-										globals = { "vim", "it", "describe", "before_each", "after_each" },
+                    globals = { "vim", "it", "describe", "before_each", "after_each" },
-									},
+                  },
-								},
+                },
-							},
+              },
-						})
+            })
-					end,
+          end,
 
-					["ts_ls"] = function()
+          ["ts_ls"] = function()
-						local lspconfig = require("lspconfig")
+            local lspconfig = require("lspconfig")
-						lspconfig.ts_ls.setup({
+            lspconfig.ts_ls.setup({
-							capabilities = capabilities,
+              capabilities = capabilities,
-							-- settings = {
+              -- settings = {
-							-- },
+              -- },
-							-- init_options = {
+              -- init_options = {
-							-- 	plugins = {
+              -- 	plugins = {
-							-- 		{
+              -- 		{
-							-- 			name = "@vue/typescript-plugin",
+              -- 			name = "@vue/typescript-plugin",
-							-- 			location = vue_typescript_plugin,
+              -- 			location = vue_typescript_plugin,
-							-- 			languages = { "vue" },
+              -- 			languages = { "vue" },
-							-- 		},
+              -- 		},
-							-- 	},
+              -- 	},
-							-- },
+              -- },
-							filetypes = {
+              filetypes = {
-								"javascript",
+                "javascript",
-								"javascriptreact",
+                "javascriptreact",
-								"javascript.jsx",
+                "javascript.jsx",
-								"typescript",
+                "typescript",
-								"typescriptreact",
+                "typescriptreact",
-								"typescript.tsx",
+                "typescript.tsx",
-								-- "vue",
+                -- "vue",
-							},
+              },
-						})
+            })
-					end,
+          end,
-				},
+        },
-			})
+      })
 
-			vim.api.nvim_create_autocmd("LspAttach", {
+      vim.api.nvim_create_autocmd("LspAttach", {
-				callback = function(args)
+        callback = function(args)
-					local c = vim.lsp.get_client_by_id(args.data.client_id)
+          local c = vim.lsp.get_client_by_id(args.data.client_id)
-					if not c then
+          if not c then
-						return
+            return
-					end
+          end
 
-					if vim.bo.filetype == "lua" then
+          if vim.bo.filetype == "lua" then
-						-- Format the current buffer on save
+            -- Format the current buffer on save
-						vim.api.nvim_create_autocmd("BufWritePre", {
+            vim.api.nvim_create_autocmd("BufWritePre", {
-							buffer = args.buf,
+              buffer = args.buf,
-							callback = function()
+              callback = function()
-								vim.lsp.buf.format({ bufnr = args.buf, id = c.id })
+                vim.lsp.buf.format({ bufnr = args.buf, id = c.id })
-							end,
+              end,
-						})
+            })
-					end
+          end
-				end,
+        end,
-			})
+      })
 
-			-- local cmp_select = { behavior = cmp.SelectBehavior.Select }
+      -- local cmp_select = { behavior = cmp.SelectBehavior.Select }
 
-			--- Select item next/prev, taking into account whether the cmp window is
+      --- Select item next/prev, taking into account whether the cmp window is
-			--- top-down or bottoom-up so that the movement is always in the same direction.
+      --- top-down or bottoom-up so that the movement is always in the same direction.
-			-- local select_item_smart = function(dir, opts)
+      -- local select_item_smart = function(dir, opts)
-			-- 	return function(fallback)
+      -- 	return function(fallback)
-			-- 		if cmp.visible() then
+      -- 		if cmp.visible() then
-			-- 			opts = opts or { behavior = cmp.SelectBehavior.Select }
+      -- 			opts = opts or { behavior = cmp.SelectBehavior.Select }
-			-- 			if cmp.core.view.custom_entries_view:is_direction_top_down() then
+      -- 			if cmp.core.view.custom_entries_view:is_direction_top_down() then
-			-- 				({ next = cmp.select_next_item, prev = cmp.select_prev_item })[dir](opts)
+      -- 				({ next = cmp.select_next_item, prev = cmp.select_prev_item })[dir](opts)
-			-- 			else
+      -- 			else
-			-- 				({ prev = cmp.select_next_item, next = cmp.select_prev_item })[dir](opts)
+      -- 				({ prev = cmp.select_next_item, next = cmp.select_prev_item })[dir](opts)
-			-- 			end
+      -- 			end
-			-- 		else
+      -- 		else
-			-- 			fallback()
+      -- 			fallback()
-			-- 		end
+      -- 		end
-			-- 	end
+      -- 	end
-			-- end
+      -- end
 
-			-- cmp.setup({
+      -- cmp.setup({
-			-- 	snippet = {
+      -- 	snippet = {
-			-- 		expand = function(args)
+      -- 		expand = function(args)
-			-- 			require("luasnip").lsp_expand(args.body) -- For `luasnip` users.
+      -- 			require("luasnip").lsp_expand(args.body) -- For `luasnip` users.
-			-- 		end,
+      -- 		end,
-			-- 	},
+      -- 	},
-			-- 	completion = {
+      -- 	completion = {
-			-- 		completeopt = "menu,menuone,noinsert",
+      -- 		completeopt = "menu,menuone,noinsert",
-			-- 	},
+      -- 	},
-			-- 	-- No idea what this is
+      -- 	-- No idea what this is
-			-- 	matching = {
+      -- 	matching = {
-			-- 		disallow_fuzzy_matching = false,
+      -- 		disallow_fuzzy_matching = false,
-			-- 		disallow_fullfuzzy_matching = false,
+      -- 		disallow_fullfuzzy_matching = false,
-			-- 		disallow_partial_fuzzy_matching = false,
+      -- 		disallow_partial_fuzzy_matching = false,
-			-- 	},
+      -- 	},
-			-- 	performance = {
+      -- 	performance = {
-			-- 		-- debounce = 50,
+      -- 		-- debounce = 50,
-			-- 		debounce = 25,
+      -- 		debounce = 25,
-			-- 		-- max_view_entries = 20,
+      -- 		-- max_view_entries = 20,
-			-- 	},
+      -- 	},
-			-- That crazy window
+      -- That crazy window
-			-- window = {
+      -- window = {
-			--   completion = cmp.config.window.bordered({
+      --   completion = cmp.config.window.bordered({
-			--     border = "single",
+      --     border = "single",
-			--     side_padding = 2,
+      --     side_padding = 2,
-			--     col_offset = -3,
+      --     col_offset = -3,
-			--     max_width = 80,
+      --     max_width = 80,
-			--   }),
+      --   }),
-			--   documentation = cmp.config.window.bordered({
+      --   documentation = cmp.config.window.bordered({
-			--     max_width = 50,
+      --     max_width = 50,
-			--   }),
+      --   }),
-			-- },
+      -- },
-			-- mapping = cmp.mapping.preset.insert({
+      -- mapping = cmp.mapping.preset.insert({
-			-- 	["<C-p>"] = select_item_smart("prev", cmp_select),
+      -- 	["<C-p>"] = select_item_smart("prev", cmp_select),
-			-- 	["<C-n>"] = select_item_smart("next", cmp_select),
+      -- 	["<C-n>"] = select_item_smart("next", cmp_select),
-			-- 	["<C-e>"] = cmp.mapping.close(),
+      -- 	["<C-e>"] = cmp.mapping.close(),
-			-- 	["<C-y>"] = cmp.mapping.confirm({ select = true }),
+      -- 	["<C-y>"] = cmp.mapping.confirm({ select = true }),
-			-- 	["<Tab>"] = cmp.mapping.confirm({ select = true }),
+      -- 	["<Tab>"] = cmp.mapping.confirm({ select = true }),
-			-- 	["<C-B>"] = cmp.mapping.complete(),
+      -- 	["<C-B>"] = cmp.mapping.complete(),
-			-- 	["<C-u>"] = cmp.mapping.scroll_docs(-3),
+      -- 	["<C-u>"] = cmp.mapping.scroll_docs(-3),
-			-- 	["<C-d>"] = cmp.mapping.scroll_docs(3),
+      -- 	["<C-d>"] = cmp.mapping.scroll_docs(3),
-			-- 	["<C-g>"] = cmp.mapping.abort(),
+      -- 	["<C-g>"] = cmp.mapping.abort(),
-			-- }),
+      -- }),
-			-- sorting = {
+      -- sorting = {
-			-- 	comparators = {
+      -- 	comparators = {
-			-- 		cmp.config.compare.locality,
+      -- 		cmp.config.compare.locality,
-			-- 		cmp.config.compare.offset,
+      -- 		cmp.config.compare.offset,
-			-- 		cmp.config.compare.recently_used,
+      -- 		cmp.config.compare.recently_used,
-			-- 		cmp.config.compare.exact,
+      -- 		cmp.config.compare.exact,
-			-- 		cmp.config.compare.order,
+      -- 		cmp.config.compare.order,
-			-- 		cmp.config.compare.length,
+      -- 		cmp.config.compare.length,
-			-- 		function(entry1, entry2)
+      -- 		function(entry1, entry2)
-			-- 			local _, entry1_under = entry1.completion_item.label:find("^_+")
+      -- 			local _, entry1_under = entry1.completion_item.label:find("^_+")
-			-- 			local _, entry2_under = entry2.completion_item.label:find("^_+")
+      -- 			local _, entry2_under = entry2.completion_item.label:find("^_+")
-			-- 			entry1_under = entry1_under or 0
+      -- 			entry1_under = entry1_under or 0
-			-- 			entry2_under = entry2_under or 0
+      -- 			entry2_under = entry2_under or 0
-			-- 			if entry1_under > entry2_under then
+      -- 			if entry1_under > entry2_under then
-			-- 				return false
+      -- 				return false
-			-- 			elseif entry1_under < entry2_under then
+      -- 			elseif entry1_under < entry2_under then
-			-- 				return true
+      -- 				return true
-			-- 			end
+      -- 			end
-			-- 		end,
+      -- 		end,
-			-- 		cmp.config.compare.kind,
+      -- 		cmp.config.compare.kind,
-			-- 		cmp.config.compare.sort_text,
+      -- 		cmp.config.compare.sort_text,
-			-- 	},
+      -- 	},
-			-- },
+      -- },
-			-- 	sources = cmp.config.sources({
+      -- 	sources = cmp.config.sources({
-			-- 		{ name = "neopyter" },
+      -- 		{ name = "neopyter" },
-			-- 		{ name = "nvim_lsp" },
+      -- 		{ name = "nvim_lsp" },
-			-- 		{ name = "codeium" },
+      -- 		{ name = "codeium" },
-			-- 		{ name = "luasnip" }, -- For luasnip users.
+      -- 		{ name = "luasnip" }, -- For luasnip users.
-			-- 	}, {
+      -- 	}, {
-			-- 		{ name = "buffer" },
+      -- 		{ name = "buffer" },
-			-- 	}),
+      -- 	}),
-			-- 	formatting = {
+      -- 	formatting = {
-			-- 		fields = {
+      -- 		fields = {
-			-- 			"abbr",
+      -- 			"abbr",
-			-- 			"kind",
+      -- 			"kind",
-			-- 			"menu",
+      -- 			"menu",
-			-- 		},
+      -- 		},
-			-- 		expandable_indicator = true,
+      -- 		expandable_indicator = true,
-			-- 		format = lspkind.cmp_format({
+      -- 		format = lspkind.cmp_format({
-			-- 			mode = "symbol_text",
+      -- 			mode = "symbol_text",
-			-- 			maxwidth = 50,
+      -- 			maxwidth = 50,
-			-- 			ellipsis_char = "...",
+      -- 			ellipsis_char = "...",
-			-- 			menu = {
+      -- 			menu = {
-			-- 				neopyter = "[Neopyter]",
+      -- 				neopyter = "[Neopyter]",
-			-- 			},
+      -- 			},
-			-- 			symbol_map = {
+      -- 			symbol_map = {
-			-- 				-- specific complete item kind icon
+      -- 				-- specific complete item kind icon
-			-- 				["Magic"] = "🪄",
+      -- 				["Magic"] = "🪄",
-			-- 				["Path"] = "📁",
+      -- 				["Path"] = "📁",
-			-- 				["Dict key"] = "🔑",
+      -- 				["Dict key"] = "🔑",
-			-- 				["Instance"] = "󱃻",
+      -- 				["Instance"] = "󱃻",
-			-- 				["Statement"] = "󱇯",
+      -- 				["Statement"] = "󱇯",
-			-- 			},
+      -- 			},
-			-- 		}),
+      -- 		}),
-			-- 	},
+      -- 	},
-			-- })
+      -- })
 
-			-- -- menu item highlight
+      -- -- menu item highlight
-			-- vim.api.nvim_set_hl(0, "CmpItemKindMagic", { bg = "NONE", fg = "#D4D434" })
+      -- vim.api.nvim_set_hl(0, "CmpItemKindMagic", { bg = "NONE", fg = "#D4D434" })
-			-- vim.api.nvim_set_hl(0, "CmpItemKindPath", { link = "CmpItemKindFolder" })
+      -- vim.api.nvim_set_hl(0, "CmpItemKindPath", { link = "CmpItemKindFolder" })
-			-- vim.api.nvim_set_hl(0, "CmpItemKindDictkey", { link = "CmpItemKindKeyword" })
+      -- vim.api.nvim_set_hl(0, "CmpItemKindDictkey", { link = "CmpItemKindKeyword" })
-			-- vim.api.nvim_set_hl(0, "CmpItemKindInstance", { link = "CmpItemKindVariable" })
+      -- vim.api.nvim_set_hl(0, "CmpItemKindInstance", { link = "CmpItemKindVariable" })
-			-- vim.api.nvim_set_hl(0, "CmpItemKindStatement", { link = "CmpItemKindVariable" })
+      -- vim.api.nvim_set_hl(0, "CmpItemKindStatement", { link = "CmpItemKindVariable" })
 
-			-- vim.diagnostic.config({
+      -- vim.diagnostic.config({
-			-- 	-- update_in_insert = true, -- Update diagnostics in Insert mode
+      -- 	-- update_in_insert = true, -- Update diagnostics in Insert mode
-			-- 	-- ^ (if false, diagnostics are updated on InsertLeave)
+      -- 	-- ^ (if false, diagnostics are updated on InsertLeave)
-			--
+      --
-			-- 	underline = true,
+      -- 	underline = true,
-			--
+      --
-			-- 	virtual_text = true,
+      -- 	virtual_text = true,
-			--
+      --
-			-- 	severity_sort = true, -- high -> low
+      -- 	severity_sort = true, -- high -> low
-			--
+      --
-			-- 	-- float = {
+      -- 	-- float = {
-			-- 	--   focusable = false,
+      -- 	--   focusable = false,
-			-- 	--   style = "minimal",
+      -- 	--   style = "minimal",
-			-- 	--   border = "rounded",
+      -- 	--   border = "rounded",
-			-- 	--   source = true,
+      -- 	--   source = true,
-			-- 	--   header = { "  Diagnostics", "String" },
+      -- 	--   header = { "  Diagnostics", "String" },
-			-- 	--   prefix = function(_, _, _)
+      -- 	--   prefix = function(_, _, _)
-			-- 	--     return "  ", "String"
+      -- 	--     return "  ", "String"
-			-- 	--   end,
+      -- 	--   end,
-			-- 	-- },
+      -- 	-- },
-			-- })
+      -- })
 
-			-- treesitter jupyter notebook stuff
+      -- treesitter jupyter notebook stuff
-			-- require("nvim-treesitter.configs").setup({
+      -- require("nvim-treesitter.configs").setup({
-			-- 	textobjects = {
+      -- 	textobjects = {
-			-- 		move = {
+      -- 		move = {
-			-- 			enable = true,
+      -- 			enable = true,
-			-- 			goto_next_start = {
+      -- 			goto_next_start = {
-			-- 				["]j"] = "@cellseparator",
+      -- 				["]j"] = "@cellseparator",
-			-- 				["]c"] = "@cellcontent",
+      -- 				["]c"] = "@cellcontent",
-			-- 			},
+      -- 			},
-			-- 			goto_previous_start = {
+      -- 			goto_previous_start = {
-			-- 				["[j"] = "@cellseparator",
+      -- 				["[j"] = "@cellseparator",
-			-- 				["[c"] = "@cellcontent",
+      -- 				["[c"] = "@cellcontent",
-			-- 			},
+      -- 			},
-			-- 		},
+      -- 		},
-			-- 	},
+      -- 	},
-			-- })
+      -- })
-		end,
+    end,
-	},
+  },
 }

modules/dotfiles/nvim/lua/thegeneralist/lazy/markdown.lua

@@ -1,9 +1,9 @@
 return {
-  -- "iamcco/markdown-preview.nvim",
+  "iamcco/markdown-preview.nvim",
-  -- cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
+  cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
-  -- build = "cd app && yarn install",
+  build = "cd app && yarn install",
-  -- init = function()
+  init = function()
-  --   vim.g.mkdp_filetypes = { "markdown" }
+    vim.g.mkdp_filetypes = { "markdown" }
-  -- end,
+  end,
-  -- ft = { "markdown" },
+  ft = { "markdown" },
 }

modules/dotfiles/nvim/lua/thegeneralist/lazy/nullls.lua

@@ -5,47 +5,46 @@ These three tabs are necessary when dealing with this nonsense:
 - https://github.com/nvimtools/none-ls.nvim
 --]]
 return {
-	"jay-babu/mason-null-ls.nvim",
+  "jay-babu/mason-null-ls.nvim",
-	event = { "BufReadPre", "BufNewFile" },
+  event = { "BufReadPre", "BufNewFile" },
-	dependencies = {
+  dependencies = {
-		"williamboman/mason.nvim",
+    "williamboman/mason.nvim",
-		"nvimtools/none-ls.nvim",
+    "nvimtools/none-ls.nvim",
-		"nvimtools/none-ls-extras.nvim",
+    "nvimtools/none-ls-extras.nvim",
-	},
+  },
-	config = function()
+  config = function()
-		local null_ls = require("null-ls")
+    local null_ls = require("null-ls")
-		require("mason-null-ls").setup({
+    require("mason-null-ls").setup({
-			ensure_installed = {
+      ensure_installed = {
-				"stylua",
+        "stylua",
-				"jq",
+        "jq",
-				"mypy",
+        "basedpyright",
-				"ruff",
+        "black",
-				"black",
+      },
-			},
+      handlers = {
-			handlers = {
+        -- ["mypy"] = function(source_name, methods)
-				["mypy"] = function(source_name, methods)
+        --   local options = {
-					local options = {
+        --     extra_args = function()
-						extra_args = function()
+        --       local command = "which python"
-							local command = "which python"
+        --       local handle = io.popen(command)
-							local handle = io.popen(command)
+        --       local python_path = ""
-              local python_path = ""
+        --       if handle then
-              if handle then
+        --         python_path = handle:read("*a")
-                python_path = handle:read("*a")
+        --         python_path = string.gsub(python_path, "\n", "")
-                python_path = string.gsub(python_path, "\n", "")
+        --         handle:close()
-                handle:close()
+        --       end
-              end
+        --       return { "--python-executable", python_path }
-							return { "--python-executable", python_path }
+        --     end,
-						end,
+        --   }
-					}
+        --   null_ls.register(null_ls.builtins.diagnostics.mypy.with(options))
-					null_ls.register(null_ls.builtins.diagnostics.mypy.with(options))
+        -- end,
-				end,
+        --[[ ["ruff"] = function(source_name, methods)
-				--[[ ["ruff"] = function(source_name, methods)
           null_ls.register(null_ls.builtins.diagnostics.ruff)
           --require('mason-null-ls').default_setup(source_name, methods) -- to maintain default behavior
         end, ]]
-			},
+      },
-		})
+    })
 
-		null_ls.setup()
+    null_ls.setup()
-	end,
+  end,
 }

modules/dotfiles/nvim/lua/thegeneralist/remap.lua

@@ -16,10 +16,10 @@ vim.keymap.set("n", "n", "nzzzv")
 vim.keymap.set("n", "N", "Nzzzv")
 
 vim.keymap.set("n", "<leader>vwm", function()
-	require("vim-with-me").StartVimWithMe()
+  require("vim-with-me").StartVimWithMe()
 end)
 vim.keymap.set("n", "<leader>svwm", function()
-	require("vim-with-me").StopVimWithMe()
+  require("vim-with-me").StopVimWithMe()
 end)
 
 vim.keymap.set("n", "<leader>vs", "<C-w>v")
@@ -54,19 +54,19 @@ vim.keymap.set("n", "<leader>vpp", "<cmd>e ~/.dotfiles/nvim/.config/nvim/lua/the
 vim.keymap.set("n", "<leader>mr", "<cmd>CellularAutomaton make_it_rain<CR>")
 
 vim.keymap.set("n", "<leader><leader>", function()
-	vim.cmd("so")
+  vim.cmd("so")
 end)
 
 vim.keymap.set("n", "zh", "$viBhzf", {
-	desc = "Fold { block",
+  desc = "Fold { block",
 })
 
 vim.keymap.set("n", "zj", "$vi[hzf", {
-	desc = "Fold [ block",
+  desc = "Fold [ block",
 })
 
 vim.keymap.set("n", "zk", "$vibhzf", {
-	desc = "Fold ( block",
+  desc = "Fold ( block",
 })
 
 vim.keymap.set("n", "ga", "<cmd>EasyAlign<CR>")
@@ -77,6 +77,7 @@ vim.keymap.set("v", "<", "<gv")
 vim.keymap.set("v", ">", ">gv")
 
 -- Indent with tab
+vim.keymap.set("i", "<Tab>", "<Tab>")
 vim.keymap.set("v", "<Tab>", ">gv")
 vim.keymap.set("v", "<S-Tab>", "<gv")
 
@@ -84,9 +85,9 @@ vim.keymap.set("v", "<S-Tab>", "<gv")
 vim.keymap.set("n", "<C-w>e", "<C-w>j<C-w>q")
 
 vim.keymap.set("n", "<leader>w", function()
-	vim.ui.input({ prompt = "Enter value for shiftwidth: " }, function(input)
+  vim.ui.input({ prompt = "Enter value for shiftwidth: " }, function(input)
-		vim.o.shiftwidth = tonumber(input)
+    vim.o.shiftwidth = tonumber(input)
-	end)
+  end)
 end)
 -- vim.keymap.set("n", "<leader>tc", function()
 -- 	-- local file_number = tonumber(vim.fn.input("File number > "), 10)

modules/postgresql.nix

@@ -0,0 +1,44 @@
+# stolen from https://github.com/RGBCube/ncc/blob/94c349aa767f04f40ff4165c70c15ed3c3996f82/modules/postgresql.nix
+{ config, lib, pkgs, ... }: let
+  inherit (lib) flip mkForce mkOverride mkValue;
+in {
+  config.environment.systemPackages = [
+    config.services.postgresql.package
+  ];
+
+  options.services.postgresql.ensure = mkValue [];
+
+  config.services.postgresql = {
+    enable = true;
+    package = pkgs.postgresql_17;
+
+    enableJIT   = true;
+    enableTCPIP = true;
+
+    settings.listen_addresses = mkForce "::";
+    authentication            = mkOverride 10 /* ini */ ''
+      #     DATABASE USER        AUTHENTICATION
+      local all      all         peer
+
+      #     DATABASE USER ADDRESS AUTHENTICATION
+      host  all      all  ::/0    md5
+    '';
+
+    ensure = [ "postgres" "root" ];
+
+    initdbArgs      = [ "--locale=C" "--encoding=UTF8" ];
+    ensureDatabases = config.services.postgresql.ensure;
+
+    ensureUsers = flip map config.services.postgresql.ensure (name: {
+      inherit name;
+
+      ensureDBOwnership = true;
+
+      ensureClauses = {
+        login       = true;
+        superuser   = name == "postgres" || name == "root";
+      };
+    });
+  };
+}
+

secrets.nix

@@ -7,6 +7,7 @@ in {
   "hosts/thegeneralist-central/acme/acmeEnvironment.age".publicKeys = [ thegeneralist ];
   "hosts/thegeneralist-central/cert.pem.age".publicKeys = [ thegeneralist ];
   "hosts/thegeneralist-central/credentials.age".publicKeys = [ thegeneralist ];
+  "hosts/thegeneralist-central/credentials_personal.age".publicKeys = [ thegeneralist ];
   "hosts/thegeneralist-central/cache/key.age".publicKeys = [ thegeneralist ];
   "hosts/thegeneralist-central/password.age".publicKeys = [ thegeneralist ];