simplify some things (#353)

* flake: drop flake-parts

* flake: add back flake-parts

* flake: use flake module again for configurations

34 files changed, 16 insertions, 115 deletions

diff --git a/users/default.nix b/users/default.nix
index fb474b8..32bb9dc 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -1,21 +1,5 @@
-{inputs, ...}: let
-  unstableFor = inputs.nixpkgs.legacyPackages;
-in {
+{
   homeConfigurations = {
-    seth = {
-      pkgs = unstableFor.x86_64-linux;
-    };
-  };
-
-  homeModules = {
-    seth = import ./seth/module;
-  };
-
-  nixosModules = {
-    seth = import ./seth/nixos.nix;
-  };
-
-  darwinModules = {
-    seth = import ./seth/darwin.nix;
+    seth = {};
   };
 }
diff --git a/users/seth/module/base/default.nix b/users/seth/base/default.nix
index b6c7571..b6c7571 100644
--- a/users/seth/module/base/default.nix
+++ b/users/seth/base/default.nix
diff --git a/users/seth/module/base/standalone.nix b/users/seth/base/standalone.nix
index 4b02690..4b02690 100644
--- a/users/seth/module/base/standalone.nix
+++ b/users/seth/base/standalone.nix
diff --git a/users/seth/darwin.nix b/users/seth/darwin.nix
deleted file mode 100644
index e2c59c8..0000000
--- a/users/seth/darwin.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.traits.users.seth;
-in {
-  imports = [./system.nix];
-
-  config = lib.mkMerge [
-    (lib.mkIf cfg.enable {
-      home-manager.users.seth = {
-        seth.desktop.enable = false;
-      };
-    })
-  ];
-}
diff --git a/users/seth/default.nix b/users/seth/default.nix
index dfaa8d5..c7394a9 100644
--- a/users/seth/default.nix
+++ b/users/seth/default.nix
@@ -1,7 +1,8 @@
-{inputs, ...}: {
-  imports = [inputs.self.homeModules.seth];
-  seth = {
-    enable = true;
-    standalone.enable = true;
-  };
+{
+  imports = [
+    ./base
+    ./desktop
+    ./programs
+    ./shell
+  ];
 }
diff --git a/users/seth/module/desktop/budgie/default.nix b/users/seth/desktop/budgie/default.nix
index bf72ee5..bf72ee5 100644
--- a/users/seth/module/desktop/budgie/default.nix
+++ b/users/seth/desktop/budgie/default.nix
diff --git a/users/seth/module/desktop/default.nix b/users/seth/desktop/default.nix
index d7b5176..d7b5176 100644
--- a/users/seth/module/desktop/default.nix
+++ b/users/seth/desktop/default.nix
diff --git a/users/seth/module/desktop/gnome/default.nix b/users/seth/desktop/gnome/default.nix
index 2ed45b2..2ed45b2 100644
--- a/users/seth/module/desktop/gnome/default.nix
+++ b/users/seth/desktop/gnome/default.nix
diff --git a/users/seth/module/desktop/plasma/default.nix b/users/seth/desktop/plasma/default.nix
index bcff9f5..bcff9f5 100644
--- a/users/seth/module/desktop/plasma/default.nix
+++ b/users/seth/desktop/plasma/default.nix
diff --git a/users/seth/module/desktop/plasma5/default.nix b/users/seth/desktop/plasma5/default.nix
index e3735f1..e3735f1 100644
--- a/users/seth/module/desktop/plasma5/default.nix
+++ b/users/seth/desktop/plasma5/default.nix
diff --git a/users/seth/home.nix b/users/seth/home.nix
new file mode 100644
index 0000000..ca5b7c6
--- /dev/null
+++ b/users/seth/home.nix
@@ -0,0 +1,7 @@
+{
+  imports = [./.];
+  seth = {
+    enable = true;
+    standalone.enable = true;
+  };
+}
diff --git a/users/seth/module/default.nix b/users/seth/module/default.nix
deleted file mode 100644
index c7394a9..0000000
--- a/users/seth/module/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  imports = [
-    ./base
-    ./desktop
-    ./programs
-    ./shell
-  ];
-}
diff --git a/users/seth/nixos.nix b/users/seth/nixos.nix
deleted file mode 100644
index fd65322..0000000
--- a/users/seth/nixos.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  config,
-  lib,
-  secretsDir,
-  ...
-}: let
-  cfg = config.traits.users.seth;
-in {
-  options.traits.users.seth = {
-    manageSecrets =
-      lib.mkEnableOption "automatic secrets management"
-      // {
-        default = config.traits.secrets.enable;
-      };
-  };
-
-  imports = [./system.nix];
-
-  config = lib.mkMerge [
-    (lib.mkIf (cfg.enable && cfg.manageSecrets) {
-      age.secrets = {
-        sethPassword.file = secretsDir + "/sethPassword.age";
-      };
-
-      users.users.seth = {
-        hashedPasswordFile = lib.mkDefault config.age.secrets.sethPassword.path;
-      };
-    })
-  ];
-}
diff --git a/users/seth/module/programs/bat.nix b/users/seth/programs/bat.nix
index a046be2..a046be2 100644
--- a/users/seth/module/programs/bat.nix
+++ b/users/seth/programs/bat.nix
diff --git a/users/seth/module/programs/chromium.nix b/users/seth/programs/chromium.nix
index 5c44dec..5c44dec 100644
--- a/users/seth/module/programs/chromium.nix
+++ b/users/seth/programs/chromium.nix
diff --git a/users/seth/module/programs/default.nix b/users/seth/programs/default.nix
index bc18b6e..bc18b6e 100644
--- a/users/seth/module/programs/default.nix
+++ b/users/seth/programs/default.nix
diff --git a/users/seth/module/programs/eza.nix b/users/seth/programs/eza.nix
index 6280651..6280651 100644
--- a/users/seth/module/programs/eza.nix
+++ b/users/seth/programs/eza.nix
diff --git a/users/seth/module/programs/firefox/arkenfox.nix b/users/seth/programs/firefox/arkenfox.nix
index 98bc107..98bc107 100644
--- a/users/seth/module/programs/firefox/arkenfox.nix
+++ b/users/seth/programs/firefox/arkenfox.nix
diff --git a/users/seth/module/programs/firefox/default.nix b/users/seth/programs/firefox/default.nix
index ac67a31..ac67a31 100644
--- a/users/seth/module/programs/firefox/default.nix
+++ b/users/seth/programs/firefox/default.nix
diff --git a/users/seth/module/programs/git.nix b/users/seth/programs/git.nix
index 674b3c8..674b3c8 100644
--- a/users/seth/module/programs/git.nix
+++ b/users/seth/programs/git.nix
diff --git a/users/seth/module/programs/gpg.nix b/users/seth/programs/gpg.nix
index e709180..e709180 100644
--- a/users/seth/module/programs/gpg.nix
+++ b/users/seth/programs/gpg.nix
diff --git a/users/seth/module/programs/mangohud.nix b/users/seth/programs/mangohud.nix
index f104823..f104823 100644
--- a/users/seth/module/programs/mangohud.nix
+++ b/users/seth/programs/mangohud.nix
diff --git a/users/seth/module/programs/neovim.nix b/users/seth/programs/neovim.nix
index c06d513..c06d513 100644
--- a/users/seth/module/programs/neovim.nix
+++ b/users/seth/programs/neovim.nix
diff --git a/users/seth/module/programs/ssh.nix b/users/seth/programs/ssh.nix
index 7872510..7872510 100644
--- a/users/seth/module/programs/ssh.nix
+++ b/users/seth/programs/ssh.nix
diff --git a/users/seth/module/programs/starship/default.nix b/users/seth/programs/starship/default.nix
index ca3a99b..ca3a99b 100644
--- a/users/seth/module/programs/starship/default.nix
+++ b/users/seth/programs/starship/default.nix
diff --git a/users/seth/module/programs/starship/starship.toml b/users/seth/programs/starship/starship.toml
index db66325..db66325 100644
--- a/users/seth/module/programs/starship/starship.toml
+++ b/users/seth/programs/starship/starship.toml
diff --git a/users/seth/module/programs/vim.nix b/users/seth/programs/vim.nix
index a67effa..a67effa 100644
--- a/users/seth/module/programs/vim.nix
+++ b/users/seth/programs/vim.nix
diff --git a/users/seth/module/programs/vscode.nix b/users/seth/programs/vscode.nix
index a2be13c..a2be13c 100644
--- a/users/seth/module/programs/vscode.nix
+++ b/users/seth/programs/vscode.nix
diff --git a/users/seth/module/shell/bash.nix b/users/seth/shell/bash.nix
index 958794d..958794d 100644
--- a/users/seth/module/shell/bash.nix
+++ b/users/seth/shell/bash.nix
diff --git a/users/seth/module/shell/default.nix b/users/seth/shell/default.nix
index b86697c..b86697c 100644
--- a/users/seth/module/shell/default.nix
+++ b/users/seth/shell/default.nix
diff --git a/users/seth/module/shell/fish.nix b/users/seth/shell/fish.nix
index 0b37273..0b37273 100644
--- a/users/seth/module/shell/fish.nix
+++ b/users/seth/shell/fish.nix
diff --git a/users/seth/module/shell/nu.nix b/users/seth/shell/nu.nix
index b5b1529..b5b1529 100644
--- a/users/seth/module/shell/nu.nix
+++ b/users/seth/shell/nu.nix
diff --git a/users/seth/module/shell/zsh.nix b/users/seth/shell/zsh.nix
index b3f31b9..b3f31b9 100644
--- a/users/seth/module/shell/zsh.nix
+++ b/users/seth/shell/zsh.nix
diff --git a/users/seth/system.nix b/users/seth/system.nix
deleted file mode 100644
index 3ca1da1..0000000
--- a/users/seth/system.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}: let
-  cfg = config.traits.users.seth;
-in {
-  options.traits.users.seth = {
-    enable = lib.mkEnableOption "Seth's user & home configurations";
-  };
-
-  config = lib.mkIf cfg.enable {
-    users.users.seth =
-      {
-        shell = pkgs.fish;
-        home = lib.mkDefault (
-          if pkgs.stdenv.isDarwin
-          then "/Users/seth"
-          else "/home/seth"
-        );
-      }
-      // lib.optionalAttrs pkgs.stdenv.isLinux {
-        extraGroups = ["wheel"];
-        isNormalUser = true;
-      };
-
-    programs.fish.enable = lib.mkDefault true;
-
-    home-manager.users.seth = {
-      imports = [inputs.self.homeModules.seth];
-      seth.enable = true;
-    };
-  };
-}