From d2f39b322e500a7e55c8b151abb37327bca3803f Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Wed, 11 Feb 2026 20:45:41 +0100 Subject: [PATCH 01/21] edge.js support --- modules/nixvim/editing.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/nixvim/editing.nix b/modules/nixvim/editing.nix index 0819730..0d274f2 100644 --- a/modules/nixvim/editing.nix +++ b/modules/nixvim/editing.nix @@ -54,6 +54,18 @@ ''; }; + extraPlugins = [ + (pkgs.vimUtils.buildVimPlugin { + name = "edge.vim"; + src = pkgs.fetchFromGitHub { + "owner" = "Yohannfra"; + "repo" = "edge.vim"; + "rev" = "c5a165269d2643c12e62841776e8ba55e0f05e28"; + "hash" = "sha256-nXXcg2ggYN75ZSOgB8isxCbN8YigldO05Ja0/WigjAs="; + }; + }) + ]; + autoCmd = [ { callback.__raw = "function() vim.highlight.on_yank() end"; From 50ac9a4678ea80612026d0d8c4b52b7b123ede2a Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Wed, 11 Feb 2026 22:17:49 +0100 Subject: [PATCH 02/21] moves to typescript tools --- modules/nixvim/lsp.nix | 5 ----- modules/nixvim/typescript.nix | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 modules/nixvim/typescript.nix diff --git a/modules/nixvim/lsp.nix b/modules/nixvim/lsp.nix index 7c45f42..e21403c 100644 --- a/modules/nixvim/lsp.nix +++ b/modules/nixvim/lsp.nix @@ -17,11 +17,6 @@ package = pkgs.nil; packageFallback = true; }; - ts_ls = { - enable = true; - package = pkgs.typescript-language-server; - packageFallback = true; - }; jsonls = { enable = true; package = pkgs.vscode-langservers-extracted; diff --git a/modules/nixvim/typescript.nix b/modules/nixvim/typescript.nix new file mode 100644 index 0000000..a88c1b3 --- /dev/null +++ b/modules/nixvim/typescript.nix @@ -0,0 +1,32 @@ +{ + plugins.typescript-tools = { + enable = true; + settings = { + jsx_close_tag.enable = true; + tsserver_file_preferences = { + __raw = '' + function(ft) + return { + includeInlayParameterNameHints = "all", + includeCompletionsForModuleExports = true, + quotePreference = "auto", + } + end + ''; + }; + tsserver_format_options = { + __raw = '' + function(ft) + return { + allowIncompleteCompletions = false, + allowRenameOfImportPath = false, + } + end + ''; + }; + tsserver_plugins = [ + "@styled/typescript-styled-plugin" + ]; + }; + }; +} From 6f240267b8c8d414892ea917c332cdc396d73dfb Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Wed, 11 Feb 2026 22:22:21 +0100 Subject: [PATCH 03/21] adds typescript support --- modules/nixvim/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixvim/default.nix b/modules/nixvim/default.nix index 314e781..8e1aeda 100644 --- a/modules/nixvim/default.nix +++ b/modules/nixvim/default.nix @@ -23,5 +23,6 @@ ./statusline.nix ./keybindings.nix ./ai.nix + ./typescript.nix ]; } From db73afce3d39f81dd5ecc9562adfd9735a51bd40 Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Wed, 11 Feb 2026 22:27:52 +0100 Subject: [PATCH 04/21] adds tsserver --- modules/nixvim/typescript.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/nixvim/typescript.nix b/modules/nixvim/typescript.nix index a88c1b3..c71f7f8 100644 --- a/modules/nixvim/typescript.nix +++ b/modules/nixvim/typescript.nix @@ -1,6 +1,9 @@ +{ pkgs, ... }: + { plugins.typescript-tools = { enable = true; + extraPackages = [ pkgs.typescript-language-server ]; settings = { jsx_close_tag.enable = true; tsserver_file_preferences = { From 9f0085a9554fc530e566031d50a55ed0e056bffc Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Wed, 11 Feb 2026 22:33:12 +0100 Subject: [PATCH 05/21] fixes ts tools --- modules/nixvim/typescript.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/nixvim/typescript.nix b/modules/nixvim/typescript.nix index c71f7f8..475706b 100644 --- a/modules/nixvim/typescript.nix +++ b/modules/nixvim/typescript.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { plugins.typescript-tools = { @@ -6,6 +6,7 @@ extraPackages = [ pkgs.typescript-language-server ]; settings = { jsx_close_tag.enable = true; + tsserver_path = lib.getExe pkgs.typescript-language-server; tsserver_file_preferences = { __raw = '' function(ft) From 27314f0816c93b6a46cf8e81f67689485004f3fd Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Wed, 11 Feb 2026 22:39:13 +0100 Subject: [PATCH 06/21] tries to fix --- modules/nixvim/typescript.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nixvim/typescript.nix b/modules/nixvim/typescript.nix index 475706b..f8248be 100644 --- a/modules/nixvim/typescript.nix +++ b/modules/nixvim/typescript.nix @@ -3,10 +3,10 @@ { plugins.typescript-tools = { enable = true; - extraPackages = [ pkgs.typescript-language-server ]; + extraPackages = [ pkgs.typescript ]; settings = { jsx_close_tag.enable = true; - tsserver_path = lib.getExe pkgs.typescript-language-server; + tsserver_path = "${pkgs.typescript}/bin/tsserver"; tsserver_file_preferences = { __raw = '' function(ft) From 9ca68ddb7e1be2f0eac9c9837206371e9ebca19d Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Wed, 11 Feb 2026 22:40:54 +0100 Subject: [PATCH 07/21] ts fix --- modules/nixvim/typescript.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixvim/typescript.nix b/modules/nixvim/typescript.nix index f8248be..aa48da9 100644 --- a/modules/nixvim/typescript.nix +++ b/modules/nixvim/typescript.nix @@ -6,7 +6,7 @@ extraPackages = [ pkgs.typescript ]; settings = { jsx_close_tag.enable = true; - tsserver_path = "${pkgs.typescript}/bin/tsserver"; + tsserver_path = "${pkgs.typescript}/lib/node_modules/typescript/bin/tsserver"; tsserver_file_preferences = { __raw = '' function(ft) From 418daa2d90f3a712706ac687a9aeb4cecf8f439a Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Wed, 11 Feb 2026 22:42:24 +0100 Subject: [PATCH 08/21] ts fix --- modules/nixvim/typescript.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/nixvim/typescript.nix b/modules/nixvim/typescript.nix index aa48da9..1b615c1 100644 --- a/modules/nixvim/typescript.nix +++ b/modules/nixvim/typescript.nix @@ -3,10 +3,9 @@ { plugins.typescript-tools = { enable = true; - extraPackages = [ pkgs.typescript ]; settings = { jsx_close_tag.enable = true; - tsserver_path = "${pkgs.typescript}/lib/node_modules/typescript/bin/tsserver"; + tsserver_path = "${pkgs.typescript}/bin/tsserver"; tsserver_file_preferences = { __raw = '' function(ft) From 97e7f4321f981e5fe74c6cb442f73817c7df9134 Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Wed, 11 Feb 2026 22:44:03 +0100 Subject: [PATCH 09/21] ts fix --- modules/nixvim/typescript.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixvim/typescript.nix b/modules/nixvim/typescript.nix index 1b615c1..81ab258 100644 --- a/modules/nixvim/typescript.nix +++ b/modules/nixvim/typescript.nix @@ -5,7 +5,7 @@ enable = true; settings = { jsx_close_tag.enable = true; - tsserver_path = "${pkgs.typescript}/bin/tsserver"; + tsserver_path = "${pkgs.typescript}/lib/node_modules/typescript/lib/tsserver.js"; tsserver_file_preferences = { __raw = '' function(ft) From ff8e36cdea39a6f998a60fc4f4fe2ff1da00e35b Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Wed, 11 Feb 2026 22:46:11 +0100 Subject: [PATCH 10/21] ts fix --- modules/nixvim/typescript.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/nixvim/typescript.nix b/modules/nixvim/typescript.nix index 81ab258..3c57ee2 100644 --- a/modules/nixvim/typescript.nix +++ b/modules/nixvim/typescript.nix @@ -5,7 +5,6 @@ enable = true; settings = { jsx_close_tag.enable = true; - tsserver_path = "${pkgs.typescript}/lib/node_modules/typescript/lib/tsserver.js"; tsserver_file_preferences = { __raw = '' function(ft) From eb2cc46cd99272ea71a6368bbb48db76a42d5653 Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Wed, 11 Feb 2026 22:47:41 +0100 Subject: [PATCH 11/21] ts fix --- modules/nixvim/typescript.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/nixvim/typescript.nix b/modules/nixvim/typescript.nix index 3c57ee2..4da4611 100644 --- a/modules/nixvim/typescript.nix +++ b/modules/nixvim/typescript.nix @@ -1,6 +1,11 @@ { pkgs, lib, ... }: { + extraPackages = with pkgs; [ + nodejs + typescript + ]; + plugins.typescript-tools = { enable = true; settings = { From 6b525de32f1fc0d3dabfa87fe0acbd8f49175fa0 Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Wed, 11 Feb 2026 22:52:18 +0100 Subject: [PATCH 12/21] ts fix --- modules/nixvim/editing.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixvim/editing.nix b/modules/nixvim/editing.nix index 0d274f2..35bae90 100644 --- a/modules/nixvim/editing.nix +++ b/modules/nixvim/editing.nix @@ -31,6 +31,7 @@ gomod gotmpl python + styled tsx typescript nix From 615a962eaf48b91acd0acf2188fccf2e0bd37d1c Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Wed, 11 Feb 2026 23:01:20 +0100 Subject: [PATCH 13/21] moves back to ts_ls and adds css, html support --- modules/nixvim/default.nix | 1 - modules/nixvim/lsp.nix | 15 ++++++++++++++ modules/nixvim/typescript.nix | 39 ----------------------------------- 3 files changed, 15 insertions(+), 40 deletions(-) delete mode 100644 modules/nixvim/typescript.nix diff --git a/modules/nixvim/default.nix b/modules/nixvim/default.nix index 8e1aeda..314e781 100644 --- a/modules/nixvim/default.nix +++ b/modules/nixvim/default.nix @@ -23,6 +23,5 @@ ./statusline.nix ./keybindings.nix ./ai.nix - ./typescript.nix ]; } diff --git a/modules/nixvim/lsp.nix b/modules/nixvim/lsp.nix index e21403c..5efa53f 100644 --- a/modules/nixvim/lsp.nix +++ b/modules/nixvim/lsp.nix @@ -17,11 +17,26 @@ package = pkgs.nil; packageFallback = true; }; + ts_ls = { + enable = true; + package = pkgs.typescript-language-server; + packageFallback = true; + }; jsonls = { enable = true; package = pkgs.vscode-langservers-extracted; packageFallback = true; }; + cssls = { + enable = true; + package = pkgs.vscode-langservers-extracted; + packageFallback = true; + }; + html = { + enable = true; + package = pkgs.vscode-langservers-extracted; + packageFallback = true; + }; astro = { enable = true; package = pkgs.astro-language-server; diff --git a/modules/nixvim/typescript.nix b/modules/nixvim/typescript.nix deleted file mode 100644 index 4da4611..0000000 --- a/modules/nixvim/typescript.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ pkgs, lib, ... }: - -{ - extraPackages = with pkgs; [ - nodejs - typescript - ]; - - plugins.typescript-tools = { - enable = true; - settings = { - jsx_close_tag.enable = true; - tsserver_file_preferences = { - __raw = '' - function(ft) - return { - includeInlayParameterNameHints = "all", - includeCompletionsForModuleExports = true, - quotePreference = "auto", - } - end - ''; - }; - tsserver_format_options = { - __raw = '' - function(ft) - return { - allowIncompleteCompletions = false, - allowRenameOfImportPath = false, - } - end - ''; - }; - tsserver_plugins = [ - "@styled/typescript-styled-plugin" - ]; - }; - }; -} From 5373a76e3f1524658f0d94a9bf15e7f288cfb24a Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Thu, 12 Feb 2026 19:48:42 +0100 Subject: [PATCH 14/21] adds chromium --- home/linux.nix | 2 +- modules/ungoogled-chromium/default.nix | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 modules/ungoogled-chromium/default.nix diff --git a/home/linux.nix b/home/linux.nix index 35da6a9..b65f4c9 100644 --- a/home/linux.nix +++ b/home/linux.nix @@ -42,7 +42,6 @@ tmuxinator adw-gtk3 kdePackages.qt6ct - ungoogled-chromium ]; imports = [ @@ -57,6 +56,7 @@ ../modules/tmux ../modules/tmuxinator/personal.nix ../modules/zen + ../modules/ungoogled-chromium ../modules/wm/niri ../modules/wm/noctalia ]; diff --git a/modules/ungoogled-chromium/default.nix b/modules/ungoogled-chromium/default.nix new file mode 100644 index 0000000..cb913a5 --- /dev/null +++ b/modules/ungoogled-chromium/default.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: + +{ + programs.chromium = { + enable = true; + package = pkgs.ungoogled-chromium; + extensions = [ + { id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; } # uBlock + { id = "nngceckbapebfimnlniiiahkandclblb"; } # Bitwarden + { id = "dbepggeogbaibhgnhhndojpepiihcmeb"; } # Vimium + ]; + }; +} From 869123e806669e98062dd709e0f3c403a2d80f81 Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Thu, 12 Feb 2026 19:55:18 +0100 Subject: [PATCH 15/21] changes icon mode --- modules/wm/noctalia/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/wm/noctalia/default.nix b/modules/wm/noctalia/default.nix index ba9df0d..46c28d9 100644 --- a/modules/wm/noctalia/default.nix +++ b/modules/wm/noctalia/default.nix @@ -89,7 +89,7 @@ enableClipboardHistory = true; autoPasteClipboard = true; terminalCommand = "ghostty -e"; - iconMode = "native"; + iconMode = "tabler"; showIconBackground = true; }; systemMonitor = { From 9b1d082ca9392a79797fa79ee9e615019c48f4bc Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Thu, 12 Feb 2026 20:01:26 +0100 Subject: [PATCH 16/21] fix --- home/darwin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/darwin.nix b/home/darwin.nix index 51bc191..5d3c139 100644 --- a/home/darwin.nix +++ b/home/darwin.nix @@ -8,6 +8,7 @@ home.sessionVariables = { EDITOR = "nvim"; GOPATH = "$HOME/go"; + QT_QPA_PLATFORMTHEME = "gtk3"; }; xdg.enable = true; From 922ab112601f634d62632e8445708cacac6d6291 Mon Sep 17 00:00:00 2001 From: Dennis Date: Thu, 12 Feb 2026 21:07:25 +0100 Subject: [PATCH 17/21] touch id for sudo --- hosts/dnsc-air/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/dnsc-air/default.nix b/hosts/dnsc-air/default.nix index f56019a..0f792e5 100644 --- a/hosts/dnsc-air/default.nix +++ b/hosts/dnsc-air/default.nix @@ -24,6 +24,7 @@ description = "Dennis Schoepf"; }; nix.settings.trusted-users = [ "dennis" ]; + security.pam.services.sudo_local.touchIdAuth = true; # Device specific overlays nixpkgs.overlays = [ ]; From 9da7895d697c5f18ee8493058f341e5894fba845 Mon Sep 17 00:00:00 2001 From: Dennis Date: Sun, 15 Feb 2026 16:10:36 +0100 Subject: [PATCH 18/21] helium in dock --- modules/macos/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/macos/default.nix b/modules/macos/default.nix index 0b317ce..070655b 100644 --- a/modules/macos/default.nix +++ b/modules/macos/default.nix @@ -21,7 +21,7 @@ orientation = "right"; show-recents = false; persistent-apps = [ - "/Applications/Zen.app" + "/Applications/Helium.app" "/Applications/Ghostty.app" "/System/Applications/System Settings.app/" ]; From 0f7d18f19990e09c976007b592a8dc038ead0097 Mon Sep 17 00:00:00 2001 From: Dennis Date: Mon, 16 Feb 2026 20:58:44 +0100 Subject: [PATCH 19/21] adds new personal project to tmuxinator --- modules/tmuxinator/personal-layouts/dnsc.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 modules/tmuxinator/personal-layouts/dnsc.yml diff --git a/modules/tmuxinator/personal-layouts/dnsc.yml b/modules/tmuxinator/personal-layouts/dnsc.yml new file mode 100644 index 0000000..5838eba --- /dev/null +++ b/modules/tmuxinator/personal-layouts/dnsc.yml @@ -0,0 +1,11 @@ +name: dnsc +root: ~/dev/dnsc-website +windows: + - dev: + layout: main-horizontal + panes: + - nvim +"lua Snacks.picker.files({ hidden = true })" + - run: + layout: main-vertical + panes: + - "pnpm dev" From 2006462d07838b3f90ff4d0accdd74535ea59489 Mon Sep 17 00:00:00 2001 From: Dennis Date: Mon, 16 Feb 2026 21:25:55 +0100 Subject: [PATCH 20/21] updates template --- modules/tmuxinator/personal-layouts/dnsc.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tmuxinator/personal-layouts/dnsc.yml b/modules/tmuxinator/personal-layouts/dnsc.yml index 5838eba..c182d28 100644 --- a/modules/tmuxinator/personal-layouts/dnsc.yml +++ b/modules/tmuxinator/personal-layouts/dnsc.yml @@ -1,5 +1,5 @@ -name: dnsc -root: ~/dev/dnsc-website +name: dnsc-io +root: ~/dev/dnsc-io windows: - dev: layout: main-horizontal From 677cf34a4b7be33d76ec690002f4df11a8c9998d Mon Sep 17 00:00:00 2001 From: Dennis Date: Mon, 16 Feb 2026 21:30:11 +0100 Subject: [PATCH 21/21] adds astro config --- modules/nixvim/lsp.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixvim/lsp.nix b/modules/nixvim/lsp.nix index 5efa53f..3e2090d 100644 --- a/modules/nixvim/lsp.nix +++ b/modules/nixvim/lsp.nix @@ -41,6 +41,7 @@ enable = true; package = pkgs.astro-language-server; packageFallback = true; + config.init_options.typescript.tsdk = "${pkgs.typescript}/lib/node_modules/typescript/lib"; }; eslint = { enable = true;