Ayo the pizza here (restructuring)

.github/workflows/main.yml

@@ -12,11 +12,10 @@ jobs:
       matrix:
         pkg:
         - anup
-        - customscripts
+        - discord
-        - mpd_discord_richpresence
+        - proxychains
         - st
         - dmenu
-        - kbd
     steps:
       - uses: actions/checkout@v2.3.4
       - uses: cachix/install-nix-action@v13

flake.nix

@@ -40,6 +40,22 @@
     };
   }) //
   ( 
+  let 
+    personalModules = [
+      ./modules/nvidia-offload.nix
+      ./modules/pipewire.nix
+      ./modules/xorg.nix
+    ];
+    commonModules = [
+      ./modules/nvim
+      ./modules/vault-agent.nix
+    ];
+    serverModules = [
+      ./modules/builder.nix
+      ./modules/min-pkgs.nix
+      ./modules/min-stuff.nix
+    ];
+  in
   {
     hm-configs = {
       natto = inputs.home-manager.lib.homeManagerConfiguration {
@@ -62,47 +78,43 @@
       Satori = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
-          ./hosts/personal/satori.nix
+          ./hosts/satori
           inputs.agenix.nixosModules.age
           inputs.home-manager.nixosModules.home-manager
           {
             nixpkgs.pkgs = self.legacyPackages.x86_64-linux; 
           }
-        ];
+        ]
+        ++ personalModules
+        ++ commonModules;
       };
+
       #Home server (RPi4)
       Marisa = nixpkgs.lib.nixosSystem {
         system = "aarch64-linux";
         modules = [
-          ./modules/vault-agent.nix
+          ./hosts/marisa
-          ./hosts/servers/marisa.nix
           #inputs.mailserver.nixosModules.mailserver
           {
             nixpkgs.pkgs = self.legacyPackages.aarch64-linux; 
           }
-        ];
+        ]
-      };
+        ++ commonModules
-      #idk, maybe to try cross compiling Marisa on home laptop later?
+        ++ serverModules;
-      Marisus = nixpkgs.lib.nixosSystem {
-        system = "aarch64-linux";
-        modules = [ 
-          ./hosts/servers/marisa.nix
-          {
-            nixpkgs.pkgs = (self.legacyPackages.x86_64-linux) // {crossSystem.config = "aarch64-unknown-linux-gnu";};
-          }
-        ];
       };
+
       #Oracle Cloud VM
       Remilia = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
-          ./modules/vault-agent.nix
+          ./hosts/remilia
-          ./hosts/servers/remilia.nix
           inputs.mailserver.nixosModules.mailserver
           {
             nixpkgs.pkgs = self.legacyPackages.x86_64-linux; 
           }
-        ];
+        ]
+        ++ commonModules
+        ++ serverModules;
       };
     };
   });

hm-switch

@@ -3,7 +3,7 @@
 echo "You're about to switch your home-manager configuration as '$USER'"
 read -p "Continue (y/n)?" conf
 
-if [ ${conf,,} == "n" ]; then
+if [ ${conf,,} != "y" ]; then
   echo "If this is not you, then log into your profile first!"
   exit 1
 else

hosts/README.md

@@ -0,0 +1,3 @@
+Satori is my home laptop\
+Marisa is my Raspberry Pi 4 (B)\
+Remilia is my cloud VM

hosts/marisa/default.nix

@@ -0,0 +1,12 @@
+{config, pkgs, ...}:
+{
+  imports = 
+  [
+    ./networking.nix
+    ./hardware.nix
+    ./boot.nix
+    ./services.nix
+  ];
+  programs.gnupg.agent.enable = pkgs.lib.mkForce false;
+  system.stateVersion = "21.05";
+}

hosts/marisa/services.nix

@@ -6,8 +6,7 @@
       permitRootLogin = "yes";
     };
     vault = {
-      package = pkgs.vault-bin;
+      package = pkgs.vault-bin; enable = true;
-      enable = true;
       tlsCertFile = "/var/certs/cert.pem";
       tlsKeyFile = "/var/certs/key.pem";
       address = "0.0.0.0:8800";
@@ -97,5 +96,5 @@
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPX1HDzWpoaOcU8GDEGuDzXgxkCpyeqxRR6gLs/8JgHw"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK06ZUa9BKmZ6m+xapBjOAm10OCLzxIm8ais20wQC47m"
   ];
-  security.pki.certificateFiles = [ ../../../cert.pem ];
+  security.pki.certificateFiles = [ ../../cert.pem ];
 }

hosts/personal/README.md

@@ -1 +0,0 @@
-Satori is my home laptop

hosts/personal/satori.nix

@@ -1,17 +0,0 @@
-{ lib, config, ...}:
-{
-  imports =
-    [
-      ./satori/hardware.nix
-      ./satori/stuff.nix
-      ./satori/pkgs.nix
-      ./satori/networking.nix
-      ./satori/boot.nix
-      ./satori/services.nix
-      ./common/nvidia-offload.nix
-      ./common/pipewire.nix
-      ./common/xorg.nix
-      ../../configs/nvim.nix
-    ];
-  system.stateVersion = "21.05";
-}

hosts/remilia/default.nix

