From eb5b08c8f07417fd276b9e7ccff878962c111148 Mon Sep 17 00:00:00 2001 From: Nathan Date: Fri, 6 Mar 2026 18:46:38 -0600 Subject: [PATCH] Begin Dendritic rewrite --- profiles/container/default.nix | 4 +- profiles/homebox/default.nix | 10 +-- profiles/iso/default.nix | 4 +- profiles/jesstop/default.nix | 6 +- profiles/laptop/default.nix | 8 +-- profiles/live/default.nix | 4 +- profiles/pi4/default.nix | 4 +- templates/default.nix | 18 +---- templates/home-manager/home.nix | 89 ----------------------- templates/nix-on-droid/.sops.yaml | 33 --------- templates/nix-on-droid/configuration.nix | 90 ------------------------ templates/nix-on-droid/flake.nix | 50 ------------- 12 files changed, 21 insertions(+), 299 deletions(-) delete mode 100644 templates/nix-on-droid/.sops.yaml delete mode 100644 templates/nix-on-droid/configuration.nix delete mode 100644 templates/nix-on-droid/flake.nix diff --git a/profiles/container/default.nix b/profiles/container/default.nix index 47da395..8422bf9 100644 --- a/profiles/container/default.nix +++ b/profiles/container/default.nix @@ -1,6 +1,6 @@ -{ ... }: { +{ inputs, ... }: { - flake.nixosModules.container = { config, pkgs, lib, inputs, ... }: + flake.nixosModules.container = { config, pkgs, lib, ... }: { imports = diff --git a/profiles/homebox/default.nix b/profiles/homebox/default.nix index a5ec42e..79db8da 100644 --- a/profiles/homebox/default.nix +++ b/profiles/homebox/default.nix @@ -1,15 +1,15 @@ -{ ... }: { +{ inputs, ... }: { - flake.nixosModules.homebox = { config, pkgs, lib, disko, sops-nix, home-manager, ... }: + flake.nixosModules.homebox = { config, pkgs, lib, ... }: { imports = [ - disko.nixosModules.default + inputs.disko.nixosModules.default - sops-nix.nixosModules.sops + inputs.sops-nix.nixosModules.sops - home-manager.nixosModules.default + inputs.home-manager.nixosModules.default ]; diff --git a/profiles/iso/default.nix b/profiles/iso/default.nix index 2465701..cafeb9a 100644 --- a/profiles/iso/default.nix +++ b/profiles/iso/default.nix @@ -1,6 +1,6 @@ -{ ... }: { +{ inputs, ... }: { - flake.nixosModules.iso = { lib, pkgs, inputs, modulesPath, ... }: { + flake.nixosModules.iso = { lib, pkgs, modulesPath, ... }: { imports = with inputs; [ diff --git a/profiles/jesstop/default.nix b/profiles/jesstop/default.nix index 84122e4..82320cd 100644 --- a/profiles/jesstop/default.nix +++ b/profiles/jesstop/default.nix @@ -1,12 +1,10 @@ -{ ... }: { +{ inputs, ... }: { - flake.nixosModules.jesstop = { config, pkgs, lib, inputs, ... }: + flake.nixosModules.jesstop = { config, pkgs, lib, ... }: { imports = [ - ./hardware-configuration.nix - #inputs.home-manager.nixosModules.default inputs.sops-nix.nixosModules.sops diff --git a/profiles/laptop/default.nix b/profiles/laptop/default.nix index 0b8d8dd..0b6206b 100644 --- a/profiles/laptop/default.nix +++ b/profiles/laptop/default.nix @@ -1,13 +1,13 @@ -{ ... }: { +{ inputs, ... }: { - flake.nixosModules.laptop = { config, pkgs, lib, home-manager, sops-nix, ... }: + flake.nixosModules.laptop = { config, pkgs, lib, ... }: { imports = [ - home-manager.nixosModules.default + inputs.home-manager.nixosModules.default - sops-nix.nixosModules.sops + inputs.sops-nix.nixosModules.sops ]; config = { diff --git a/profiles/live/default.nix b/profiles/live/default.nix index 8d546e3..9f77cc9 100644 --- a/profiles/live/default.nix +++ b/profiles/live/default.nix @@ -1,6 +1,6 @@ -{ ... }: { +{ inputs, ... }: { - flake.nixosModules.live = { pkgs, inputs, ... }: { + flake.nixosModules.live = { pkgs, ... }: { imports = with inputs; [ diff --git a/profiles/pi4/default.nix b/profiles/pi4/default.nix index 5dacfe3..22a0729 100644 --- a/profiles/pi4/default.nix +++ b/profiles/pi4/default.nix @@ -1,6 +1,6 @@ -{ ... }: { +{ inputs, ... }: { - flake.nixosModules.pi4 = { config, pkgs, inputs, ... }: { + flake.nixosModules.pi4 = { config, pkgs, ... }: { imports = [ ./hardware-configuration.nix diff --git a/templates/default.nix b/templates/default.nix index d89537e..7149165 100644 --- a/templates/default.nix +++ b/templates/default.nix @@ -1,6 +1,6 @@ { ... }: { - flake.templates = { + /*flake.templates = { nixos = { welcomeText = '' #Welcome to Olympus! @@ -28,19 +28,5 @@ path = ./home-manager; }; - - nix-on-droid = { - welcomeText = '' - #Welcome to Olympus! - Have Fun! - ''; - - description = '' - Generate this where you want your config. - ''; - - path = ./nix-on-droid; - - }; - }; + };*/ } diff --git a/templates/home-manager/home.nix b/templates/home-manager/home.nix index 1e31884..8b13789 100644 --- a/templates/home-manager/home.nix +++ b/templates/home-manager/home.nix @@ -1,90 +1 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: - -{ - - imports = [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - - config = { - - boot.kernelParams = [ "snd-intel-dspcfg.dsp_driver=1" ]; - - hardware.nvidia = { - modesetting.enable = true; - powerManagement.enable = true; - powerManagement.finegrained = true; - open = false; - nvidiaSettings = true; - package = config.boot.kernelPackages.nvidiaPackages.stable; - - prime = { -# Make sure to use the correct Bus ID values for your system! - intelBusId = "PCI:0:2:0"; - nvidiaBusId = "PCI:1:0:0"; -# WARNING: sync and offload are mutually exclusive. -# You can only pick one!! -#sync.enable = true; - offload = { - enable = true; - enableOffloadCmd = true; - }; - }; - }; - - sysconfig = { - users = { - nathan = { - isSuperuser = true; - extraGroups = [ "networkmanager" ]; - hashedPasswordFile = config.sops.secrets."nathan/pass".path; - shell = pkgs.zsh; - home-manager = { - enable = true; - standalone = false; - extraModules = [ - { - homeconfig = { - minimal = false; - hyprland.enable = true; - hyprlock.enable = true; - wal.enable = true; - mpd.enable = true; - hyprpanel.enable = true; - calcurse.enable = true; - rofi.enable = true; - firefox.enable = true; - git.enable = true; - nh.enable = true; - }; - - #monitor=eDP-1, addreserved, 40,0,0,0 - wayland.windowManager.hyprland.extraConfig = '' - monitor=eDP-1,1920x1080@60,0x0,1 - ''; - - } - ]; - }; - }; - }; - }; - - - services.xserver.videoDrivers = [ "nvidia" ]; - - -# This value determines the NixOS release from which the default -# settings for stateful data, like file locations and database versions -# on your system were taken. It‘s perfectly fine and recommended to leave -# this value at the release version of the first install of this system. -# Before changing this value read the documentation for this option -# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.05"; # Did you read the comment? - }; - -} diff --git a/templates/nix-on-droid/.sops.yaml b/templates/nix-on-droid/.sops.yaml deleted file mode 100644 index 0a2ab72..0000000 --- a/templates/nix-on-droid/.sops.yaml +++ /dev/null @@ -1,33 +0,0 @@ -keys: - - &homebox age1640eg0pnmkruc89m5xguz0m8fek44fl4tzez6qwuzlz6kmapqewsp8esxd - - &laptop age1yqgyp2uxz4lzrc9f9ka0mfjl5fr6ahf8nf24nlmran2wulg6fpvq9hyp9q - - &android age12pnf36uqesjmy3e0lythfnpwam3zg5mv8m936fc4jphy4ces2fdqwn0s74 -creation_rules: - - path_regex: homebox/secrets.yaml$ - key_groups: - - age: - - *homebox - - path_regex: laptop/secrets.yaml$ - key_groups: - - age: - - *laptop - - path_regex: pi4/secrets.yaml$ - key_groups: - - age: - - *laptop - - path_regex: live/secrets.yaml$ - key_groups: - - age: - - *laptop - - path_regex: nathan/secrets.yaml$ - key_groups: - - age: - - *laptop - - *homebox - - *android - - path_regex: system-config/secrets.yaml$ - key_groups: - - age: - - *laptop - - *homebox - - *android diff --git a/templates/nix-on-droid/configuration.nix b/templates/nix-on-droid/configuration.nix deleted file mode 100644 index 1e31884..0000000 --- a/templates/nix-on-droid/configuration.nix +++ /dev/null @@ -1,90 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, ... }: - -{ - - imports = [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - - config = { - - boot.kernelParams = [ "snd-intel-dspcfg.dsp_driver=1" ]; - - hardware.nvidia = { - modesetting.enable = true; - powerManagement.enable = true; - powerManagement.finegrained = true; - open = false; - nvidiaSettings = true; - package = config.boot.kernelPackages.nvidiaPackages.stable; - - prime = { -# Make sure to use the correct Bus ID values for your system! - intelBusId = "PCI:0:2:0"; - nvidiaBusId = "PCI:1:0:0"; -# WARNING: sync and offload are mutually exclusive. -# You can only pick one!! -#sync.enable = true; - offload = { - enable = true; - enableOffloadCmd = true; - }; - }; - }; - - sysconfig = { - users = { - nathan = { - isSuperuser = true; - extraGroups = [ "networkmanager" ]; - hashedPasswordFile = config.sops.secrets."nathan/pass".path; - shell = pkgs.zsh; - home-manager = { - enable = true; - standalone = false; - extraModules = [ - { - homeconfig = { - minimal = false; - hyprland.enable = true; - hyprlock.enable = true; - wal.enable = true; - mpd.enable = true; - hyprpanel.enable = true; - calcurse.enable = true; - rofi.enable = true; - firefox.enable = true; - git.enable = true; - nh.enable = true; - }; - - #monitor=eDP-1, addreserved, 40,0,0,0 - wayland.windowManager.hyprland.extraConfig = '' - monitor=eDP-1,1920x1080@60,0x0,1 - ''; - - } - ]; - }; - }; - }; - }; - - - services.xserver.videoDrivers = [ "nvidia" ]; - - -# This value determines the NixOS release from which the default -# settings for stateful data, like file locations and database versions -# on your system were taken. It‘s perfectly fine and recommended to leave -# this value at the release version of the first install of this system. -# Before changing this value read the documentation for this option -# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.05"; # Did you read the comment? - }; - -} diff --git a/templates/nix-on-droid/flake.nix b/templates/nix-on-droid/flake.nix deleted file mode 100644 index 5abab47..0000000 --- a/templates/nix-on-droid/flake.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - - description = "System Configuration"; - - inputs = { - - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; - - home-manager = { - url = "github:nix-community/home-manager/release-25.05"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - olympus = { - url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Olympus"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.home-manager.follows = "home-manager"; - }; - }; - - outputs = { self, nixpkgs, olympus, ... }: let - host = "hostname"; - - in { - - nixosConfigurations."${host}" = nixpkgs.lib.nixosSystem { - - specialArgs = { - }; - - modules = [ - { sysconfig.host = host; } - ./configuration.nix - olympus.live - ]; - }; - - templates.default = { - welcomeText = '' - # NixOS Configuration Template - Have Fun! - ''; - description = '' - Generate this where you want your config. - ''; - source = ./.; - }; - - }; -}