diff --git a/README.md b/README.md deleted file mode 100644 index e827546..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# void-config - -A few settings that I tend to enable and don't want to have to think about too -much. diff --git a/default/default.nix b/default/default.nix deleted file mode 100644 index caf59d7..0000000 --- a/default/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{...}:{ - imports = [ - ../modules/audio.nix - ../modules/font.nix - ../modules/nix-settings.nix - ../modules/nvidia.nix - ../modules/services.nix - ../modules/vim.nix - ../modules/xconfig.nix - ../modules/zsh.nix - ]; -} diff --git a/flake.nix b/flake.nix index 888f1b4..b4ebcd9 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,7 @@ -{ - description = "A few settings"; - +{ description = "A few settings"; outputs = _: { nixosModules = { - default = import ./default; - smol = import ./smol; + voidcruiser = import ./modules; }; }; } diff --git a/modules/default.nix b/modules/default.nix new file mode 100644 index 0000000..4d8bcb4 --- /dev/null +++ b/modules/default.nix @@ -0,0 +1,12 @@ +{...}:{ + imports = [ + ./audio.nix + ./font.nix + ./nix-settings.nix + ./nvidia.nix + ./services.nix + ./vim.nix + ./xconfig.nix + ./zsh.nix + ]; +} diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index bf9af98..b0a1371 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -1,8 +1,8 @@ { lib, config, ... }: with lib; -let cfg = config.voidcruiser.nixSettings; +let cfg = config.nixSettings; in { - options.voidcruiser.nixSettings = { + options.nixSettings = { gc = { automatic = mkOption { type = types.bool; @@ -25,7 +25,6 @@ in { }; config = { nix = { - optimise.automatic = true; settings = { trusted-users = [ "root" diff --git a/smol/default.nix b/smol/default.nix deleted file mode 100644 index 9ac49c0..0000000 --- a/smol/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{...}:{ - imports = [ - ../modules/nix-settings.nix - ../modules/vim.nix - ../modules/zsh.nix - ../modules/audio.nix - ]; -}