update

default-machine-config.nix

@@ -25,47 +25,6 @@
   };
   networking.firewall.allowedTCPPorts = [ 22 ];
 
-  # Setup packages available everywhere
-  environment.systemPackages = with pkgs; [
-    fzf
-    git
-    htop
-    ncdu
-    psmisc
-    ripgrep
-    rsync
-    tmux
-    zoxide
-    tmux
-    direnv
-    atuin
-    rcon
-    lix
-    nix-output-monitor
-    wget
-    comma
-  ];
-
-  # Set up direnv
-  programs.direnv = {
-    package = pkgs.direnv;
-    silent = false;
-    loadInNixShell = true;
-    direnvrcExtra = "";
-    nix-direnv = {
-      enable = true;
-      package = pkgs.nix-direnv;
-    };
-  };
-
-  # Install Neovim and set it as alias for vi(m)
-  programs.neovim = {
-    enable = true;
-    viAlias = true;
-    vimAlias = true;
-    defaultEditor = true;
-  };
-
   # Disable sudo prompt for `wheel` users.
   security.sudo.wheelNeedsPassword = lib.mkDefault false;
 

flake.lock

@@ -701,11 +701,11 @@
         "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1769115257,
+        "lastModified": 1770464309,
-        "narHash": "sha256-Ju8QvCoBECGHoCfE9TQTUnMrK9E4BvBpyhCzh+VrerM=",
+        "narHash": "sha256-GQh77HwhXATPkWCB10oDeb1q6qZ7KJrPqttNy9NTtLk=",
         "owner": "jdonszelmann",
         "repo": "homepage",
