From 854cf9a5fca9ad71d766a8ec52979846e3baff3d Mon Sep 17 00:00:00 2001 From: Kiana Sheibani Date: Fri, 10 Oct 2025 13:51:36 -0400 Subject: [PATCH 1/8] tweak(alacritty): modify terminal colors --- home-manager/shell/alacritty.nix | 12 ++++---- home-manager/shell/fish.nix | 50 ++++++++++++++++++++++++++++++++ home-manager/shell/starship.nix | 4 +-- 3 files changed, 58 insertions(+), 8 deletions(-) create mode 100644 home-manager/shell/fish.nix diff --git a/home-manager/shell/alacritty.nix b/home-manager/shell/alacritty.nix index 21ab827..314aaca 100644 --- a/home-manager/shell/alacritty.nix +++ b/home-manager/shell/alacritty.nix @@ -12,20 +12,20 @@ }; colors.normal = { black = "#32344a"; - red = "#ce7284"; - green = "#7dc5a0"; - yellow = "#caaa6a"; - blue = "#7bc5e4"; + red = "#f7768e"; + green = "#9ece6a"; + yellow = "#e0af68"; + blue = "#7aa2f7"; magenta = "#ad8ee6"; cyan = "#449dab"; white = "#787c99"; }; colors.bright = { black = "#444b6a"; - red = "#d5556f"; + red = "#ff7a93"; green = "#b9f27c"; yellow = "#ff9e64"; - blue = "#7da6ff"; + blue = "#7bc5e4"; magenta = "#bb9af7"; cyan = "#0db9d7"; white = "#acb0d0"; diff --git a/home-manager/shell/fish.nix b/home-manager/shell/fish.nix new file mode 100644 index 0000000..2a71e3e --- /dev/null +++ b/home-manager/shell/fish.nix @@ -0,0 +1,50 @@ +{ ... }: +{ + programs.fish.enable = true; + + # Disable greeting + programs.fish.interactiveShellInit = + "set -g fish_greeting"; + + # Set colors + programs.fish.shellInit = '' + set -g fish_color_normal normal + set -g fish_color_command brcyan + set -g fish_color_keyword + set -g fish_color_quote green + set -g fish_color_redirection yellow + set -g fish_color_end brmagenta + set -g fish_color_error brred + set -g fish_color_param blue + set -g fish_color_comment white + set -g fish_color_match --background=blue + set -g fish_color_selection white --bold --background=brblack + set -g fish_color_search_match bryellow --background=brblack + set -g fish_color_history_current --bold + set -g fish_color_operator magenta + set -g fish_color_escape yellow + set -g fish_color_cwd green + set -g fish_color_cwd_root red + set -g fish_color_option brblue + set -g fish_color_valid_path --underline + set -g fish_color_autosuggestion brblack + set -g fish_color_user brgreen + set -g fish_color_host normal + set -g fish_color_host_remote yellow + set -g fish_color_history_current --bold + set -g fish_color_cancel --reverse + set -g fish_pager_color_prefix normal --bold --underline + set -g fish_pager_color_progress brwhite --background=cyan + set -g fish_pager_color_completion normal + set -g fish_pager_color_description yellow + set -g fish_pager_color_selected_background --background=black + set -g fish_pager_color_selected_completion + set -g fish_pager_color_secondary_background + set -g fish_pager_color_secondary_description + set -g fish_pager_color_selected_prefix + set -g fish_pager_color_secondary_prefix + set -g fish_pager_color_selected_description + set -g fish_pager_color_background + set -g fish_pager_color_secondary_completion + ''; +} diff --git a/home-manager/shell/starship.nix b/home-manager/shell/starship.nix index 377b164..e1d126f 100644 --- a/home-manager/shell/starship.nix +++ b/home-manager/shell/starship.nix @@ -24,8 +24,8 @@ truncation_symbol = "⋯ /"; read_only = "  "; read_only_style = "cyan"; - before_repo_root_style = "bold blue"; - repo_root_style = "bold blue"; + before_repo_root_style = "bold bright-blue"; + repo_root_style = "bold bright-blue"; }; nix_shell = { From 30c916dce38fa9ecc8603abe38385101f0a92e64 Mon Sep 17 00:00:00 2001 From: Kiana Sheibani Date: Fri, 10 Oct 2025 13:51:55 -0400 Subject: [PATCH 2/8] feat(shell): declaratively set `fish-shell` theme colors --- home-manager/shell/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/home-manager/shell/default.nix b/home-manager/shell/default.nix index 3bb6ea0..68d1176 100644 --- a/home-manager/shell/default.nix +++ b/home-manager/shell/default.nix @@ -2,16 +2,10 @@ { imports = [ ./alacritty.nix + ./fish.nix ./starship.nix ]; - # Fish shell - - programs.fish.enable = true; - # Disable greeting - programs.fish.interactiveShellInit = - "set -g fish_greeting"; - # Eza - ls replacement programs.eza.enable = true; From 524292401c971213d62652669f7f7d2d38e9d14b Mon Sep 17 00:00:00 2001 From: Kiana Sheibani Date: Wed, 22 Oct 2025 13:04:42 -0400 Subject: [PATCH 3/8] chore: bump inputs --- flake.lock | 48 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index ce18979..9d8cb21 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1750304462, - "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", + "lastModified": 1761005073, + "narHash": "sha256-r6qbieh8iC1q1eCaWv15f4UIp8SeGffwswhNSA1Qk3s=", "owner": "nix-community", "repo": "home-manager", - "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", + "rev": "84e1adb0cdd13f5f29886091c7234365e12b1e7f", "type": "github" }, "original": { @@ -40,11 +40,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1749499850, - "narHash": "sha256-Fyy9ySTJ7jJ7z2h5+KHJU6OUhPJvy12OlVOichkwmZ0=", + "lastModified": 1759261417, + "narHash": "sha256-TjuoBb8+isL3KTdGgtYh90XPyeUMFbgNAOG9l23CB3A=", "owner": "mobile-nixos", "repo": "mobile-nixos", - "rev": "26faf325d6efb169e2e4a2c435346b46c19d08bc", + "rev": "e6f6d527bf6abf94dd52fbba3143a720cef96431", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750431636, - "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", + "lastModified": 1760958188, + "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", + "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750365781, - "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", + "lastModified": 1760878510, + "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", + "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "type": "github" }, "original": { @@ -92,17 +92,15 @@ ] }, "locked": { - "lastModified": 1759303785, - "narHash": "sha256-EUXrK7pUIzOQWR1dquZh26A6W8lsY2oiHEEZzQnsarM=", - "ref": "refs/heads/master", - "rev": "9662234759eb57f2a1057f2a1c667da1bf128c1c", - "revCount": 686, - "type": "git", - "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + "lastModified": 1759610621, + "narHash": "sha256-P3UPFd95mS/3aNgy40nCXAmyfR2bEEBd+tX6xfkYFb0=", + "rev": "c5c438f1cd1a76660a8658ef929a3d19e968e2ce", + "type": "tarball", + "url": "https://git.outfoxxed.me/api/v1/repos/quickshell/quickshell/archive/c5c438f1cd1a76660a8658ef929a3d19e968e2ce.tar.gz" }, "original": { - "type": "git", - "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + "type": "tarball", + "url": "https://git.outfoxxed.me/quickshell/quickshell/archive/master.tar.gz" } }, "quickshell-toki-night": { @@ -114,11 +112,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1759883456, - "narHash": "sha256-iWW4CnclIGnKrMDZiiNlKc7fG/zR1g3TkHdcVs0a8LA=", - "rev": "8f085b5c36084d8cca38195827d446d109d5c7c3", + "lastModified": 1759976594, + "narHash": "sha256-bTrBPRu8CM4YHRSDT6mI5SylEHshujSb2r++C6O/vug=", + "rev": "6e1fb585e30d3503dd120f19e64535005357ffc7", "type": "tarball", - "url": "https://git.tokinanpa.dev/api/v1/repos/toki/quickshell-toki-night/archive/8f085b5c36084d8cca38195827d446d109d5c7c3.tar.gz" + "url": "https://git.tokinanpa.dev/api/v1/repos/toki/quickshell-toki-night/archive/6e1fb585e30d3503dd120f19e64535005357ffc7.tar.gz" }, "original": { "type": "tarball", From 9afcb20494faad80bd5b656f36f9abf8a4ab2cdb Mon Sep 17 00:00:00 2001 From: Kiana Sheibani Date: Wed, 22 Oct 2025 13:05:29 -0400 Subject: [PATCH 4/8] fix: switch version of linux kernel to avoid errors --- hardware-configuration/fire.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hardware-configuration/fire.nix b/hardware-configuration/fire.nix index 7990a20..d0f73d2 100644 --- a/hardware-configuration/fire.nix +++ b/hardware-configuration/fire.nix @@ -4,6 +4,8 @@ hardware.enableRedistributableFirmware = true; hardware.enableAllFirmware = true; + hardware.microsoft-surface.kernelVersion = "stable"; + boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; @@ -24,7 +26,6 @@ [ { device = "/dev/disk/by-uuid/3a81bb60-49e4-41fc-8716-8db7dd5f698f"; } ]; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; virtualisation.hypervGuest.enable = true; } From c6be7e059e15a343e73323f545c4ca8ef5d26c89 Mon Sep 17 00:00:00 2001 From: Kiana Sheibani Date: Wed, 22 Oct 2025 13:06:06 -0400 Subject: [PATCH 5/8] compat: update deprecated config formats --- config/config.nix | 8 +++----- home-manager/tools.nix | 16 +++++++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/config/config.nix b/config/config.nix index faba432..7362dcb 100644 --- a/config/config.nix +++ b/config/config.nix @@ -31,11 +31,9 @@ in networking.networkmanager.enable = true; # Power button settings - services.logind = { - extraConfig = '' - HandlePowerKey=ignore - HandlePowerKeyLongPress=poweroff - ''; + services.logind.settings.Login = { + HandlePowerKey = "ignore"; + HandlePowerKeyLongPress = "poweroff"; }; # Set your time zone. diff --git a/home-manager/tools.nix b/home-manager/tools.nix index 0b4c839..5d3316d 100644 --- a/home-manager/tools.nix +++ b/home-manager/tools.nix @@ -23,13 +23,14 @@ programs.git = { enable = true; - userName = fullname; - userEmail = email; signing.key = "6CB106C25E86A9F7"; signing.signByDefault = true; - extraConfig = { + settings = { + user.name = fullname; + user.email = email; + github.user = "kiana-S"; credential.helper = "store"; safe.directory = [ "/etc/nixos" ]; @@ -38,8 +39,13 @@ init.defaultBranch = "main"; }; - delta.enable = true; - delta.options = { + }; + + programs.delta = { + enable = true; + enableGitIntegration = true; + + options = { features = "decorations"; relative-paths = true; From 0bb0f256799da07dc68653679f0340383a6ed8a1 Mon Sep 17 00:00:00 2001 From: Kiana Sheibani Date: Wed, 22 Oct 2025 13:11:18 -0400 Subject: [PATCH 6/8] tweak: do not restart Quickshell on crash Quickshell automatically restarts itself on crash, and if that system breaks down, then there's probably a more serious issue here than can be solved with a restart. --- home-manager/wayland/quickshell.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/home-manager/wayland/quickshell.nix b/home-manager/wayland/quickshell.nix index 72b4a6d..1957dcd 100644 --- a/home-manager/wayland/quickshell.nix +++ b/home-manager/wayland/quickshell.nix @@ -10,10 +10,6 @@ PartOf = [ "graphical-session.target" ]; }; - Service = { - ExecStart = lib.getExe quickshell-toki-night.packages.${pkgs.system}.default; - Restart = "always"; - RestartSec = "10"; - }; + Service.ExecStart = lib.getExe quickshell-toki-night.packages.${pkgs.system}.default; }; } From 37f05c1163c4b4641779a1f56a39bec0618e4f6d Mon Sep 17 00:00:00 2001 From: Kiana Sheibani Date: Wed, 22 Oct 2025 13:17:43 -0400 Subject: [PATCH 7/8] compat: update `hyprlock` calls to new interface --- home-manager/wayland/hyprland.nix | 4 ++-- home-manager/wayland/idle.nix | 4 ++-- home-manager/wayland/wltools.nix | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/home-manager/wayland/hyprland.nix b/home-manager/wayland/hyprland.nix index 22df653..1e01678 100644 --- a/home-manager/wayland/hyprland.nix +++ b/home-manager/wayland/hyprland.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ pkgs, lib, ... }: let scripts = ./scripts; shell = "quickshell"; @@ -94,7 +94,7 @@ in { "$mod, Return, exec, $terminal" "$mod, D, global, ${shell}:launcher" "$mod Shift, D, global, ${shell}:dashboard" - "$mod, M, exec, hyprlock --immediate" + "$mod, M, exec, hyprlock" # Exit "$mod Shift, E, global, ${shell}:session" diff --git a/home-manager/wayland/idle.nix b/home-manager/wayland/idle.nix index 5bec860..fbec428 100644 --- a/home-manager/wayland/idle.nix +++ b/home-manager/wayland/idle.nix @@ -21,13 +21,13 @@ in { services.hypridle.enable = true; services.hypridle.settings = { general = { - before_sleep_cmd = "hyprlock --immediate"; + before_sleep_cmd = "hyprlock"; }; listener = [ { timeout = 120; - on-timeout = "hyprlock"; + on-timeout = "hyprlock --grace 180"; } { timeout = 600; diff --git a/home-manager/wayland/wltools.nix b/home-manager/wayland/wltools.nix index d64b085..e48b4c5 100644 --- a/home-manager/wayland/wltools.nix +++ b/home-manager/wayland/wltools.nix @@ -18,8 +18,7 @@ in { general = { hide_cursor = true; - disable_loading_bar = true; - grace = 180; + ignore_empty_input = true; }; background = [ From 3dcc3b3f346b507dd2ea7779a685e41fd3d6bbb0 Mon Sep 17 00:00:00 2001 From: Kiana Sheibani Date: Wed, 22 Oct 2025 13:18:19 -0400 Subject: [PATCH 8/8] feat: add custom dictionary to `aspell` --- config/packages.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/config/packages.nix b/config/packages.nix index a944673..9bf0da5 100644 --- a/config/packages.nix +++ b/config/packages.nix @@ -14,10 +14,13 @@ in { aspell = aspell.overrideAttrs (super: { postInstall = super.postInstall + '' mkdir -p $out/etc - cat > $out/etc/aspell.conf << EOF - lang en_US - add-extra-dicts en-computers.rws - add-extra-dicts en_US-science.rws + cat >$out/lib/aspell/en_US-custom.multi <$out/etc/aspell.conf <