From 07216e2fa3b9ef6f9ca9e5d88a49c374fef0a231 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 25 Jul 2023 20:22:56 -0400 Subject: [PATCH] flake: remove suites from flake --- flake.nix | 97 ++++++++++-------------------- hosts/Infini-DESKTOP/default.nix | 7 +-- hosts/Infini-FRAMEWORK/default.nix | 8 +-- hosts/Infini-SERVER/default.nix | 4 +- hosts/Infini-STICK/default.nix | 5 +- hosts/Infini-SWIFT/default.nix | 14 ++--- hosts/Infini-WSL/default.nix | 10 +-- users/infinidoge/default.nix | 28 ++++++--- users/root/default.nix | 8 +-- 9 files changed, 66 insertions(+), 115 deletions(-) diff --git a/flake.nix b/flake.nix index f241c1a..9411be8 100644 --- a/flake.nix +++ b/flake.nix @@ -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"; - } // { diff --git a/hosts/Infini-DESKTOP/default.nix b/hosts/Infini-DESKTOP/default.nix index 4653bc7..af6c413 100644 --- a/hosts/Infini-DESKTOP/default.nix +++ b/hosts/Infini-DESKTOP/default.nix @@ -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 diff --git a/hosts/Infini-FRAMEWORK/default.nix b/hosts/Infini-FRAMEWORK/default.nix index fec579e..486e7ff 100644 --- a/hosts/Infini-FRAMEWORK/default.nix +++ b/hosts/Infini-FRAMEWORK/default.nix @@ -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 ]; diff --git a/hosts/Infini-SERVER/default.nix b/hosts/Infini-SERVER/default.nix index 2408536..4880349 100644 --- a/hosts/Infini-SERVER/default.nix +++ b/hosts/Infini-SERVER/default.nix @@ -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 diff --git a/hosts/Infini-STICK/default.nix b/hosts/Infini-STICK/default.nix index e870c84..44bf316 100644 --- a/hosts/Infini-STICK/default.nix +++ b/hosts/Infini-STICK/default.nix @@ -1,7 +1,6 @@ -{ lib, suites, profiles, private, ... }: { +{ lib, private, ... }: +{ imports = lib.lists.flatten [ - (with suites; [ base develop ]) - private.nixosModules.wireless ./hardware-configuration.nix diff --git a/hosts/Infini-SWIFT/default.nix b/hosts/Infini-SWIFT/default.nix index 1a3e97b..49a4222 100644 --- a/hosts/Infini-SWIFT/default.nix +++ b/hosts/Infini-SWIFT/default.nix @@ -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"; diff --git a/hosts/Infini-WSL/default.nix b/hosts/Infini-WSL/default.nix index 4be9644..c83617d 100644 --- a/hosts/Infini-WSL/default.nix +++ b/hosts/Infini-WSL/default.nix @@ -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, diff --git a/users/infinidoge/default.nix b/users/infinidoge/default.nix index 36de107..a36f6bb 100644 --- a/users/infinidoge/default.nix +++ b/users/infinidoge/default.nix @@ -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 diff --git a/users/root/default.nix b/users/root/default.nix index 63dbcd0..5f6bc61 100644 --- a/users/root/default.nix +++ b/users/root/default.nix @@ -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";