From a957ebf4803aadbac20c4e9a93527db534b404a3 Mon Sep 17 00:00:00 2001 From: ChUrl Date: Thu, 11 Aug 2022 14:17:06 +0200 Subject: [PATCH] trusted users + restructure folders --- {modules => home/modules}/audio.nix | 0 {modules => home/modules}/default.nix | 0 {modules => home/modules}/emacs.nix | 0 {modules => home/modules}/firefox.nix | 0 {modules => home/modules}/fish.nix | 0 {modules => home/modules}/flatpak.nix | 0 {modules => home/modules}/gaming.nix | 0 {modules => home/modules}/gnome.nix | 0 {modules => home/modules}/kitty.nix | 0 {modules => home/modules}/misc.nix | 0 {modules => home/modules}/neovim.nix | 0 {modules => home/modules}/nextcloud.nix | 0 {modules => home/modules}/ranger.nix | 0 {nixos => system}/cachix.nix | 0 {nixos => system}/cachix/nix-community.nix | 0 {nixos => system}/default.nix | 3 ++- {nixos => system}/nixinator/default.nix | 0 {nixos => system}/nixinator/hardware-configuration.nix | 0 {nixos => system}/nixtop/default.nix | 0 {nixos => system}/nixtop/hardware-configuration.nix | 0 20 files changed, 2 insertions(+), 1 deletion(-) rename {modules => home/modules}/audio.nix (100%) rename {modules => home/modules}/default.nix (100%) rename {modules => home/modules}/emacs.nix (100%) rename {modules => home/modules}/firefox.nix (100%) rename {modules => home/modules}/fish.nix (100%) rename {modules => home/modules}/flatpak.nix (100%) rename {modules => home/modules}/gaming.nix (100%) rename {modules => home/modules}/gnome.nix (100%) rename {modules => home/modules}/kitty.nix (100%) rename {modules => home/modules}/misc.nix (100%) rename {modules => home/modules}/neovim.nix (100%) rename {modules => home/modules}/nextcloud.nix (100%) rename {modules => home/modules}/ranger.nix (100%) rename {nixos => system}/cachix.nix (100%) rename {nixos => system}/cachix/nix-community.nix (100%) rename {nixos => system}/default.nix (99%) rename {nixos => system}/nixinator/default.nix (100%) rename {nixos => system}/nixinator/hardware-configuration.nix (100%) rename {nixos => system}/nixtop/default.nix (100%) rename {nixos => system}/nixtop/hardware-configuration.nix (100%) diff --git a/modules/audio.nix b/home/modules/audio.nix similarity index 100% rename from modules/audio.nix rename to home/modules/audio.nix diff --git a/modules/default.nix b/home/modules/default.nix similarity index 100% rename from modules/default.nix rename to home/modules/default.nix diff --git a/modules/emacs.nix b/home/modules/emacs.nix similarity index 100% rename from modules/emacs.nix rename to home/modules/emacs.nix diff --git a/modules/firefox.nix b/home/modules/firefox.nix similarity index 100% rename from modules/firefox.nix rename to home/modules/firefox.nix diff --git a/modules/fish.nix b/home/modules/fish.nix similarity index 100% rename from modules/fish.nix rename to home/modules/fish.nix diff --git a/modules/flatpak.nix b/home/modules/flatpak.nix similarity index 100% rename from modules/flatpak.nix rename to home/modules/flatpak.nix diff --git a/modules/gaming.nix b/home/modules/gaming.nix similarity index 100% rename from modules/gaming.nix rename to home/modules/gaming.nix diff --git a/modules/gnome.nix b/home/modules/gnome.nix similarity index 100% rename from modules/gnome.nix rename to home/modules/gnome.nix diff --git a/modules/kitty.nix b/home/modules/kitty.nix similarity index 100% rename from modules/kitty.nix rename to home/modules/kitty.nix diff --git a/modules/misc.nix b/home/modules/misc.nix similarity index 100% rename from modules/misc.nix rename to home/modules/misc.nix diff --git a/modules/neovim.nix b/home/modules/neovim.nix similarity index 100% rename from modules/neovim.nix rename to home/modules/neovim.nix diff --git a/modules/nextcloud.nix b/home/modules/nextcloud.nix similarity index 100% rename from modules/nextcloud.nix rename to home/modules/nextcloud.nix diff --git a/modules/ranger.nix b/home/modules/ranger.nix similarity index 100% rename from modules/ranger.nix rename to home/modules/ranger.nix diff --git a/nixos/cachix.nix b/system/cachix.nix similarity index 100% rename from nixos/cachix.nix rename to system/cachix.nix diff --git a/nixos/cachix/nix-community.nix b/system/cachix/nix-community.nix similarity index 100% rename from nixos/cachix/nix-community.nix rename to system/cachix/nix-community.nix diff --git a/nixos/default.nix b/system/default.nix similarity index 99% rename from nixos/default.nix rename to system/default.nix index 9a92ca41..2c4cd3ae 100644 --- a/nixos/default.nix +++ b/system/default.nix @@ -19,6 +19,8 @@ experimental-features = nix-command flakes ''; + settings.trusted-users = [ "root" "christoph" ]; + # Keep nix-shell from garbage collection for direnv (keep-outputs + keep-derivations) # NOTE: nix-direnv use nix or use flake should do this automatically # keep-outputs = true @@ -250,7 +252,6 @@ in formatted; - # TODO: Trusted users # We want these packages to be available even when no user profile is active # Empty since we basically only need git + editor which is enabled below diff --git a/nixos/nixinator/default.nix b/system/nixinator/default.nix similarity index 100% rename from nixos/nixinator/default.nix rename to system/nixinator/default.nix diff --git a/nixos/nixinator/hardware-configuration.nix b/system/nixinator/hardware-configuration.nix similarity index 100% rename from nixos/nixinator/hardware-configuration.nix rename to system/nixinator/hardware-configuration.nix diff --git a/nixos/nixtop/default.nix b/system/nixtop/default.nix similarity index 100% rename from nixos/nixtop/default.nix rename to system/nixtop/default.nix diff --git a/nixos/nixtop/hardware-configuration.nix b/system/nixtop/hardware-configuration.nix similarity index 100% rename from nixos/nixtop/hardware-configuration.nix rename to system/nixtop/hardware-configuration.nix