Compare commits

...

8 commits

Author SHA1 Message Date
3dcc3b3f34
feat: add custom dictionary to aspell 2025-10-22 13:18:19 -04:00
37f05c1163
compat: update hyprlock calls to new interface 2025-10-22 13:17:43 -04:00
0bb0f25679
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.
2025-10-22 13:17:24 -04:00
c6be7e059e
compat: update deprecated config formats 2025-10-22 13:17:24 -04:00
9afcb20494
fix: switch version of linux kernel to avoid errors 2025-10-22 13:17:24 -04:00
524292401c
chore: bump inputs 2025-10-22 13:17:24 -04:00
30c916dce3
feat(shell): declaratively set fish-shell theme colors 2025-10-22 13:17:24 -04:00
854cf9a5fc
tweak(alacritty): modify terminal colors 2025-10-22 13:17:21 -04:00
13 changed files with 111 additions and 66 deletions

View file

@ -31,11 +31,9 @@ in
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
# Power button settings # Power button settings
services.logind = { services.logind.settings.Login = {
extraConfig = '' HandlePowerKey = "ignore";
HandlePowerKey=ignore HandlePowerKeyLongPress = "poweroff";
HandlePowerKeyLongPress=poweroff
'';
}; };
# Set your time zone. # Set your time zone.

View file

