flake.nix

@@ -38,17 +38,9 @@
         inputs.agenix.nixosModules.default
       ];
 
-      mkHost =
+      mkHost = hostConfig:
-        hostConfig:
         nixpkgs.lib.nixosSystem {
-          specialArgs = {
+          specialArgs = { inherit inputs system overlays agenix; };
-            inherit
-              inputs
-              system
-              overlays
-              agenix
-              ;
-          };
           modules = [ hostConfig ] ++ sharedModules;
         };
     in

hosts/desktop1/configuration.nix

@@ -8,14 +8,6 @@
 
   networking.hostName = "desktop1";
 
-  networking.bridges.br0.interfaces = [ ];
-  networking.interfaces.br0.ipv4.addresses = [
-    {
-      address = "10.0.0.1";
-      prefixLength = 24;
-    }
-  ];
-
   smayzy = {
     desktop.enable = true;
     nvidia.enable = true;

hosts/server1/hardware-configuration.nix

@@ -1,45 +1,28 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
 
 {
-  imports = [
+  imports =
-    (modulesPath + "/profiles/qemu-guest.nix")
+    [ (modulesPath + "/profiles/qemu-guest.nix")
-  ];
+    ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
-    "uhci_hcd"
-    "ehci_pci"
-    "ahci"
-    "virtio_pci"
-    "virtio_scsi"
-    "sd_mod"
-    "sr_mod"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/72df93fc-6794-42d1-b611-8660b32a9cfa";
+    { device = "/dev/disk/by-uuid/72df93fc-6794-42d1-b611-8660b32a9cfa";
-    fsType = "ext4";
+      fsType = "ext4";
-  };
+    };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/F5B8-A39C";
+    { device = "/dev/disk/by-uuid/F5B8-A39C";
-    fsType = "vfat";
+      fsType = "vfat";
-    options = [
+      options = [ "fmask=0077" "dmask=0077" ];
-      "fmask=0077"
+    };
-      "dmask=0077"
-    ];
-  };
 
   swapDevices = [ ];
 

modules/nix/base-cli/pkgs.nix

@@ -31,7 +31,6 @@ in
       usbutils
       git
       unzip
-      nixfmt-tree
       agenix.packages.${system}.default
     ];
   };

modules/nix/containers/default.nix

@@ -1,6 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./nixos
-  ];
-}

modules/nix/containers/nixos/default.nix

@@ -1,5 +0,0 @@
-{ ... }:
-{
-  imports = [
-  ];
-}

modules/nix/default.nix

@@ -6,7 +6,6 @@
     ./browser
     ./cad
     ./comm
-    ./containers
     ./ctf
     ./de
     ./displaymanager

modules/nix/flatpak/flatpak.nix

@@ -37,7 +37,7 @@ in
         };
       };
     };
-    default = { };
+    default = {};
   };
 
   config = mkIf config.smayzy.flatpak.enable (
@@ -75,3 +75,4 @@ in
     }
   );
 }
+

modules/nix/isolation/firejail.nix

@@ -1,9 +1,4 @@
-{
+{ lib, pkgs, config, ... }:
-  lib,
-  pkgs,
-  config,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/networking/wireshark.nix

@@ -1,9 +1,4 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 let
   inherit (lib) mkIf mkOption types;
 in

secrets/secrets.nix

@@ -4,11 +4,7 @@ let
   smayzy_desktop1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKebxL3JGy2UgPX4NjDvHjRz1ri6yyReAOURET+ULKz5";
   smayzy_laptop1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB1AK9eYCMHAz1HE0/UmFeAmFNn6EJsVwiKsvzeHipuI";
   smayzy_server1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK0rBzdu8mwX26ZH7+bxHQsYqLZ/uCcBRP05OJlhzfZF";
-  users = [
+  users = [ smayzy_desktop1 smayzy_laptop1 smayzy_server1 ];
-    smayzy_desktop1
-    smayzy_laptop1
-    smayzy_server1
-  ];
 
   desktop1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM627oXXyR+0SlVNcRhyw2/8c3X4y+cl3XSU/BUumxzi";
   laptop1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ6tnupPyqe4Ihc3D4S8ZSPCX4k1M/AEQ0gmy61O4CTb";
@@ -18,15 +14,11 @@ let
   servers = [ server1 ];
   systems = desktops ++ laptops ++ servers;
 
-  mkKey = key: {
+  mkKey = key:{
     publicKeys = 
-      if builtins.isList key then
+      if builtins.isList key
-        key ++ [ nix-config-dev ]
+      then key ++ [ nix-config-dev ]
-      else
+      else [ key nix-config-dev ];
-        [
-          key
-          nix-config-dev
-        ];
     armor = true;
   };
 in