moving some stuff around

This commit is contained in:
RingOfStorms (Joshua Bell) 2025-11-30 00:27:29 -06:00
parent 8a0ab71dae
commit 971d997920
2 changed files with 29 additions and 29 deletions

View file

@ -9,7 +9,6 @@ let
inherit (lib) inherit (lib)
mkOption mkOption
types types
mkEnableOption
mkIf mkIf
mkMerge mkMerge
optionals optionals
@ -46,7 +45,11 @@ let
in in
{ {
options.ringofstorms.dePlasma = { options.ringofstorms.dePlasma = {
enable = mkEnableOption "KDE Plasma desktop"; enable = mkOption {
type = types.bool;
default = true;
description = "Enable KDE Plasma DE.";
};
wayland = mkOption { wayland = mkOption {
type = types.bool; type = types.bool;

View file

@ -12,10 +12,6 @@
outputs = outputs =
{ {
nixpkgs,
home-manager,
common,
ros_neovim,
... ...
}@inputs: }@inputs:
let let
@ -24,7 +20,7 @@
primaryUser = "luser"; primaryUser = "luser";
configLocation = "/home/${primaryUser}/.config/nixos-config/utilities/nixos-installers/examples/${configurationName}"; configLocation = "/home/${primaryUser}/.config/nixos-config/utilities/nixos-installers/examples/${configurationName}";
# configLocation = "/home/${primaryUser}/.config/nixos-config/hosts/${configurationName}"; # configLocation = "/home/${primaryUser}/.config/nixos-config/hosts/${configurationName}";
lib = nixpkgs.lib; lib = inputs.nixpkgs.lib;
in in
{ {
nixosConfigurations = { nixosConfigurations = {
@ -38,8 +34,7 @@
inputs.impermanence.nixosModules.impermanence inputs.impermanence.nixosModules.impermanence
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
inputs.de_plasma.nixosModules.default inputs.ros_neovim.nixosModules.default
ros_neovim.nixosModules.default
( (
{ ... }: { ... }:
{ {
@ -47,17 +42,19 @@
} }
) )
common.nixosModules.essentials inputs.de_plasma.nixosModules.default
common.nixosModules.git
common.nixosModules.tmux inputs.common.nixosModules.essentials
common.nixosModules.boot_systemd inputs.common.nixosModules.git
common.nixosModules.hardening inputs.common.nixosModules.tmux
common.nixosModules.jetbrains_font inputs.common.nixosModules.boot_systemd
common.nixosModules.nix_options inputs.common.nixosModules.hardening
common.nixosModules.no_sleep inputs.common.nixosModules.jetbrains_font
common.nixosModules.timezone_auto inputs.common.nixosModules.nix_options
common.nixosModules.tty_caps_esc inputs.common.nixosModules.no_sleep
common.nixosModules.zsh inputs.common.nixosModules.timezone_auto
inputs.common.nixosModules.tty_caps_esc
inputs.common.nixosModules.zsh
./hardware-configuration.nix ./hardware-configuration.nix
./impermanence.nix ./impermanence.nix
@ -91,14 +88,14 @@
}) (lib.filterAttrs (name: user: user.isNormalUser or false) users.users); }) (lib.filterAttrs (name: user: user.isNormalUser or false) users.users);
sharedModules = [ sharedModules = [
common.homeManagerModules.tmux inputs.common.homeManagerModules.tmux
common.homeManagerModules.atuin inputs.common.homeManagerModules.atuin
common.homeManagerModules.direnv inputs.common.homeManagerModules.direnv
common.homeManagerModules.git inputs.common.homeManagerModules.git
common.homeManagerModules.postgres_cli_options inputs.common.homeManagerModules.postgres_cli_options
common.homeManagerModules.starship inputs.common.homeManagerModules.starship
common.homeManagerModules.zoxide inputs.common.homeManagerModules.zoxide
common.homeManagerModules.zsh inputs.common.homeManagerModules.zsh
]; ];
extraSpecialArgs = { extraSpecialArgs = {