diff --git a/config/nvim/lua/plugins/cmp.lua b/config/nvim/lua/plugins/cmp.lua index f0c5926..6b973d7 100644 --- a/config/nvim/lua/plugins/cmp.lua +++ b/config/nvim/lua/plugins/cmp.lua @@ -44,7 +44,7 @@ return { }, }, }, - ghost_text = { enabled = false }, + ghost_text = { enabled = true }, }, fuzzy = { implementation = "lua" }, sources = { diff --git a/config/nvim/lua/plugins/neocodeium.lua b/config/nvim/lua/plugins/neocodeium.lua deleted file mode 100644 index 6ba587a..0000000 --- a/config/nvim/lua/plugins/neocodeium.lua +++ /dev/null @@ -1,19 +0,0 @@ -vim.pack.add({ - "https://github.com/monkoose/neocodeium", -}, { load = function() end }) - -return { - "monkoose/neocodeium", - event = "InsertEnter", - after = function() - local neocodeium = require "neocodeium" - neocodeium.setup() - - vim.keymap.set("i", "", neocodeium.accept) - vim.keymap.set("i", "", neocodeium.accept_word) - vim.keymap.set("i", "", neocodeium.accept_line) - vim.keymap.set("i", "", neocodeium.cycle_or_complete) - vim.keymap.set("i", "", function() neocodeium.cycle_or_complete(-1) end) - vim.keymap.set("i", "", neocodeium.clear) - end, -} diff --git a/config/nvim/plugin/keymaps.lua b/config/nvim/plugin/keymaps.lua index be82727..d1aee60 100644 --- a/config/nvim/plugin/keymaps.lua +++ b/config/nvim/plugin/keymaps.lua @@ -17,6 +17,4 @@ map("x", "p", '"_dP') map("n", "", "nohlsearch") map("n", "t", "setlocal wrap!") -map("n", "]", "vert winc ]") - map("t", "", "") diff --git a/home/nvim.nix b/home/nvim.nix index 279b3be..25ae333 100644 --- a/home/nvim.nix +++ b/home/nvim.nix @@ -51,9 +51,9 @@ in stylua tree-sitter vscode-langservers-extracted - bash-language-server - typescript - typescript-language-server + nodePackages.bash-language-server + nodePackages.typescript + nodePackages.typescript-language-server ]; }; diff --git a/hosts/netty/configuration.nix b/hosts/netty/configuration.nix index 3af1a4a..b0c12b5 100644 --- a/hosts/netty/configuration.nix +++ b/hosts/netty/configuration.nix @@ -17,7 +17,6 @@ in ./nginx.nix ./vaultwarden.nix ./forgejo.nix - ./diffkit.nix ./betternas.nix ./hermes-gateway.nix ./forgejo-runner.nix diff --git a/hosts/netty/diffkit.nix b/hosts/netty/diffkit.nix deleted file mode 100644 index 94107f7..0000000 --- a/hosts/netty/diffkit.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ - pkgs, - username, - ... -}: -let - diffkitPort = "3200"; - stateDir = "/var/lib/diffkit"; - repoDir = "/home/${username}/Documents/GitHub/diffkit"; - envFile = "${stateDir}/diffkit.env"; - dbPath = "${stateDir}/diffkit.db"; - migrationsDir = "${repoDir}/apps/dashboard/drizzle"; - - migrationScript = pkgs.writeShellScript "diffkit-migrate" '' - set -euo pipefail - DB="${dbPath}" - MIGRATIONS="${migrationsDir}" - - ${pkgs.sqlite}/bin/sqlite3 "$DB" "SELECT 1;" > /dev/null 2>&1 || true - ${pkgs.sqlite}/bin/sqlite3 "$DB" \ - "CREATE TABLE IF NOT EXISTS __drizzle_migrations (tag TEXT PRIMARY KEY, applied_at INTEGER NOT NULL);" - - for sql_file in "$MIGRATIONS"/[0-9]*.sql; do - [ -f "$sql_file" ] || continue - tag=$(basename "$sql_file" .sql) - applied=$(${pkgs.sqlite}/bin/sqlite3 "$DB" "SELECT COUNT(*) FROM __drizzle_migrations WHERE tag='$tag';") - if [ "$applied" = "0" ]; then - echo "Applying migration: $tag" - ${pkgs.gnused}/bin/sed 's/--> statement-breakpoint/;/g' "$sql_file" \ - | ${pkgs.sqlite}/bin/sqlite3 "$DB" - ${pkgs.sqlite}/bin/sqlite3 "$DB" \ - "INSERT INTO __drizzle_migrations (tag, applied_at) VALUES ('$tag', strftime('%s','now'));" - fi - done - echo "Migrations complete." - ''; -in -{ - systemd.tmpfiles.rules = [ - "d ${stateDir} 0750 ${username} users -" - "z ${envFile} 0600 ${username} users -" - ]; - - systemd.services.diffkit = { - description = "diffkit GitHub Diff Viewer"; - after = [ "network-online.target" ]; - wants = [ "network-online.target" ]; - wantedBy = [ "multi-user.target" ]; - - environment = { - NODE_ENV = "production"; - HOST = "127.0.0.1"; - PORT = diffkitPort; - DATABASE_PATH = dbPath; - BETTER_AUTH_URL = "https://diffs.harivan.sh"; - GITHUB_APP_PRIVATE_KEY_FILE = "${stateDir}/github-app-key.pem"; - }; - - serviceConfig = { - Type = "simple"; - User = username; - Group = "users"; - WorkingDirectory = "${repoDir}/apps/dashboard"; - ExecStartPre = migrationScript; - ExecStart = "${pkgs.nodejs_22}/bin/node node-server.mjs"; - EnvironmentFile = "-${envFile}"; - Restart = "on-failure"; - RestartSec = 5; - }; - }; -} diff --git a/hosts/netty/nginx.nix b/hosts/netty/nginx.nix index a2c556a..874351d 100644 --- a/hosts/netty/nginx.nix +++ b/hosts/netty/nginx.nix @@ -6,7 +6,6 @@ let forgejoDomain = "git.harivan.sh"; vaultDomain = "vault.harivan.sh"; betternasDomain = "api.betternas.com"; - diffkitDomain = "diffs.harivan.sh"; in { security.acme = { @@ -44,15 +43,6 @@ in locations."/".proxyPass = "http://127.0.0.1:8222"; }; - virtualHosts.${diffkitDomain} = { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyPass = "http://127.0.0.1:3200"; - proxyWebsockets = true; - }; - }; - virtualHosts.${betternasDomain} = { enableACME = true; forceSSL = true; diff --git a/modules/devshells.nix b/modules/devshells.nix index db6bc90..925c045 100644 --- a/modules/devshells.nix +++ b/modules/devshells.nix @@ -11,7 +11,7 @@ git just nixfmt-tree - prettier + nodePackages.prettier pre-commit selene shfmt