diff --git a/config/config.nix b/config/config.nix index 7362dcb..faba432 100644 --- a/config/config.nix +++ b/config/config.nix @@ -31,9 +31,11 @@ in networking.networkmanager.enable = true; # Power button settings - services.logind.settings.Login = { - HandlePowerKey = "ignore"; - HandlePowerKeyLongPress = "poweroff"; + services.logind = { + extraConfig = '' + HandlePowerKey=ignore + HandlePowerKeyLongPress=poweroff + ''; }; # Set your time zone. diff --git a/config/packages.nix b/config/packages.nix index 9bf0da5..a944673 100644 --- a/config/packages.nix +++ b/config/packages.nix @@ -14,13 +14,10 @@ in { aspell = aspell.overrideAttrs (super: { postInstall = super.postInstall + '' mkdir -p $out/etc - cat >$out/lib/aspell/en_US-custom.multi <$out/etc/aspell.conf < $out/etc/aspell.conf << EOF + lang en_US + add-extra-dicts en-computers.rws + add-extra-dicts en_US-science.rws EOF ''; }); diff --git a/flake.lock b/flake.lock index 9d8cb21..ce18979 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1761005073, - "narHash": "sha256-r6qbieh8iC1q1eCaWv15f4UIp8SeGffwswhNSA1Qk3s=", + "lastModified": 1750304462, + "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", "owner": "nix-community", "repo": "home-manager", - "rev": "84e1adb0cdd13f5f29886091c7234365e12b1e7f", + "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", "type": "github" }, "original": { @@ -40,11 +40,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1759261417, - "narHash": "sha256-TjuoBb8+isL3KTdGgtYh90XPyeUMFbgNAOG9l23CB3A=", + "lastModified": 1749499850, + "narHash": "sha256-Fyy9ySTJ7jJ7z2h5+KHJU6OUhPJvy12OlVOichkwmZ0=", "owner": "mobile-nixos", "repo": "mobile-nixos", - "rev": "e6f6d527bf6abf94dd52fbba3143a720cef96431", + "rev": "26faf325d6efb169e2e4a2c435346b46c19d08bc", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1760958188, - "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=", + "lastModified": 1750431636, + "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc", + "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760878510, - "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "type": "github" }, "original": { @@ -92,15 +92,17 @@ ] }, "locked": { - "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" + "lastModified": 1759303785, + "narHash": "sha256-EUXrK7pUIzOQWR1dquZh26A6W8lsY2oiHEEZzQnsarM=", + "ref": "refs/heads/master", + "rev": "9662234759eb57f2a1057f2a1c667da1bf128c1c", + "revCount": 686, + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, "original": { - "type": "tarball", - "url": "https://git.outfoxxed.me/quickshell/quickshell/archive/master.tar.gz" + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" } }, "quickshell-toki-night": { @@ -112,11 +114,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1759976594, - "narHash": "sha256-bTrBPRu8CM4YHRSDT6mI5SylEHshujSb2r++C6O/vug=", - "rev": "6e1fb585e30d3503dd120f19e64535005357ffc7", + "lastModified": 1759883456, + "narHash": "sha256-iWW4CnclIGnKrMDZiiNlKc7fG/zR1g3TkHdcVs0a8LA=", + "rev": "8f085b5c36084d8cca38195827d446d109d5c7c3", "type": "tarball", - "url": "https://git.tokinanpa.dev/api/v1/repos/toki/quickshell-toki-night/archive/6e1fb585e30d3503dd120f19e64535005357ffc7.tar.gz" + "url": "https://git.tokinanpa.dev/api/v1/repos/toki/quickshell-toki-night/archive/8f085b5c36084d8cca38195827d446d109d5c7c3.tar.gz" }, "original": { "type": "tarball", diff --git a/hardware-configuration/fire.nix b/hardware-configuration/fire.nix index d0f73d2..7990a20 100644 --- a/hardware-configuration/fire.nix +++ b/hardware-configuration/fire.nix @@ -4,8 +4,6 @@ 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" ]; @@ -26,6 +24,7 @@ [ { 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; } diff --git a/home-manager/shell/alacritty.nix b/home-manager/shell/alacritty.nix index 314aaca..4a580de 100644 --- a/home-manager/shell/alacritty.nix +++ b/home-manager/shell/alacritty.nix @@ -25,7 +25,7 @@ red = "#ff7a93"; green = "#b9f27c"; yellow = "#ff9e64"; - blue = "#7bc5e4"; + blue = "#7da6ff"; magenta = "#bb9af7"; cyan = "#0db9d7"; white = "#acb0d0"; diff --git a/home-manager/shell/fish.nix b/home-manager/shell/fish.nix index 2a71e3e..d6d94d4 100644 --- a/home-manager/shell/fish.nix +++ b/home-manager/shell/fish.nix @@ -15,9 +15,9 @@ 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_param brblue set -g fish_color_comment white - set -g fish_color_match --background=blue + set -g fish_color_match --background=brblue 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 @@ -25,7 +25,7 @@ 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_option blue set -g fish_color_valid_path --underline set -g fish_color_autosuggestion brblack set -g fish_color_user brgreen diff --git a/home-manager/shell/starship.nix b/home-manager/shell/starship.nix index e1d126f..377b164 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 bright-blue"; - repo_root_style = "bold bright-blue"; + before_repo_root_style = "bold blue"; + repo_root_style = "bold blue"; }; nix_shell = { diff --git a/home-manager/tools.nix b/home-manager/tools.nix index 5d3316d..0b4c839 100644 --- a/home-manager/tools.nix +++ b/home-manager/tools.nix @@ -23,14 +23,13 @@ programs.git = { enable = true; + userName = fullname; + userEmail = email; signing.key = "6CB106C25E86A9F7"; signing.signByDefault = true; - settings = { - user.name = fullname; - user.email = email; - + extraConfig = { github.user = "kiana-S"; credential.helper = "store"; safe.directory = [ "/etc/nixos" ]; @@ -39,13 +38,8 @@ init.defaultBranch = "main"; }; - }; - - programs.delta = { - enable = true; - enableGitIntegration = true; - - options = { + delta.enable = true; + delta.options = { features = "decorations"; relative-paths = true; diff --git a/home-manager/wayland/hyprland.nix b/home-manager/wayland/hyprland.nix index 1e01678..22df653 100644 --- a/home-manager/wayland/hyprland.nix +++ b/home-manager/wayland/hyprland.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ config, 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" + "$mod, M, exec, hyprlock --immediate" # Exit "$mod Shift, E, global, ${shell}:session" diff --git a/home-manager/wayland/idle.nix b/home-manager/wayland/idle.nix index fbec428..5bec860 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"; + before_sleep_cmd = "hyprlock --immediate"; }; listener = [ { timeout = 120; - on-timeout = "hyprlock --grace 180"; + on-timeout = "hyprlock"; } { timeout = 600; diff --git a/home-manager/wayland/quickshell.nix b/home-manager/wayland/quickshell.nix index 1957dcd..72b4a6d 100644 --- a/home-manager/wayland/quickshell.nix +++ b/home-manager/wayland/quickshell.nix @@ -10,6 +10,10 @@ PartOf = [ "graphical-session.target" ]; }; - Service.ExecStart = lib.getExe quickshell-toki-night.packages.${pkgs.system}.default; + Service = { + ExecStart = lib.getExe quickshell-toki-night.packages.${pkgs.system}.default; + Restart = "always"; + RestartSec = "10"; + }; }; } diff --git a/home-manager/wayland/wltools.nix b/home-manager/wayland/wltools.nix index e48b4c5..d64b085 100644 --- a/home-manager/wayland/wltools.nix +++ b/home-manager/wayland/wltools.nix @@ -18,7 +18,8 @@ in { general = { hide_cursor = true; - ignore_empty_input = true; + disable_loading_bar = true; + grace = 180; }; background = [