diff --git a/README.md b/README.md deleted file mode 100644 index 5ad3d0c..0000000 --- a/README.md +++ /dev/null @@ -1,11 +0,0 @@ -```bash -❯ nix run github:numtide/nixos-anywhere -- --flake .#hostname root@hostname --no-reboot --tty -i $HOME/.ssh/id_ed25519 -... enter disk password -❯ ssh -t root@hostname systemd-cryptenroll /dev/luksdev --wipe-slot=tpm2 --tpm2-device=auto --tpm2-pcrs=1,15 -``` - -remote git flake -```bash -❯ sudo nixos-rebuild boot --refresh --flake git+https://git.hoyer.xyz/harald/nixcfg -``` - diff --git a/flake.nix b/flake.nix index 531fdd3..b2d1499 100644 --- a/flake.nix +++ b/flake.nix @@ -56,6 +56,10 @@ allowUnfree = true; }; + homes.users."harald@nix.fedora.fritz.box".modules = with inputs; [ + neovim-flake.homeManagerModules.default + ]; + homes.users."harald@sgx-nixos".modules = with inputs; [ neovim-flake.homeManagerModules.default ]; @@ -72,10 +76,6 @@ neovim-flake.homeManagerModules.default ]; - homes.users."harald@sgx-azure".modules = with inputs; [ - neovim-flake.homeManagerModules.default - ]; - # homes.modules = with inputs; [ # neovim-flake.homeManagerModules.default # ]; diff --git a/homes/x86_64-linux/harald@sgx-azure/default.nix b/homes/x86_64-linux/harald@nix.fedora.fritz.box/default.nix similarity index 84% rename from homes/x86_64-linux/harald@sgx-azure/default.nix rename to homes/x86_64-linux/harald@nix.fedora.fritz.box/default.nix index 1a22611..170ad4b 100644 --- a/homes/x86_64-linux/harald@sgx-azure/default.nix +++ b/homes/x86_64-linux/harald@nix.fedora.fritz.box/default.nix @@ -2,6 +2,8 @@ , pkgs , config , nixpkgs +, osConfig ? { } +, format ? "unknown" , ... }: { @@ -26,7 +28,10 @@ git.enable = true; direnv.enable = true; ssh.enable = true; + # jetbrains.enable = true; }; }; + + fonts.fontconfig.enable = true; } diff --git a/modules/home/tools/git/default.nix b/modules/home/tools/git/default.nix index 693487e..423f229 100644 --- a/modules/home/tools/git/default.nix +++ b/modules/home/tools/git/default.nix @@ -48,7 +48,7 @@ in pull.ff = "only"; core.pager = "${pkgs.delta}/bin/delta"; delta = { - features = "decorations"; + features = "decorations" ; syntax-theme = "Dracula"; light = "false"; navigate = "true"; diff --git a/modules/nixos/services/gui/default.nix b/modules/nixos/gui/default.nix similarity index 100% rename from modules/nixos/services/gui/default.nix rename to modules/nixos/gui/default.nix diff --git a/modules/nixos/services/base/default.nix b/modules/nixos/services/base/default.nix index d3d371c..10f1c14 100644 --- a/modules/nixos/services/base/default.nix +++ b/modules/nixos/services/base/default.nix @@ -58,7 +58,6 @@ in }; enableRedistributableFirmware = lib.mkDefault true; enableAllFirmware = true; - opengl.extraPackages = with pkgs; [ intel-compute-runtime ]; }; programs = { @@ -79,7 +78,6 @@ in # powerManagement.cpuFreqGovernor = "ondemand"; services = { - btrfs.autoScrub.enable = true; dbus.implementation = "broker"; dbus.packages = [ pkgs.gcr ]; fwupd.enable = true; @@ -129,7 +127,5 @@ in flake = "git+https://git.hoyer.xyz/harald/nixcfg"; }; - virtualisation.libvirtd.enable = true; - }; } diff --git a/systems/x86_64-linux/sgx/default.nix b/systems/x86_64-linux/sgx/default.nix index 6c15c83..3b6fced 100644 --- a/systems/x86_64-linux/sgx/default.nix +++ b/systems/x86_64-linux/sgx/default.nix @@ -4,8 +4,6 @@ with lib.plusultra; { imports = [ ./hardware-configuration.nix ]; - sops.secrets.pccs.sopsFile = ../../../.secrets/sgx/pccs.yaml; - plusultra = { base.enable = true; gui.enable = false; @@ -27,6 +25,10 @@ with lib.plusultra; security.tpm2.enable = false; security.tpm2.abrmd.enable = false; + sops.secrets.pccs = { + sopsFile = ../../../.secrets/sgx/pccs.yaml; # bring your own password file + }; + networking.wireless.enable = false; # Enables wireless support via wpa_supplicant. services.aesmd.enable = true;