init secrets

4 files changed, 36 insertions, 32 deletions

diff --git a/1systems/flake-x/config.nix b/1systems/flake-x/config.nix
index 5b7535b75..f8059cc2b 100644
--- a/1systems/flake-x/config.nix
+++ b/1systems/flake-x/config.nix
@@ -1,13 +1,14 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, self, ... }:
 {
   imports =
     [
 
-      # ./x13
       # ./x230
+      ./x13
+
+      (self + "/2configs/default.nix")
 
       ## Common Hardware Components
-      #<nix-ld/modules/nix-ld.nix>
       ## <stockholm/makefu/2configs/hw/mceusb.nix>
       ## <stockholm/makefu/2configs/hw/rtl8812au.nix>
       #<stockholm/makefu/2configs/hw/network-manager.nix>
@@ -222,34 +223,32 @@
   nixpkgs.config.allowUnfree = true;
   nixpkgs.config.oraclejdk.accept_license = true;
 
-  environment.systemPackages = [ xxx ]; 
-
   # configure pulseAudio to provide a HDMI sink as well
   networking.firewall.enable = true;
   networking.firewall.allowedUDPPorts = [ 665 26061 1514 ];
   networking.firewall.trustedInterfaces = [ "vboxnet0" "enp0s25" ];
 
-  # krebs.build.host = config.krebs.hosts.x;
+  krebs.build.host = config.krebs.hosts.x;
 
   #krebs.tinc.retiolum.connectTo = lib.mkForce [ "gum" ];
   #krebs.tinc.retiolum.extraConfig = "AutoConnect = no";
 
   # environment.variables = { GOROOT = [ "${pkgs.go.out}/share/go" ]; };
-  #state = [
-  #  "/home/makefu/stockholm"
-  #  "/home/makefu/.ssh/"
-  #  "/home/makefu/.zsh_history"
-  #  "/home/makefu/.bash_history"
-  #  "/home/makefu/bin"
-  #  "/home/makefu/.gnupg"
-  #  "/home/makefu/.imapfilter"
-  #  "/home/makefu/.mutt"
-  #  "/home/makefu/docs"
-  #  "/home/makefu/notes"
-  #  "/home/makefu/.password-store"
-  #  "/home/makefu/.secrets-pass"
-  #  "/home/makefu/.config/syncthing"
-  #];
+  state = [
+    "/home/makefu/stockholm"
+    "/home/makefu/.ssh/"
+    "/home/makefu/.zsh_history"
+    "/home/makefu/.bash_history"
+    "/home/makefu/bin"
+    "/home/makefu/.gnupg"
+    "/home/makefu/.imapfilter"
+    "/home/makefu/.mutt"
+    "/home/makefu/docs"
+    "/home/makefu/notes"
+    "/home/makefu/.password-store"
+    "/home/makefu/.secrets-pass"
+    "/home/makefu/.config/syncthing"
+  ];
 
   # services.syncthing.user = lib.mkForce "makefu";
   # services.syncthing.dataDir = lib.mkForce "/home/makefu/.config/syncthing/";
diff --git a/1systems/flake-x/result b/1systems/flake-x/result
new file mode 120000
index 000000000..f1d172d8c
--- /dev/null
+++ b/1systems/flake-x/result
@@ -0,0 +1 @@
+/nix/store/svjw1v86maxhw6l7wy6s1p7rsxm7582i-nixos-vm
\ No newline at end of file
diff --git a/1systems/flake-x/x13/default.nix b/1systems/flake-x/x13/default.nix
index 27ea0c99c..32d15df1a 100644
--- a/1systems/flake-x/x13/default.nix
+++ b/1systems/flake-x/x13/default.nix
@@ -1,15 +1,18 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, nixos-hardware, self, ... }:
 # new zfs deployment
 {
   imports = [
-    ./zfs.nix
     ./input.nix
+    ./disk.nix
     ./battery.nix
-    <stockholm/makefu/2configs/hw/bluetooth.nix>
-    <nixos-hardware/lenovo/thinkpad/l14/amd> # close enough
-    # <stockholm/makefu/2configs/hw/tpm.nix>
-    <stockholm/makefu/2configs/hw/ssd.nix>
-    # <stockholm/makefu/2configs/hw/xmm7360.nix>
+
+    (self + "/2configs/hw/bluetooth.nix")
+    (self + "/2configs/hw/tpm.nix")
+    (self + "/2configs/hw/ssd.nix")
+    # (self + "/2configs/hw/xmm7360.nix")
+
+    nixos-hardware.nixosModules.lenovo-thinkpad-l14-amd
+
   ];
   boot.zfs.requestEncryptionCredentials = true;
   networking.hostId = "f8b8e0a2";
@@ -24,9 +27,7 @@
   hardware.opengl.extraPackages = [ pkgs.amdvlk pkgs.rocm-opencl-icd pkgs.rocm-opencl-runtime ];
   # For 32 bit applications
   hardware.opengl.driSupport32Bit = true;
-  hardware.opengl.extraPackages32 = with pkgs; [
-    driversi686Linux.amdvlk
-  ];
+  hardware.opengl.extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
   # is required for amd graphics support ( xorg wont boot otherwise )
   #boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.kernelPackages = lib.mkForce pkgs.linuxPackages;
diff --git a/1systems/flake-x/x13/disk.nix b/1systems/flake-x/x13/disk.nix
index 7ce77bdf5..3fae8d410 100644
--- a/1systems/flake-x/x13/disk.nix
+++ b/1systems/flake-x/x13/disk.nix
@@ -1,4 +1,7 @@
-{ disk ? "/dev/sda", ... }: {
+{ ... }: 
+let
+  disk = "/dev/nvme0n1";
+in {
   disko.devices = {
     disk = {
       nvme = {