Merge branch 'main' of ssh://codeberg.org/dnscio/nix-config

home/darwin.nix

@@ -8,6 +8,7 @@
   home.sessionVariables = {
     EDITOR = "nvim";
     GOPATH = "$HOME/go";
+    QT_QPA_PLATFORMTHEME = "gtk3";
   };
 
   xdg.enable = true;

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
   ];

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 = [ ];

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/"
         ];

modules/nixvim/editing.nix

@@ -31,6 +31,7 @@
       gomod
       gotmpl
       python
+      styled
       tsx
       typescript
       nix
@@ -54,6 +55,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";

modules/nixvim/lsp.nix

@@ -32,10 +32,21 @@
         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;
         packageFallback = true;
+        config.init_options.typescript.tsdk = "${pkgs.typescript}/lib/node_modules/typescript/lib";
       };
       eslint = {
         enable = true;

modules/tmuxinator/personal-layouts/dnsc.yml

@@ -0,0 +1,11 @@
+name: dnsc-io
+root: ~/dev/dnsc-io
+windows:
+  - dev:
+      layout: main-horizontal
+      panes:
+        - nvim +"lua Snacks.picker.files({ hidden = true })"
+  - run:
+      layout: main-vertical
+      panes:
+        - "pnpm dev"

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
+    ];
+  };
+}

modules/wm/noctalia/default.nix

@@ -89,7 +89,7 @@
         enableClipboardHistory = true;
         autoPasteClipboard = true;
         terminalCommand = "ghostty -e";
-        iconMode = "native";
+        iconMode = "tabler";
         showIconBackground = true;
       };
       systemMonitor = {