From 84d45eb3d8866aedf8813d9ddc75b17ed4faa158 Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 16 Dec 2023 19:29:50 +0100 Subject: [PATCH 01/10] Default --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index b4ebcd9..32ba1f0 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "A few settings"; outputs = _: { nixosModules = { - voidcruiser = import ./modules; + default = import ./modules; }; }; } From 55453b7939fc45451092a8f99e177c0d72028666 Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 16 Dec 2023 19:36:53 +0100 Subject: [PATCH 02/10] This might work... --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 32ba1f0..615fa79 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { description = "A few settings"; - outputs = _: { + outputs = {self, ...}: { nixosModules = { default = import ./modules; }; From 93b31d12f07939ff8986f28e5b712e5e5f41d6af Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 16 Dec 2023 20:09:03 +0100 Subject: [PATCH 03/10] I don't fucking know anymore... --- flake.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 615fa79..c6657b1 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,7 @@ -{ description = "A few settings"; - outputs = {self, ...}: { +{ + description = "A few settings"; + + outputs = _: { nixosModules = { default = import ./modules; }; From 948cb7c4b80bd2057ce4a3648226c373947c773e Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 16 Dec 2023 20:12:14 +0100 Subject: [PATCH 04/10] Readme --- README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..e827546 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +# void-config + +A few settings that I tend to enable and don't want to have to think about too +much. From cba0e7f9632b8f5d508d7e4c7e62da4925b56a1d Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 16 Dec 2023 20:13:37 +0100 Subject: [PATCH 05/10] For clarity's sake --- modules/nix-settings.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index b0a1371..31334f6 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -1,8 +1,8 @@ { lib, config, ... }: with lib; -let cfg = config.nixSettings; +let cfg = config.voidcruiser.nixSettings; in { - options.nixSettings = { + options.voidcruiser.nixSettings = { gc = { automatic = mkOption { type = types.bool; From 78b50d4aaa174d7b4e3aa3b9a8d793951ee36117 Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 16 Dec 2023 20:40:03 +0100 Subject: [PATCH 06/10] Refactor --- default/default.nix | 12 ++++++++++++ flake.nix | 3 ++- modules/default.nix | 12 ------------ smol/default.nix | 7 +++++++ 4 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 default/default.nix delete mode 100644 modules/default.nix create mode 100644 smol/default.nix diff --git a/default/default.nix b/default/default.nix new file mode 100644 index 0000000..caf59d7 --- /dev/null +++ b/default/default.nix @@ -0,0 +1,12 @@ +{...}:{ + 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 c6657b1..888f1b4 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,8 @@ outputs = _: { nixosModules = { - default = import ./modules; + default = import ./default; + smol = import ./smol; }; }; } diff --git a/modules/default.nix b/modules/default.nix deleted file mode 100644 index 4d8bcb4..0000000 --- a/modules/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{...}:{ - imports = [ - ./audio.nix - ./font.nix - ./nix-settings.nix - ./nvidia.nix - ./services.nix - ./vim.nix - ./xconfig.nix - ./zsh.nix - ]; -} diff --git a/smol/default.nix b/smol/default.nix new file mode 100644 index 0000000..dde1faa --- /dev/null +++ b/smol/default.nix @@ -0,0 +1,7 @@ +{...}:{ + imports = [ + ../modules/nix-settings.nix + ../modules/vim.nix + ../modules/zsh.nix + ]; +} From 4cdb5baf03e7784cbb6ad06a943b6b19236767bc Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Mon, 18 Dec 2023 23:27:19 +0100 Subject: [PATCH 07/10] might also be useful --- smol/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/smol/default.nix b/smol/default.nix index dde1faa..9ac49c0 100644 --- a/smol/default.nix +++ b/smol/default.nix @@ -3,5 +3,6 @@ ../modules/nix-settings.nix ../modules/vim.nix ../modules/zsh.nix + ../modules/audio.nix ]; } From 14c502f9017803b44a68b6652d79e50c627537ba Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 23 Dec 2023 01:09:38 +0100 Subject: [PATCH 08/10] Who doesn't like optimisation --- modules/nix-settings.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 31334f6..bf9af98 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -25,6 +25,7 @@ in { }; config = { nix = { + optimise.automatic = true; settings = { trusted-users = [ "root" From 72abdd1cbc6d6fb5872e9e6ec2edf57009c9104d Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Tue, 26 Dec 2023 09:22:55 +0100 Subject: [PATCH 09/10] Usersettings --- default/default.nix | 1 + modules/usersettings.nix | 12 ++++++++++++ smol/default.nix | 1 + 3 files changed, 14 insertions(+) create mode 100644 modules/usersettings.nix diff --git a/default/default.nix b/default/default.nix index caf59d7..19c28d0 100644 --- a/default/default.nix +++ b/default/default.nix @@ -8,5 +8,6 @@ ../modules/vim.nix ../modules/xconfig.nix ../modules/zsh.nix + ../modules/usersettings.nix ]; } diff --git a/modules/usersettings.nix b/modules/usersettings.nix new file mode 100644 index 0000000..c879872 --- /dev/null +++ b/modules/usersettings.nix @@ -0,0 +1,12 @@ +{ config, lib, ... }: +with lib; +let cfg = config.voidcruiser.userSettings; +in { + options.voidcruiser.userSettings = { + mutableUsers = mkEnableOption "Enables immutable users"; + }; + + config = { + users.mutableUsers = cfg.mutableUsers; + }; +} diff --git a/smol/default.nix b/smol/default.nix index 9ac49c0..d0f2119 100644 --- a/smol/default.nix +++ b/smol/default.nix @@ -4,5 +4,6 @@ ../modules/vim.nix ../modules/zsh.nix ../modules/audio.nix + ../modules/usersettings.nix ]; } From 42c1609a29251b3356c5991f2a12788cd9b6539f Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Tue, 26 Dec 2023 11:12:58 +0100 Subject: [PATCH 10/10] Revert "Usersettings" This reverts commit 72abdd1cbc6d6fb5872e9e6ec2edf57009c9104d. Bad bad bad bad --- default/default.nix | 1 - modules/usersettings.nix | 12 ------------ smol/default.nix | 1 - 3 files changed, 14 deletions(-) delete mode 100644 modules/usersettings.nix diff --git a/default/default.nix b/default/default.nix index 19c28d0..caf59d7 100644 --- a/default/default.nix +++ b/default/default.nix @@ -8,6 +8,5 @@ ../modules/vim.nix ../modules/xconfig.nix ../modules/zsh.nix - ../modules/usersettings.nix ]; } diff --git a/modules/usersettings.nix b/modules/usersettings.nix deleted file mode 100644 index c879872..0000000 --- a/modules/usersettings.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, lib, ... }: -with lib; -let cfg = config.voidcruiser.userSettings; -in { - options.voidcruiser.userSettings = { - mutableUsers = mkEnableOption "Enables immutable users"; - }; - - config = { - users.mutableUsers = cfg.mutableUsers; - }; -} diff --git a/smol/default.nix b/smol/default.nix index d0f2119..9ac49c0 100644 --- a/smol/default.nix +++ b/smol/default.nix @@ -4,6 +4,5 @@ ../modules/vim.nix ../modules/zsh.nix ../modules/audio.nix - ../modules/usersettings.nix ]; }