diff --git a/modules/holocron/copyparty/default.nix b/modules/holocron/copyparty/default.nix index e0dcc23..06a3897 100644 --- a/modules/holocron/copyparty/default.nix +++ b/modules/holocron/copyparty/default.nix @@ -58,7 +58,7 @@ in { home = cfg.data_dir; createHome = true; group = service; - extraGroups = [ "media" "blake" ]; + extraGroups = [ "media" "blake" "archives" ]; }; # enable the ${service} service diff --git a/users/blake/default.nix b/users/blake/default.nix index 9820a9f..bf46b95 100644 --- a/users/blake/default.nix +++ b/users/blake/default.nix @@ -31,7 +31,7 @@ useUserPackages = true; useGlobalPkgs = true; users = { - "blake" = import ./dots/bundles/snowbelle.nix; + "blake" = import ./home.nix; }; }; diff --git a/users/blake/home.nix b/users/blake/home.nix index cfbbe00..b5b70e3 100644 --- a/users/blake/home.nix +++ b/users/blake/home.nix @@ -7,7 +7,8 @@ ... }: let - platform = if pkgs.system == "x86_64-darwin" then "darwin" else "nixos"; + #platform = if pkgs.stdenv.hostPlatform.system == "x86_64-darwin" then "darwin" else "nixos"; + platform = if builtins.pathExists "/System/Library/CoreServices" then "darwin" else "nixos"; # general config home_linux = { @@ -22,7 +23,8 @@ in { imports = [ inputs.sops-nix.homeManagerModules.sops - ./os/${platform} + ./os/${platform}.nix + #./os/nixos.nix ./dots/neovim ./dots/lf ./dots/zsh diff --git a/users/blake/os/nixos.nix b/users/blake/os/nixos.nix index 56b6995..6997d11 100644 --- a/users/blake/os/nixos.nix +++ b/users/blake/os/nixos.nix @@ -8,10 +8,10 @@ { imports = [ - ../../home.nix ]; home.packages = with pkgs; [ htop + sl ]; }