diff --git a/.envrc b/.envrc deleted file mode 100644 index 3e74c79..0000000 --- a/.envrc +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -use flake - -watch_file ./nix/checks.nix -watch_file ./nix/dev-shell.nix - -eval "$shellHook" diff --git a/flake.nix b/flake.nix index 23146f0..ed5310d 100644 --- a/flake.nix +++ b/flake.nix @@ -55,15 +55,6 @@ checks = import ./nix/checks.nix inputs system; devShells.default = import ./nix/dev-shell.nix inputs system; - packages = let - hostDrvs = import ./nix/host-drvs.nix inputs system; - default = - if builtins.hasAttr "${system}" hostDrvs - then {default = self.packages.${system}.${system};} - else {}; - in - hostDrvs // default; - pkgs = import nixpkgs { inherit system; overlays = [ diff --git a/hosts/nom/default.nix b/hosts/nom/default.nix index 267bba5..7f2abc1 100644 --- a/hosts/nom/default.nix +++ b/hosts/nom/default.nix @@ -28,7 +28,6 @@ boot = { initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; kernelModules = []; - tmpOnTmpfs = true; }; console = { diff --git a/hosts/ward/default.nix b/hosts/ward/default.nix index 1f6c823..3029ba7 100644 --- a/hosts/ward/default.nix +++ b/hosts/ward/default.nix @@ -22,7 +22,6 @@ boot = { initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci"]; kernelModules = ["kvm-intel"]; - tmpOnTmpfs = true; }; console = { diff --git a/modules/core/default.nix b/modules/core/default.nix index f5ea568..d01e371 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -19,19 +19,20 @@ in { ./xdg.nix ]; - boot.kernelParams = ["log_buf_len=10M"]; + boot = { + kernelParams = ["log_buf_len=10M"]; + tmpOnTmpfs = true; + }; environment.etc."nixos/configuration.nix".source = dummyConfig; # Disable sudo which is entierly unnecessary. security.sudo.enable = false; + # Setup to use Secrets rekey.hostPubkey = ../../secrets/pubkeys + "/${config.networking.hostName}.pub"; rekey.masterIdentities = [../../secrets/yk1-nix-rage.pub]; rekey.extraEncryptionPubkeys = [../../secrets/backup.pub]; - rekey.secrets.yolo.file = ./yolo.age; - environment.etc."YOLO".source = config.rekey.secrets.yolo.path; - home-manager = { useGlobalPkgs = true; useUserPackages = true; diff --git a/modules/core/yolo.age b/modules/core/yolo.age deleted file mode 100644 index dd7aaa0..0000000 --- a/modules/core/yolo.age +++ /dev/null @@ -1,7 +0,0 @@ -age-encryption.org/v1 --> X25519 saA0VOfRsGeQ7wIJ4SF80v3rvmf7rRbZcxTbRbWrRn4 -NNs7fIU09lYiKZ1R5KE3fJhHM1MlNxC7H6Cz2oAOyus --> piv-p256 xqSe8Q AgPVLX/r+nz6PWZFJW90BcPVU9kFrLV1PZge80Fyd0og -OGvcmxsXWqwxDOGUy9Slw7zEkgeiHblldbYw4UilPC0 ---- wi4PRgJNO6O1TgA3qobLX0wP14vreWRccvuR9wWNN+k -@RFJ[(IumLS¨|P&2v2(WI^R:p|Zty0ʁ?ivAۅ$ZZMLp i