From 21382e22a0acd6fcb02ae64ca8b3ad8c11ed8880 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Wed, 11 Feb 2026 15:53:04 -0500 Subject: [PATCH] fix setup --- flake.nix | 2 ++ home/home.nix | 4 +--- home/modules/hypridle.nix | 5 +---- home/modules/hyprland.nix | 3 +-- home/modules/hyprlock.nix | 4 +--- home/modules/hyprpaper.nix | 4 +--- home/modules/shell.nix | 2 +- 7 files changed, 8 insertions(+), 16 deletions(-) diff --git a/flake.nix b/flake.nix index 7458b25..346cc89 100644 --- a/flake.nix +++ b/flake.nix @@ -76,6 +76,7 @@ home-manager.extraSpecialArgs = { inherit zen-browser; hostPlatform = system; + isNixOS = true; }; } ]; @@ -89,6 +90,7 @@ extraSpecialArgs = { inherit zen-browser; hostPlatform = system; + isNixOS = false; }; modules = [ ./home/home.nix ]; }; diff --git a/home/home.nix b/home/home.nix index b282a25..918f3b9 100644 --- a/home/home.nix +++ b/home/home.nix @@ -2,12 +2,10 @@ lib, config, pkgs, + isNixOS, ... }: -let - isNixOS = builtins.pathExists /etc/NIXOS; -in { imports = [ ./modules/bootstrap.nix diff --git a/home/modules/hypridle.nix b/home/modules/hypridle.nix index 492d2d3..89b89af 100644 --- a/home/modules/hypridle.nix +++ b/home/modules/hypridle.nix @@ -1,11 +1,8 @@ { lib, + isNixOS, ... }: - -let - isNixOS = builtins.pathExists /etc/NIXOS; -in { services.hypridle = { enable = true; diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index f3435fc..97b4b39 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -1,12 +1,11 @@ { lib, config, + isNixOS, ... }: let - isNixOS = builtins.pathExists /etc/NIXOS; - mkHyprTheme = palette: '' general { col.active_border = rgb(${builtins.substring 1 6 palette.fg}) diff --git a/home/modules/hyprlock.nix b/home/modules/hyprlock.nix index ac663ce..d4ed4bf 100644 --- a/home/modules/hyprlock.nix +++ b/home/modules/hyprlock.nix @@ -1,11 +1,9 @@ { lib, + isNixOS, ... }: -let - isNixOS = builtins.pathExists /etc/NIXOS; -in { programs.hyprlock = { enable = true; diff --git a/home/modules/hyprpaper.nix b/home/modules/hyprpaper.nix index 882f702..b032eb0 100644 --- a/home/modules/hyprpaper.nix +++ b/home/modules/hyprpaper.nix @@ -1,12 +1,10 @@ { pkgs, lib, + isNixOS, ... }: -let - isNixOS = builtins.pathExists /etc/NIXOS; -in { home.packages = lib.mkIf isNixOS [ pkgs.hyprpaper ]; diff --git a/home/modules/shell.nix b/home/modules/shell.nix index 51e21c3..133b9f5 100644 --- a/home/modules/shell.nix +++ b/home/modules/shell.nix @@ -2,12 +2,12 @@ pkgs, lib, config, + isNixOS, ... }: let c = config.colors; - isNixOS = builtins.pathExists /etc/NIXOS; ripgrep = config.programs.ripgrep.enable;