From 11afe820ad8144aa1862109f56e1225a921a292c Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 15 Jun 2025 02:26:04 +0200 Subject: [PATCH] dsadsa --- cachix.nix => profiles/base/cachix.nix | 0 .../base/cachix}/nix-community.nix | 0 {cachix => profiles/base/cachix}/numtide.nix | 0 profiles/base/default.nix | 17 ++++++----------- profiles/{ => base}/lix.nix | 0 profiles/{ => base}/locale-no.nix | 0 profiles/{ => base}/upgrade-diff.nix | 0 7 files changed, 6 insertions(+), 11 deletions(-) rename cachix.nix => profiles/base/cachix.nix (100%) rename {cachix => profiles/base/cachix}/nix-community.nix (100%) rename {cachix => profiles/base/cachix}/numtide.nix (100%) rename profiles/{ => base}/lix.nix (100%) rename profiles/{ => base}/locale-no.nix (100%) rename profiles/{ => base}/upgrade-diff.nix (100%) diff --git a/cachix.nix b/profiles/base/cachix.nix similarity index 100% rename from cachix.nix rename to profiles/base/cachix.nix diff --git a/cachix/nix-community.nix b/profiles/base/cachix/nix-community.nix similarity index 100% rename from cachix/nix-community.nix rename to profiles/base/cachix/nix-community.nix diff --git a/cachix/numtide.nix b/profiles/base/cachix/numtide.nix similarity index 100% rename from cachix/numtide.nix rename to profiles/base/cachix/numtide.nix diff --git a/profiles/base/default.nix b/profiles/base/default.nix index 35eb98f..ff984b3 100644 --- a/profiles/base/default.nix +++ b/profiles/base/default.nix @@ -4,20 +4,15 @@ { imports = let ifExists = p: if builtins.pathExists p then p else {}; in [ - ./../cachix.nix # update with `cachix use --mode nixos -d . FOOBAR` - ./../secrets - ./locale-no.nix - ./ccache - ./upgrade-diff.nix + ./../../secrets + ./cachix.nix # update with `nix run nixpkgs#cachix -- use --mode nixos -d . FOOBAR` ./lix.nix - ./mounts/common-nfs.nix + ./locale-no.nix + ./upgrade-diff.nix + ./../ccache + ./../mounts/common-nfs.nix /* ./profiles/mounts/common-zfs.nix */ - # results of 'nixos-generate-config' - # nice to have if i just dump this flake into /etc/nixos on a clean install - (ifExists ./configuration.nix ) - (ifExists ./hardware-configuration.nix ) - # TODO: move somewhere smart { options.virtualisation.isVmVariant = lib.mkOption { diff --git a/profiles/lix.nix b/profiles/base/lix.nix similarity index 100% rename from profiles/lix.nix rename to profiles/base/lix.nix diff --git a/profiles/locale-no.nix b/profiles/base/locale-no.nix similarity index 100% rename from profiles/locale-no.nix rename to profiles/base/locale-no.nix diff --git a/profiles/upgrade-diff.nix b/profiles/base/upgrade-diff.nix similarity index 100% rename from profiles/upgrade-diff.nix rename to profiles/base/upgrade-diff.nix