Infinidoge/universe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

flake: remove suites from flake

Browse source
This commit is contained in:
Infinidoge 2023-07-25 20:22:56 -04:00
parent 934cd7f895
commit 07216e2fa3
9 changed files with 66 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

97
flake.nix
View file

@ -106,7 +106,7 @@
system = "x86_64-linux";
channelName = "nixos";
imports = [ (digga.lib.importExportableModules ./modules) ];
modules = [
modules = let users = digga.lib.rakeLeaves ./users; in [
# --- DevOS Modules ---
{ lib.our = self.lib; }
digga.nixosModules.bootstrapIso
@ -125,87 +125,54 @@
# --- Domain-Specific Modules ---
inputs.nix-minecraft.nixosModules.minecraft-servers
# --- Users ---
users.root
users.infinidoge
];
};
imports = [ (digga.lib.importHosts ./hosts) ];
importables = rec {
profiles = digga.lib.rakeLeaves ./profiles // {
users = digga.lib.rakeLeaves ./users;
};
suites = with profiles; self.lib.flattenSetList
rec {
base = [
(with users; [ root infinidoge ])
];
develop = [
(with profiles.develop.programming; [
haskell
java
kotlin
lua
nim
python
racket
rust
zig
])
];
};
importables = {
inherit private;
profiles = digga.lib.rakeLeaves ./profiles;
};
};
home = {
imports = [ (digga.lib.importExportableModules ./users/modules) ];
modules = [
inputs.impermanence.nixosModules.home-manager.impermanence
];
importables = rec {
inherit inputs;
home =
let
profiles = digga.lib.rakeLeaves ./users/profiles;
suites = with profiles; self.lib.flattenSetList
rec {
base = [
# Base Configuration
xdg
in
{
imports = [ (digga.lib.importExportableModules ./users/modules) ];
modules = with profiles; [
inputs.impermanence.nixosModules.home-manager.impermanence
# Programs
direnv
git
emacs
vim
gpg
ssh
keychain
# Base Configuration
xdg
# Terminal
starship
shells.all
tmux
];
# Programs
direnv
git
emacs
vim
gpg
ssh
keychain
graphic = [
kitty
rofi
themeing
flameshot
];
};
# Terminal
starship
shells.all
tmux
];
importables = {
inherit inputs profiles;
};
};
};
devshell = ./shell;
homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
templates.default = self.templates.bud;
templates.bud.path = ./.;
templates.bud.description = "bud template";
}
//
{

7
hosts/Infini-DESKTOP/default.nix
View file

@ -1,10 +1,5 @@
{ suites, profiles, pkgs, lib, private, ... }: {
{ pkgs, lib, private, ... }: {
imports = lib.lists.flatten [
(with suites; [
base
develop
])
private.nixosModules.wireless
./hardware-configuration.nix

8
hosts/Infini-FRAMEWORK/default.nix
View file

@ -1,13 +1,7 @@
{ suites, profiles, pkgs, lib, private, ... }: {
{ pkgs, lib, private, ... }: {
imports = lib.lists.flatten [
(with suites; [ base ])
private.nixosModules.wireless
(with profiles; [
# services.proxy
])
./hardware-configuration.nix
./filesystems.nix
];

4
hosts/Infini-SERVER/default.nix
View file

@ -1,7 +1,5 @@
{ config, suites, profiles, pkgs, lib, private, ... }: {
{ config, pkgs, lib, private, ... }: {
imports = lib.flatten [
(with suites; [ base ])
private.nixosModules.minecraft-servers
private.nixosModules.nitter
./hardware-configuration.nix

5
hosts/Infini-STICK/default.nix
View file

@ -1,7 +1,6 @@
{ lib, suites, profiles, private, ... }: {
{ lib, private, ... }:
{
imports = lib.lists.flatten [
(with suites; [ base develop ])
private.nixosModules.wireless
./hardware-configuration.nix

14
hosts/Infini-SWIFT/default.nix
View file

@ -1,11 +1,9 @@
{ suites, profiles, pkgs, lib, private, ... }: {
imports = lib.our.flattenListSet {
suites = with suites; [ base develop ];
imports = [
./hardware-configuration.nix
private.nixosModules.wireless
];
};
{ pkgs, lib, private, ... }:
{
imports = [
./hardware-configuration.nix
private.nixosModules.wireless
];
system.stateVersion = "21.11";

10
hosts/Infini-WSL/default.nix
View file

@ -1,11 +1,5 @@
{ suites, profiles, pkgs, lib, ... }: {
imports = lib.lists.flatten [
(with suites; [
base
develop
])
];
{ pkgs, lib, ... }:
{
system.stateVersion = "22.05";
# I don't use Windows, but when I do, I want NixOS there with me,

28
users/infinidoge/default.nix
View file

@ -1,4 +1,4 @@
{ config, self, lib, pkgs, suites, profiles, inputs, ... }:
{ config, self, lib, pkgs, profiles, inputs, ... }:
let
inherit (lib) flatten optional mkIf;
ifGraphical = lib.optionals config.info.graphical;
@ -6,18 +6,30 @@ let
in
{
imports = flatten [
(with suites; [ develop ])
(with profiles.develop.programming; [
haskell
java
kotlin
lua
nim
python
racket
rust
zig
])
];
home = { config, main, suites, profiles, ... }: {
home = { config, main, profiles, ... }: {
imports = flatten [
(with suites; [
base
(ifGraphical' graphic)
])
(with profiles; [
htop
(ifGraphical' [
kitty
rofi
themeing
flameshot
])
])
./config

8
users/root/default.nix
View file

@ -4,13 +4,7 @@
openssh.authorizedKeys.keys = import ./ssh-keys.nix;
};
home-manager.users.root = { suites, profiles, ... }: {
imports = lib.lists.flatten [
(with suites; [
base
])
];
home-manager.users.root = { ... }: {
programs.ssh.matchBlocks = {
"server.doge-inc.net" = {
identityFile = "/root/.ssh/id_25519";