-        "rev": "53b9b3b1e3f13ea3e3f0b09856b5236c96e4cded",
+        "rev": "72b2a7932aad8a896f52b788cece4379eefa6663",
         "type": "github"
       },
       "original": {

flake.nix

@@ -101,7 +101,7 @@
           inherit system;
           config.allowUnfree = true;
           overlays = [
-            (_: _: {
+            (pkgs: _: {
               custom = {
                 t = t.packages.${system}.default;
                 inherit (dumpasm.packages.${system}) dumpasm;
@@ -109,6 +109,7 @@
                 pipethon = pipethon.packages.${system}.python;
                 niri = niri-unstable.packages.${system}.niri;
                 raw-data = raw-data.packages.${system}.default;
+                # maple-mono =
               };
               p1n3appl3 = inputs.p1n3appl3.packages.${system};
             })

hosts/fili/services/immich.nix

@@ -6,7 +6,7 @@
 }:
 {
 
-  users.groups.jellyfin = { };
+  users.groups.immich = { };
   users.users.immich = {
     isSystemUser = true;
     group = "immich";
@@ -70,6 +70,8 @@
       server.externalDomain = "https://photos.donsz.nl";
       logging.level = "verbose";
 
+      passwordLogin.enabled = false;
+
       oauth = {
         enabled = true;
 

programs/default.nix

@@ -1,8 +1,4 @@
-{
+_: {
-  pkgs,
-  ...
-}:
-{
   imports = [
     ./nvim
     ./fish
@@ -18,31 +14,91 @@
 
   custom.program.graphcial-packages = {
     requirements = [ "graphical" ];
-    home-config = _: {
+    home-config =
-      home.packages = with pkgs; [
+      { pkgs, ... }:
-        spotify
+      {
-        obsidian
+        home.packages = with pkgs; [
-      ];
+          spotify
-    };
+          obsidian
+          element-desktop
+          chromium
+          bind.dnsutils
+          mpv
+          vlc
+        ];
+      };
   };
 
   custom.program.fun-packages = {
     requirements = [ "fun" ];
-    home-config = _: {
+    home-config =
-      home.packages = with pkgs; [
+      { pkgs, ... }:
-        p1n3appl3.tab
+      {
-      ];
+        home.packages = with pkgs; [
-    };
+          p1n3appl3.tab
+          prismlauncher
+        ];
+      };
   };
 
   custom.program.cli-packages = {
     requirements = [ "cli" ];
-    home-config = _: {
+    home-config =
-      home.packages = with pkgs; [
+      { config, pkgs, ... }:
-        rustup
+      {
-        sops
+        home.packages = with pkgs; [
-      ];
+          # general cli tools
-    };
+          sops
+          fzf
+          htop
+          ncdu
+          psmisc
+          ripgrep
+          rsync
+          zoxide
+          tmux
+          direnv
+          atuin
+          rcon
+          lix
+          nix-output-monitor
+          wget
+          comma
+          unzip
+
+          # dev tools
+          gdb
+          clang-tools
+          rustup
+          git
+          python3
+          unixtools.xxd
+          net-tools
+          sqlite-interactive
+
+          (writeShellScriptBin "nas" ''
+            mkdir -p ~/Documents/nas
+            ${sshfs}/bin/sshfs fili:/storage/storage/data/ ~/Documents/nas
+            cd ~/Documents/nas
+          '')
+        ];
+
+        # Set up direnv
+        programs.direnv = {
+          package = pkgs.direnv;
+          silent = false;
+          nix-direnv = {
+            enable = true;
+            package = pkgs.nix-direnv;
+          };
+        };
+
+        home.file = {
+          "${config.xdg.configHome}/sqlite3/sqliterc".source = pkgs.writeText ".sqliterc" ''
+            .mode box
+          '';
+        };
+      };
   };
 
   custom.program.homedirs = {

programs/firefox/default.nix

@@ -115,7 +115,7 @@ _: {
                 url = "https://search.nixos.org/packages?query=%s";
               }
               {
-                keyword = "!nho";
+                keyword = "!hmo";
                 url = "https://home-manager-options.extranix.com/?query=%s";
               }
               {

programs/fish/default.nix

@@ -85,9 +85,9 @@ _: {
           enableFishIntegration = true;
 
           settings = {
-            filter_mode_shell_up_key_binding = "directory";
+            filter_mode_shell_up_key_binding = "workspace";
             exit_mode = "return-original";
-
+            inline_height = 20;
             workspaces = true;
           };
         };

programs/jj/default.nix

@@ -102,10 +102,19 @@ _: {
                 "bookmark"
                 "move"
                 "--from"
-                "heads(::@- & bookmarks())"
+                "heads(@- & bookmarks())"
                 "--to"
                 "coalesce(@ & ~empty(), @-)"
               ];
+              fuck = [
+                "bookmark"
+                "move"
+                "--from"
+                "heads(@ & bookmarks())"
+                "--to"
+                "@-"
+                "--allow-backwards"
+              ];
               catchup = [
                 "rebase"
                 "-b"

programs/kitty/default.nix

@@ -3,10 +3,19 @@ _: {
   custom.program.kitty.home-config =
     { pkgs, flakes, ... }:
     {
+      home.packages = with pkgs; [
+        # Maple Mono (Ligature TTF unhinted)
+        custom.maple-mono.truetype
+        # Maple Mono NF (Ligature unhinted)
+        custom.maple-mono.NF-unhinted
+        # Maple Mono NF CN (Ligature unhinted)
+        custom.maple-mono.NF-CN-unhinted
+      ];
+
       programs.kitty = {
         enable = true;
         font = {
-          name = "Jetbrains Mono";
+          name = "Maple Mono NF";
           size = 13.0;
           package = pkgs.jetbrains-mono;
         };

programs/niri/default.nix

@@ -43,6 +43,13 @@ _: {
         jetbrains-mono
         fira-mono
         noto-fonts
+
+        # Maple Mono (Ligature TTF unhinted)
+        custom.maple-mono.truetype
+        # Maple Mono NF (Ligature unhinted)
+        custom.maple-mono.NF-unhinted
+        # Maple Mono NF CN (Ligature unhinted)
+        custom.maple-mono.NF-CN-unhinted
       ];
 
       programs.niri.settings = {
@@ -79,6 +86,8 @@ _: {
         QT_QPA_PLATFORMTHEME = "qt6ct";
         XCURSOR_THEME = "Adwaita";
         XCURSOR_SIZE = "10";
+        DEFAULT_BROWSER = "${config.programs.firefox.package}/bin/firefox";
+        BROWSER = "${config.programs.firefox.package}/bin/firefox";
       };
 
       programs.niri.settings = {
@@ -105,7 +114,7 @@ _: {
         };
 
         debug = {
-          render-drm-device = "/dev/dri/renderD128";
+          render-drm-device = "/dev/dri/by-path/pci-0000:00:02.0-render";
         };
 
         cursor = {
@@ -243,6 +252,12 @@ _: {
           {
             argv = [ "${pkgs.lib.getExe' flakes.noctalia.packages.${pkgs.system}.default "noctalia-shell"}" ];
           }
+          {
+            sh = ''
+              systemctl --user import-environment NIRI_SOCKET
+              systemctl --user restart kanata
+            '';
+          }
         ];
 
         animations = { };
@@ -515,6 +530,9 @@ _: {
                 {
                   id = "plugin:catwalk";
                 }
+                {
+                  id = "plugin:brightness";
+                }
               ];
               center = [
                 {

programs/zed/default.nix

@@ -3,6 +3,15 @@ _: {
   custom.program.zed.home-config =
     { pkgs, ... }:
     {
+      home.packages = with pkgs; [
+        # Maple Mono (Ligature TTF unhinted)
+        custom.maple-mono.truetype
+        # Maple Mono NF (Ligature unhinted)
+        custom.maple-mono.NF-unhinted
+        # Maple Mono NF CN (Ligature unhinted)
+        custom.maple-mono.NF-CN-unhinted
+      ];
+
       programs.zed-editor = {
         enable = true;
         extensions = [
@@ -151,10 +160,10 @@ _: {
               "EDITOR" = "vim";
             };
             "font_size" = 12;
-            "font_family" = "Noto Sans Mono";
+            "font_family" = "Maple Mono NF";
             "line_height" = "standard";
           };
-          buffer_font_family = "JetBrains Mono";
+          buffer_font_family = "Maple Mono NF";
 
           # "diagnostics_max_severity": "off",