From 42aeaf54c82b156b0e96f484a19e8c13419a28d3 Mon Sep 17 00:00:00 2001 From: alsaiduq-lab Date: Fri, 2 Jan 2026 22:28:41 -0700 Subject: [PATCH] changed didnt really want to move them back again --- home-manager/cobray.nix | 5 +-- home-manager/init.nix | 4 +-- home-manager/modules/fish.nix | 2 +- home-manager/modules/ghostty.nix | 1 - hosts/modules/nixos.nix | 59 ++++++++++++++++++++------------ 5 files changed, 43 insertions(+), 28 deletions(-) diff --git a/home-manager/cobray.nix b/home-manager/cobray.nix index 3dd9959..e4ec481 100644 --- a/home-manager/cobray.nix +++ b/home-manager/cobray.nix @@ -38,6 +38,7 @@ home.enableNixpkgsReleaseCheck = false; # TODO: move these somewhere else; undecided - #home.packages = with pkgs; [ - #]; + home.packages = with pkgs; [ + nvtopPackages.full + ]; } diff --git a/home-manager/init.nix b/home-manager/init.nix index 3f3ad07..f703217 100644 --- a/home-manager/init.nix +++ b/home-manager/init.nix @@ -3,7 +3,7 @@ config, pkgs, hyprlanddots, - nvimDotfiles, + nvimDots, dankMaterialShell, ... }: { @@ -11,7 +11,7 @@ set -euo pipefail umask 022 repo=${lib.escapeShellArg hyprlanddots} - nvimrepo=${lib.escapeShellArg nvimDotfiles} + nvimrepo=${lib.escapeShellArg nvimDots} dmsConfig="${dankMaterialShell}/etc/xdg/quickshell/dms" mkdir -p "${config.xdg.configHome}" copy_dir() { diff --git a/home-manager/modules/fish.nix b/home-manager/modules/fish.nix index 956ec55..6181780 100644 --- a/home-manager/modules/fish.nix +++ b/home-manager/modules/fish.nix @@ -10,6 +10,6 @@ yazi chafa btop - nvtopPackages.full + fastfetch ]; } diff --git a/home-manager/modules/ghostty.nix b/home-manager/modules/ghostty.nix index 36b6689..9cf0585 100644 --- a/home-manager/modules/ghostty.nix +++ b/home-manager/modules/ghostty.nix @@ -6,7 +6,6 @@ }: { home.packages = with pkgs; [ ghostty - fastfetch ]; programs.ghostty = { diff --git a/hosts/modules/nixos.nix b/hosts/modules/nixos.nix index a4149b8..c1cdd0c 100644 --- a/hosts/modules/nixos.nix +++ b/hosts/modules/nixos.nix @@ -1,30 +1,45 @@ -{...}: { +{ + config, + lib, + ... +}: { nixpkgs.config.allowUnfree = true; programs.nix-index.enable = true; programs.command-not-found.enable = false; - nix.settings = { auto-optimise-store = true; - max-jobs = "auto"; - cores = 0; + max-jobs = + if config.networking.hostName == "magus" + then 1 + else "auto"; + cores = + if config.networking.hostName == "magus" + then 1 + else 0; experimental-features = ["nix-command" "flakes"]; - substituters = [ - "https://cache.nixos.org" - "https://nix-gaming.cachix.org" - "https://ghostty.cachix.org" - "https://hyprland.cachix.org" - "https://nix-community.cachix.org" - "https://cache.nixos-cuda.org" - "https://ezkea.cachix.org" - ]; - trusted-public-keys = [ - "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" - "ghostty.cachix.org-1:QB389yTa6gTyneehvqG58y0WnHjQOqgnA+wBnpWWxns=" - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" - "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI=" - ]; + substituters = + [ + "https://cache.nixos.org" + "https://nix-community.cachix.org" + ] + ++ lib.optionals (config.networking.hostName != "magus") [ + "https://nix-gaming.cachix.org" + "https://ghostty.cachix.org" + "https://hyprland.cachix.org" + "https://cache.nixos-cuda.org" + "https://ezkea.cachix.org" + ]; + trusted-public-keys = + [ + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + ] + ++ lib.optionals (config.networking.hostName != "magus") [ + "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" + "ghostty.cachix.org-1:QB389yTa6gTyneehvqG58y0WnHjQOqgnA+wBnpWWxns=" + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" + "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI=" + ]; }; }