Re-org files and flatten dirs

common-packages.nix

@@ -1,13 +1,7 @@
 {
-  config,
-  lib,
   pkgs,
-  unstable,
   ...
 }:
-let
-  inherit (pkgs) stdenv;
-in
 {
   environment.systemPackages = with pkgs; [
     # essentials

flake.nix

@@ -74,8 +74,8 @@
             };
             modules = [
               ./fonts.nix
-              ./hosts/hephaestus/configuration.nix
-              ./packages.nix
+              ./hosts/hephaestus.nix
+              ./common-packages.nix
               ./services/netdata/default.nix
               ./upgrade-diff.nix
               determinate.nixosModules.default
@@ -113,7 +113,7 @@
                       useGlobalPkgs = true;
                       useUserPackages = true;
                       users.dave.imports = [
-                        ./home/default.nix
+                        ./home.nix
                         inputs.nixvim.homeManagerModules.nixvim
                       ];
                       extraSpecialArgs = {
@@ -145,8 +145,8 @@
             modules = [
               home-manager.darwinModules.home-manager
               stylix.darwinModules.stylix
-              ./hosts/zelus/configuration.nix
-              ./packages.nix
+              ./hosts/zelus.nix
+              ./common-packages.nix
               ./upgrade-diff.nix
 
               (
@@ -158,7 +158,7 @@
                       useGlobalPkgs = true;
                       useUserPackages = true;
                       users."dave.gallant".imports = [
-                        ./home/default.nix
+                        ./home.nix
                         inputs.nixvim.homeManagerModules.nixvim
                       ];
                       extraSpecialArgs = {

home.nix

@@ -15,14 +15,6 @@ in
   stylix = {
     enable = true;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml";
-    targets = {
-      alacritty.enable = true;
-      vscode.enable = false; # overrides synced settings
-    };
-
-    opacity.terminal = 1.0;
-
-    fonts.sizes = if stdenv.isLinux then { terminal = 20; } else { terminal = 16; };
 
     fonts.monospace = {
       name = "FiraCode Nerd Font Mono";

hosts/zelus.nix

@@ -128,7 +128,7 @@
   };
 
   stylix = {
-    # enable = true;
+    enable = true;
     image = "/Library/tokyo-night.jpg";
   };
 

justfile

@@ -8,7 +8,7 @@ arch := `uname -s`
 cmd := if arch == "Linux" { "sudo nixos-rebuild --use-remote-sudo" } else { "darwin-rebuild" }
 
 rebuild:
-  $cmd switch --flake . -I nixos-config="hosts/$(hostname)/configuration.nix"
+  $cmd switch --flake . -I nixos-config="hosts/$(hostname).nix"
 
 rollback:
   $cmd switch --rollback --flake .

services/netdata/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 let
   netdata = pkgs.netdata;
   netdataConf = ./netdata.conf;