From 93ba9bfdaaf7531138991095a72707f64a38e8eb Mon Sep 17 00:00:00 2001 From: punkfairie Date: Mon, 26 May 2025 11:18:35 -0700 Subject: [PATCH] style: reorganizing --- modules/darwin/default.nix | 5 +- modules/darwin/{base => }/home.nix | 0 modules/darwin/{base => }/stylix.nix | 0 modules/darwin/{base => system}/default.nix | 3 +- modules/darwin/{base => system}/homebrew.nix | 0 modules/darwin/{base => system}/nix.nix | 0 modules/home/default.nix | 1 + modules/home/system/default.nix | 5 ++ modules/home/{ => system}/session.nix | 0 modules/nixos/base/home.nix | 14 ----- modules/nixos/base/users.nix | 42 --------------- modules/nixos/default.nix | 3 ++ modules/nixos/shell/default.nix | 3 ++ modules/nixos/{base => shell}/fonts.nix | 0 modules/nixos/{base => shell}/stylix.nix | 0 modules/nixos/{base => system}/boot.nix | 0 modules/nixos/{base => system}/default.nix | 4 -- modules/nixos/{base => system}/i18n.nix | 0 modules/nixos/{base => system}/networking.nix | 0 modules/nixos/{base => system}/nix.nix | 0 modules/nixos/users.nix | 51 +++++++++++++++++++ 21 files changed, 68 insertions(+), 63 deletions(-) rename modules/darwin/{base => }/home.nix (100%) rename modules/darwin/{base => }/stylix.nix (100%) rename modules/darwin/{base => system}/default.nix (53%) rename modules/darwin/{base => system}/homebrew.nix (100%) rename modules/darwin/{base => system}/nix.nix (100%) create mode 100644 modules/home/system/default.nix rename modules/home/{ => system}/session.nix (100%) delete mode 100644 modules/nixos/base/home.nix delete mode 100644 modules/nixos/base/users.nix rename modules/nixos/{base => shell}/fonts.nix (100%) rename modules/nixos/{base => shell}/stylix.nix (100%) rename modules/nixos/{base => system}/boot.nix (100%) rename modules/nixos/{base => system}/default.nix (57%) rename modules/nixos/{base => system}/i18n.nix (100%) rename modules/nixos/{base => system}/networking.nix (100%) rename modules/nixos/{base => system}/nix.nix (100%) create mode 100644 modules/nixos/users.nix diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix index 95bdaf3..16ec023 100644 --- a/modules/darwin/default.nix +++ b/modules/darwin/default.nix @@ -3,8 +3,11 @@ inputs.agenix.darwinModules.default ../base - ./base + ./home.nix + ./stylix.nix + + ./system ./programs ]; } diff --git a/modules/darwin/base/home.nix b/modules/darwin/home.nix similarity index 100% rename from modules/darwin/base/home.nix rename to modules/darwin/home.nix diff --git a/modules/darwin/base/stylix.nix b/modules/darwin/stylix.nix similarity index 100% rename from modules/darwin/base/stylix.nix rename to modules/darwin/stylix.nix diff --git a/modules/darwin/base/default.nix b/modules/darwin/system/default.nix similarity index 53% rename from modules/darwin/base/default.nix rename to modules/darwin/system/default.nix index 3085991..386849f 100644 --- a/modules/darwin/base/default.nix +++ b/modules/darwin/system/default.nix @@ -1,7 +1,6 @@ { imports = [ - ./home.nix + ./homebrew.nix ./nix.nix - ./stylix.nix ]; } diff --git a/modules/darwin/base/homebrew.nix b/modules/darwin/system/homebrew.nix similarity index 100% rename from modules/darwin/base/homebrew.nix rename to modules/darwin/system/homebrew.nix diff --git a/modules/darwin/base/nix.nix b/modules/darwin/system/nix.nix similarity index 100% rename from modules/darwin/base/nix.nix rename to modules/darwin/system/nix.nix diff --git a/modules/home/default.nix b/modules/home/default.nix index 77578f2..dff322d 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -7,6 +7,7 @@ ./home-manager.nix ./profile.nix + ./system ./programs ]; } diff --git a/modules/home/system/default.nix b/modules/home/system/default.nix new file mode 100644 index 0000000..d22b914 --- /dev/null +++ b/modules/home/system/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./session.nix + ]; +} diff --git a/modules/home/session.nix b/modules/home/system/session.nix similarity index 100% rename from modules/home/session.nix rename to modules/home/system/session.nix diff --git a/modules/nixos/base/home.nix b/modules/nixos/base/home.nix deleted file mode 100644 index 56a0007..0000000 --- a/modules/nixos/base/home.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - config, - inputs, - ... -}: let - inherit (config.marleycfg.my) name; -in { - imports = [inputs.home-manager.nixosModules.home-manager]; - config = { - home-manager.users."${name}" = { - home.homeDirectory = "/home/${name}"; - }; - }; -} diff --git a/modules/nixos/base/users.nix b/modules/nixos/base/users.nix deleted file mode 100644 index 2849d22..0000000 --- a/modules/nixos/base/users.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - config, - ... -}: let - my = { - name = "marley"; - username = "punkfairie"; - fullName = "Marley Rae"; - email = "marley@punkfairie.net"; - }; - - desktopPass = "$y$j9T$ztWf9WeUCENC2T12qS4mi1$51ihV/5cQ8mdJJrNe7MMguk4hPB61S5xHawsfi.1hL3"; - serverPass = "$y$j9T$8hA7OWZsdQMHqYIy8LkYQ1$hFeP2ak3QA4FtoIYIwqPg10//ZOSZrAw1PzJj0PuGSA"; -in { - marleycfg.my = { - inherit (my) name username fullName email; - }; - - users = { - mutableUsers = false; - - groups = { - "compat" = { - gid = 1000; - }; - }; - - users."${my.name}" = { - isNormalUser = true; - description = my.fullName; - extraGroups = - ["wheel" "compat"] - ++ (lib.optional config.networking.networkmanager.enable "networkmanager") - ++ (lib.optional config.virtualisation.docker.enable "docker"); - hashedPassword = - if config.marleycfg.profiles.server - then serverPass - else desktopPass; - }; - }; -} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 4f52879..066bcaf 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -6,8 +6,11 @@ ./base ./hardware + ./system ./shell + ./users.nix + ./programs ./services diff --git a/modules/nixos/shell/default.nix b/modules/nixos/shell/default.nix index b794339..00cf22e 100644 --- a/modules/nixos/shell/default.nix +++ b/modules/nixos/shell/default.nix @@ -1,5 +1,8 @@ { imports = [ + ./stylix.nix + ./fonts.nix + ./hyprlock.nix ./ly.nix ./niri.nix diff --git a/modules/nixos/base/fonts.nix b/modules/nixos/shell/fonts.nix similarity index 100% rename from modules/nixos/base/fonts.nix rename to modules/nixos/shell/fonts.nix diff --git a/modules/nixos/base/stylix.nix b/modules/nixos/shell/stylix.nix similarity index 100% rename from modules/nixos/base/stylix.nix rename to modules/nixos/shell/stylix.nix diff --git a/modules/nixos/base/boot.nix b/modules/nixos/system/boot.nix similarity index 100% rename from modules/nixos/base/boot.nix rename to modules/nixos/system/boot.nix diff --git a/modules/nixos/base/default.nix b/modules/nixos/system/default.nix similarity index 57% rename from modules/nixos/base/default.nix rename to modules/nixos/system/default.nix index 401b72f..9b6bc30 100644 --- a/modules/nixos/base/default.nix +++ b/modules/nixos/system/default.nix @@ -1,12 +1,8 @@ { imports = [ ./boot.nix - ./fonts.nix - ./home.nix ./i18n.nix ./networking.nix ./nix.nix - ./stylix.nix - ./users.nix ]; } diff --git a/modules/nixos/base/i18n.nix b/modules/nixos/system/i18n.nix similarity index 100% rename from modules/nixos/base/i18n.nix rename to modules/nixos/system/i18n.nix diff --git a/modules/nixos/base/networking.nix b/modules/nixos/system/networking.nix similarity index 100% rename from modules/nixos/base/networking.nix rename to modules/nixos/system/networking.nix diff --git a/modules/nixos/base/nix.nix b/modules/nixos/system/nix.nix similarity index 100% rename from modules/nixos/base/nix.nix rename to modules/nixos/system/nix.nix diff --git a/modules/nixos/users.nix b/modules/nixos/users.nix new file mode 100644 index 0000000..bf9c1c3 --- /dev/null +++ b/modules/nixos/users.nix @@ -0,0 +1,51 @@ +{ + inputs, + lib, + config, + ... +}: let + my = { + name = "marley"; + username = "punkfairie"; + fullName = "Marley Rae"; + email = "marley@punkfairie.net"; + }; + + desktopPass = "$y$j9T$ztWf9WeUCENC2T12qS4mi1$51ihV/5cQ8mdJJrNe7MMguk4hPB61S5xHawsfi.1hL3"; + serverPass = "$y$j9T$8hA7OWZsdQMHqYIy8LkYQ1$hFeP2ak3QA4FtoIYIwqPg10//ZOSZrAw1PzJj0PuGSA"; +in { + imports = [inputs.home-manager.nixosModules.home-manager]; + + config = { + marleycfg.my = { + inherit (my) name username fullName email; + }; + + users = { + mutableUsers = false; + + groups = { + "compat" = { + gid = 1000; + }; + }; + + users."${my.name}" = { + isNormalUser = true; + description = my.fullName; + extraGroups = + ["wheel" "compat"] + ++ (lib.optional config.networking.networkmanager.enable "networkmanager") + ++ (lib.optional config.virtualisation.docker.enable "docker"); + hashedPassword = + if config.marleycfg.profiles.server + then serverPass + else desktopPass; + }; + }; + + home-manager.users."${my.name}" = { + home.homeDirectory = "/home/${my.name}"; + }; + }; +}