@@ -0,0 +1,12 @@
+{lib, config, ...}:
+{
+  imports = 
+  [
+    ./networking.nix
+    ./hardware.nix
+    ./boot.nix
+    ./services.nix
+    ./mailserver.nix
+  ];
+  system.stateVersion = "21.11";
+}

hosts/remilia/services.nix

@@ -75,5 +75,5 @@
       "git.weirdnatto.in".email = "git+acme@weirdnatto.in";    
     };
   };
-  security.pki.certificateFiles = [ ../../../cert.pem ];
+  security.pki.certificateFiles = [ ../../cert.pem ];
 }

hosts/satori/default.nix

@@ -0,0 +1,13 @@
+{ lib, config, ...}:
+{
+  imports =
+    [
+      ./hardware.nix
+      ./stuff.nix
+      ./pkgs.nix
+      ./networking.nix
+      ./boot.nix
+      ./services.nix
+    ];
+  system.stateVersion = "21.05";
+}

hosts/satori/services.nix

@@ -31,7 +31,7 @@
     #printing.wantedBy = lib.mkForce [];
     #vault.wantedBy = lib.mkForce [];
   };
-  security.pki.certificateFiles = [ ../../../cert.pem ];
+  security.pki.certificateFiles = [ ../../cert.pem ];
  /* virtualisation.libvirtd = {
     enable = true;
     onBoot = "ignore";

hosts/servers/marisa.nix

@@ -1,16 +0,0 @@
-{config, pkgs, ...}:
-{
-  imports = 
-  [
-    ./pkgs.nix
-    ./stuff.nix
-    ./marisa/networking.nix
-    ./marisa/hardware.nix
-    ./marisa/boot.nix
-    ./marisa/services.nix
-    ./marisa/builder.nix
-    ../../configs/nvim.nix
-  ];
-  programs.gnupg.agent.enable = pkgs.lib.mkForce false;
-  system.stateVersion = "21.05";
-}

hosts/servers/marisa/cachix.nix

@@ -1,14 +0,0 @@
-
-# WARN: this file will get overwritten by $ cachix use <name>
-{ pkgs, lib, ... }:
-
-let
-  folder = ./cachix;
-  toImport = name: value: folder + ("/" + name);
-  filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
-  imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
-in {
-  inherit imports;
-  nix.binaryCaches = ["https://cache.nixos.org/"];
-}
-    

hosts/servers/marisa/cachix/rpi4.nix

@@ -1,12 +0,0 @@
-
-{
-  nix = {
-    binaryCaches = [
-      "https://rpi4.cachix.org"
-    ];
-    binaryCachePublicKeys = [
-      "rpi4.cachix.org-1:fMaYBuIlj/Sa9YTXnXMXoXnVZEoVhnFxOkxseKKlku8="
-    ];
-  };
-}
-    

hosts/servers/remilia.nix

@@ -1,17 +0,0 @@
-{lib, config, ...}:
-{
-  imports = 
-  [
-    ./pkgs.nix
-    ./stuff.nix
-    ./remilia/networking.nix
-    ./remilia/hardware.nix
-    ./remilia/boot.nix
-    ./remilia/services.nix
-    ./remilia/builder.nix
-    ./remilia/mailserver.nix
-    ../../configs/nvim.nix
-  ];
- # programs.gnupg.agent.enable = lib.mkForce false;
-  system.stateVersion = "21.11";
-}

hosts/servers/remilia/builder.nix

@@ -1,14 +0,0 @@
-{config, ...}:
-{
-  nix.buildMachines = [ {
-	 hostName = "Satori";
-	 system = "x86_64-linux";
-	 maxJobs = 4;
-	 speedFactor = 2;
-	 supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
-	}] ;
-	nix.distributedBuilds = true;
-	nix.extraOptions = ''
-		builders-use-substitutes = true
-	'';
-}

modules/builder.nix

@@ -2,7 +2,7 @@
 {
   nix.buildMachines = [ {
 	 hostName = "Satori";
-	 system = "aarch64-linux";
+	 systems = ["x86_64-linux" "aarch64-linux"];
 	 maxJobs = 4;
 	 speedFactor = 2;
 	 supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];

modules/min-pkgs.nix

@@ -6,7 +6,9 @@
     vim
     wireguard
     vault
+    tree-sitter
   ];
+
   programs = {
     zsh = {
       enable = true;
@@ -24,13 +26,12 @@
       };
     };
   };
+
   nix = {
     package = pkgs.nixUnstable;
     extraOptions = ''
       experimental-features = nix-command ca-references flakes
-      builders-use-substitutes = true
     '';
     trustedUsers = [ "root" ];
   };
-  documentation.enable = false;
 }

modules/nvim/default.nix

@@ -10,7 +10,7 @@
     configure = {
     customRC = ''
     lua << EOF
-    ${builtins.readFile ./nvim/init.lua}
+    ${builtins.readFile ./init.lua}
     EOF
     '';
       packages.myVimPackage = with pkgs.unstable.vimPlugins; {
@@ -30,7 +30,7 @@
           vim-vsnip
           nvim-treesitter
           vim-nix
-          (gruvbox.overrideAttrs (oa: { patches = [ ./nvim/gruvbox.patch ]; }))
+          (gruvbox.overrideAttrs (oa: { patches = [ ./gruvbox.patch ]; }))
         ];
       };
     };