@ -14,10 +14,13 @@ in {
aspell = aspell.overrideAttrs (super: { aspell = aspell.overrideAttrs (super: {
postInstall = super.postInstall + '' postInstall = super.postInstall + ''
mkdir -p $out/etc mkdir -p $out/etc
cat > $out/etc/aspell.conf << EOF cat >$out/lib/aspell/en_US-custom.multi <<EOF
lang en_US add en_US-w_accents.multi
add-extra-dicts en-computers.rws add en-computers.rws
add-extra-dicts en_US-science.rws add en_US-science.rws
EOF
cat >$out/etc/aspell.conf <<EOF
master en_US-custom
EOF EOF
''; '';
}); });

48
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750304462, "lastModified": 1761005073,
"narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", "narHash": "sha256-r6qbieh8iC1q1eCaWv15f4UIp8SeGffwswhNSA1Qk3s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", "rev": "84e1adb0cdd13f5f29886091c7234365e12b1e7f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -40,11 +40,11 @@
"mobile-nixos": { "mobile-nixos": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1749499850, "lastModified": 1759261417,
"narHash": "sha256-Fyy9ySTJ7jJ7z2h5+KHJU6OUhPJvy12OlVOichkwmZ0=", "narHash": "sha256-TjuoBb8+isL3KTdGgtYh90XPyeUMFbgNAOG9l23CB3A=",
"owner": "mobile-nixos", "owner": "mobile-nixos",
"repo": "mobile-nixos", "repo": "mobile-nixos",
"rev": "26faf325d6efb169e2e4a2c435346b46c19d08bc", "rev": "e6f6d527bf6abf94dd52fbba3143a720cef96431",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -55,11 +55,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1750431636, "lastModified": 1760958188,
"narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -70,11 +70,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1750365781, "lastModified": 1760878510,
"narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -92,17 +92,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759303785, "lastModified": 1759610621,
"narHash": "sha256-EUXrK7pUIzOQWR1dquZh26A6W8lsY2oiHEEZzQnsarM=", "narHash": "sha256-P3UPFd95mS/3aNgy40nCXAmyfR2bEEBd+tX6xfkYFb0=",
"ref": "refs/heads/master", "rev": "c5c438f1cd1a76660a8658ef929a3d19e968e2ce",
"rev": "9662234759eb57f2a1057f2a1c667da1bf128c1c", "type": "tarball",
"revCount": 686, "url": "https://git.outfoxxed.me/api/v1/repos/quickshell/quickshell/archive/c5c438f1cd1a76660a8658ef929a3d19e968e2ce.tar.gz"
"type": "git",
"url": "https://git.outfoxxed.me/outfoxxed/quickshell"
}, },
"original": { "original": {
"type": "git", "type": "tarball",
"url": "https://git.outfoxxed.me/outfoxxed/quickshell" "url": "https://git.outfoxxed.me/quickshell/quickshell/archive/master.tar.gz"
} }
}, },
"quickshell-toki-night": { "quickshell-toki-night": {
@ -114,11 +112,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1759883456, "lastModified": 1759976594,
"narHash": "sha256-iWW4CnclIGnKrMDZiiNlKc7fG/zR1g3TkHdcVs0a8LA=", "narHash": "sha256-bTrBPRu8CM4YHRSDT6mI5SylEHshujSb2r++C6O/vug=",
"rev": "8f085b5c36084d8cca38195827d446d109d5c7c3", "rev": "6e1fb585e30d3503dd120f19e64535005357ffc7",
"type": "tarball", "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": { "original": {
"type": "tarball", "type": "tarball",

View file

@ -4,6 +4,8 @@
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
hardware.enableAllFirmware = true; hardware.enableAllFirmware = true;
hardware.microsoft-surface.kernelVersion = "stable";
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
@ -24,7 +26,6 @@
[ { device = "/dev/disk/by-uuid/3a81bb60-49e4-41fc-8716-8db7dd5f698f"; } [ { device = "/dev/disk/by-uuid/3a81bb60-49e4-41fc-8716-8db7dd5f698f"; }
]; ];
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
virtualisation.hypervGuest.enable = true; virtualisation.hypervGuest.enable = true;
} }

View file

@ -12,20 +12,20 @@
}; };
colors.normal = { colors.normal = {
black = "#32344a"; black = "#32344a";
red = "#ce7284"; red = "#f7768e";
green = "#7dc5a0"; green = "#9ece6a";
yellow = "#caaa6a"; yellow = "#e0af68";
blue = "#7bc5e4"; blue = "#7aa2f7";
magenta = "#ad8ee6"; magenta = "#ad8ee6";
cyan = "#449dab"; cyan = "#449dab";
white = "#787c99"; white = "#787c99";
}; };
colors.bright = { colors.bright = {
black = "#444b6a"; black = "#444b6a";
red = "#d5556f"; red = "#ff7a93";
green = "#b9f27c"; green = "#b9f27c";
yellow = "#ff9e64"; yellow = "#ff9e64";
blue = "#7da6ff"; blue = "#7bc5e4";
magenta = "#bb9af7"; magenta = "#bb9af7";
cyan = "#0db9d7"; cyan = "#0db9d7";
white = "#acb0d0"; white = "#acb0d0";

View file

@ -2,16 +2,10 @@
{ {
imports = [ imports = [
./alacritty.nix ./alacritty.nix
./fish.nix
./starship.nix ./starship.nix
]; ];
# Fish shell
programs.fish.enable = true;
# Disable greeting
programs.fish.interactiveShellInit =
"set -g fish_greeting";
# Eza - ls replacement # Eza - ls replacement
programs.eza.enable = true; programs.eza.enable = true;

View file

@ -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
'';
}

View file

@ -24,8 +24,8 @@
truncation_symbol = " /"; truncation_symbol = " /";
read_only = " "; read_only = " ";
read_only_style = "cyan"; read_only_style = "cyan";
before_repo_root_style = "bold blue"; before_repo_root_style = "bold bright-blue";
repo_root_style = "bold blue"; repo_root_style = "bold bright-blue";
}; };
nix_shell = { nix_shell = {

View file

@ -23,13 +23,14 @@
programs.git = { programs.git = {
enable = true; enable = true;
userName = fullname;
userEmail = email;
signing.key = "6CB106C25E86A9F7"; signing.key = "6CB106C25E86A9F7";
signing.signByDefault = true; signing.signByDefault = true;
extraConfig = { settings = {
user.name = fullname;
user.email = email;
github.user = "kiana-S"; github.user = "kiana-S";
credential.helper = "store"; credential.helper = "store";
safe.directory = [ "/etc/nixos" ]; safe.directory = [ "/etc/nixos" ];
@ -38,8 +39,13 @@
init.defaultBranch = "main"; init.defaultBranch = "main";
}; };
delta.enable = true; };
delta.options = {
programs.delta = {
enable = true;
enableGitIntegration = true;
options = {
features = "decorations"; features = "decorations";
relative-paths = true; relative-paths = true;

View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }: { pkgs, lib, ... }:
let let
scripts = ./scripts; scripts = ./scripts;
shell = "quickshell"; shell = "quickshell";
@ -94,7 +94,7 @@ in {
"$mod, Return, exec, $terminal" "$mod, Return, exec, $terminal"
"$mod, D, global, ${shell}:launcher" "$mod, D, global, ${shell}:launcher"
"$mod Shift, D, global, ${shell}:dashboard" "$mod Shift, D, global, ${shell}:dashboard"
"$mod, M, exec, hyprlock --immediate" "$mod, M, exec, hyprlock"
# Exit # Exit
"$mod Shift, E, global, ${shell}:session" "$mod Shift, E, global, ${shell}:session"

View file

@ -21,13 +21,13 @@ in {
services.hypridle.enable = true; services.hypridle.enable = true;
services.hypridle.settings = { services.hypridle.settings = {
general = { general = {
before_sleep_cmd = "hyprlock --immediate"; before_sleep_cmd = "hyprlock";
}; };
listener = [ listener = [
{ {
timeout = 120; timeout = 120;
on-timeout = "hyprlock"; on-timeout = "hyprlock --grace 180";
} }
{ {
timeout = 600; timeout = 600;

View file

@ -10,10 +10,6 @@
PartOf = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ];
}; };
Service = { Service.ExecStart = lib.getExe quickshell-toki-night.packages.${pkgs.system}.default;
ExecStart = lib.getExe quickshell-toki-night.packages.${pkgs.system}.default;
Restart = "always";
RestartSec = "10";
};
}; };
} }

View file

@ -18,8 +18,7 @@
in { in {
general = { general = {
hide_cursor = true; hide_cursor = true;
disable_loading_bar = true; ignore_empty_input = true;
grace = 180;
}; };
background = [ background = [