From 86ccae0d055468859620cdeb97d0ce99c242e4cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20D=C3=B6nszelmann?= Date: Thu, 29 Jan 2026 17:19:50 +0100 Subject: [PATCH] update --- default-machine-config.nix | 41 -------------- flake.lock | 6 +- flake.nix | 3 +- hosts/fili/services/immich.nix | 4 +- programs/default.nix | 100 +++++++++++++++++++++++++-------- programs/firefox/default.nix | 2 +- programs/fish/default.nix | 4 +- programs/jj/default.nix | 11 +++- programs/kitty/default.nix | 11 +++- programs/niri/default.nix | 20 ++++++- programs/zed/default.nix | 13 ++++- 11 files changed, 139 insertions(+), 76 deletions(-) diff --git a/default-machine-config.nix b/default-machine-config.nix index b43be5d..3f05995 100644 --- a/default-machine-config.nix +++ b/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; diff --git a/flake.lock b/flake.lock index 99101de..52cc7ab 100644 --- a/flake.lock +++ b/flake.lock @@ -701,11 +701,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1769115257, - "narHash": "sha256-Ju8QvCoBECGHoCfE9TQTUnMrK9E4BvBpyhCzh+VrerM=", + "lastModified": 1770464309, + "narHash": "sha256-GQh77HwhXATPkWCB10oDeb1q6qZ7KJrPqttNy9NTtLk=", "owner": "jdonszelmann", "repo": "homepage", - "rev": "53b9b3b1e3f13ea3e3f0b09856b5236c96e4cded", + "rev": "72b2a7932aad8a896f52b788cece4379eefa6663", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c92b588..70aab7a 100644 --- a/flake.nix +++ b/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}; }) diff --git a/hosts/fili/services/immich.nix b/hosts/fili/services/immich.nix index a75bf07..00553d1 100644 --- a/hosts/fili/services/immich.nix +++ b/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; diff --git a/programs/default.nix b/programs/default.nix index 9e4ba40..422a464 100644 --- a/programs/default.nix +++ b/programs/default.nix @@ -1,8 +1,4 @@ -{ - pkgs, - ... -}: -{ +_: { imports = [ ./nvim ./fish @@ -18,31 +14,91 @@ custom.program.graphcial-packages = { requirements = [ "graphical" ]; - home-config = _: { - home.packages = with pkgs; [ - spotify - obsidian - ]; - }; + home-config = + { pkgs, ... }: + { + home.packages = with pkgs; [ + spotify + obsidian + element-desktop + chromium + bind.dnsutils + mpv + vlc + ]; + }; }; custom.program.fun-packages = { requirements = [ "fun" ]; - home-config = _: { - home.packages = with pkgs; [ - p1n3appl3.tab - ]; - }; + home-config = + { pkgs, ... }: + { + home.packages = with pkgs; [ + p1n3appl3.tab + prismlauncher + ]; + }; }; custom.program.cli-packages = { requirements = [ "cli" ]; - home-config = _: { - home.packages = with pkgs; [ - rustup - sops - ]; - }; + home-config = + { config, pkgs, ... }: + { + 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 = { diff --git a/programs/firefox/default.nix b/programs/firefox/default.nix index 2a0c394..e08a14a 100644 --- a/programs/firefox/default.nix +++ b/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"; } { diff --git a/programs/fish/default.nix b/programs/fish/default.nix index 51013f7..217f897 100644 --- a/programs/fish/default.nix +++ b/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; }; }; diff --git a/programs/jj/default.nix b/programs/jj/default.nix index 4ea0e7b..476313f 100644 --- a/programs/jj/default.nix +++ b/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" diff --git a/programs/kitty/default.nix b/programs/kitty/default.nix index f61c3d2..e52582f 100644 --- a/programs/kitty/default.nix +++ 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; }; diff --git a/programs/niri/default.nix b/programs/niri/default.nix index c849840..75ae571 100644 --- a/programs/niri/default.nix +++ b/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 = [ { diff --git a/programs/zed/default.nix b/programs/zed/default.nix index 3795428..d05cf06 100644 --- a/programs/zed/default.nix +++ b/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",