organize and configure librewolf

modules/hosts/box/box.nix

@@ -4,10 +4,17 @@
     includes = with den.aspects; [
       den.default
       den.provides.home-manager
+
+      dns
+      openssh
+
+      # cloudflared
       syncthing
+
+      catppuccin
+
       fish
 
-      #cloudflared
       searxng
       copyparty
       glances
@@ -17,10 +24,7 @@
       redlib
       # sish
       vscode-server
-      dns
-      openssh
       gitea
-      catppuccin
 
       (tunnel 3001 "tvtun")
       (tunnel 8888 "search")

modules/hosts/defaults.nix

@@ -1,6 +1,13 @@
-{
+{ den, ... }: {
   den.default = {
-    nixos = { pkgs, ... }: {
+    includes = with den.aspects; [
+      boot
+      security
+      locale
+      essentials
+    ];
+
+    nixos = { ... }: {
       imports = [
         /etc/nixos/hardware-configuration.nix
       ];
@@ -17,86 +24,16 @@
         };
       };
 
-      nixpkgs = {
-        config = {
-          allowUnfree = true;
-        };
-      };
+      nixpkgs.config.allowUnfree = true;
 
       nix = {
         optimise.automatic = true;
         settings.experimental-features = [ "nix-command" "flakes" ];
       };
-
-      security = {
-        sudo = {
-          enable = true;
-          wheelNeedsPassword = false;
-        };
-      };
-
-      boot = {
-        #kernelPackages = lib.mkForce pkgs.linuxPackages_zen;
-
-        initrd.checkJournalingFS = false;
-
-        loader = {
-          grub.splashImage = null;
-
-          systemd-boot = {
-            enable = true;
-            configurationLimit = 25;
-          };
-
-          efi.canTouchEfiVariables = true;
-        };
-      };
-
-      environment.systemPackages = with pkgs; [
-        comma
-        fastfetch
-        git
-        home-manager
-        inetutils
-        micro
-        nh
-        nil
-        nixd
-        nixfmt
-        nix-index
-        nix-output-monitor
-        nix-prefetch
-        nvd
-        psmisc
-        tree
-        unzip
-        wget
-        tree
-      ];
-
-      time.timeZone = "America/Chicago";
-
-      i18n = {
-        defaultLocale = "en_US.UTF-8";
-
-        extraLocaleSettings = {
-          LC_ADDRESS = "en_US.UTF-8";
-          LC_IDENTIFICATION = "en_US.UTF-8";
-          LC_MEASUREMENT = "en_US.UTF-8";
-          LC_MONETARY = "en_US.UTF-8";
-          LC_NAME = "en_US.UTF-8";
-          LC_NUMERIC = "en_US.UTF-8";
-          LC_PAPER = "en_US.UTF-8";
-          LC_TELEPHONE = "en_US.UTF-8";
-          LC_TIME = "en_US.UTF-8";
-        };
-      };
     };
 
     homeManager = {
-      home = {
-        stateVersion = "26.05";
-      };
+      home.stateVersion = "26.05";
     };
   };
-}
+}

modules/hosts/laptop/laptop.nix

@@ -2,30 +2,39 @@
   den.aspects.laptop = {
     includes = with den.aspects; [
       den.default
-      den.aspects.amdgpu
+      den.provides.home-manager
+
+      amdgpu
+
       cosmic
-      firefox
       audio
 
-      den.provides.home-manager
-      stylix
-      syncthing
       swap
-      cloudflare-warp
-      development
-      cad
       virtualisation
-      flatpak
-      fish
+
       dns
       openssh
+      cloudflare-warp
+
+      syncthing
+
+      stylix
       catppuccin
-      music
-      social
-      gaming
+
+      fish
+      flatpak
+      development
+      cad
       compatibility
       utilities
       janitor
+
+      firefox
+      librewolf
+
+      music
+      social
+      gaming
     ];
 
     nixos = {

modules/hosts/nix/nix.nix

@@ -3,30 +3,38 @@
   den.aspects.nix = {
     includes = with den.aspects; [
       den.default
-      #amdgpu
+      den.provides.home-manager
+
+      nvidia
+
       cosmic
-      firefox
       audio
 
-      den.provides.home-manager
-      stylix
-      nvidia
-      syncthing
       swap
-      #cloudflare-warp
-      development
-      #cad
       virtualisation
-      flatpak
-      fish
+
       dns
       openssh
+      # cloudflare-warp
+
+      syncthing
+
+      stylix
       catppuccin
+
+      fish
+      flatpak
+      development
+      # cad
+      compatibility
+      utilities
+
+      firefox
+      librewolf
+
       music
       social
       gaming
-      compatibility
-      utilities
     ];
 
     nixos = {