From 812e8d8525098d189eba67009053c1d5a6598423 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Sat, 28 Sep 2024 03:32:34 -0400 Subject: [PATCH 1/2] Fix typo --- system/services/qemukvm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/services/qemukvm.nix b/system/services/qemukvm.nix index a33ccb2a..f50caa92 100644 --- a/system/services/qemukvm.nix +++ b/system/services/qemukvm.nix @@ -28,8 +28,8 @@ # Needed to make NAT work networking.firewall.trustedInterfaces = [ - virbr0 - virbr1 + "virbr0" + "virbr1" ]; # Allow Looking-Glass permissions From dfcd383c50f207b1c8a150aa2d4365a814f7fb2b Mon Sep 17 00:00:00 2001 From: Jimbo Date: Sun, 29 Sep 2024 22:17:21 -0400 Subject: [PATCH 2/2] Simplify home.nix --- flake.nix | 2 +- home/home.nix | 10 +--------- system/hardware/machines/desktop.nix | 5 ----- system/server/nfs.nix | 1 - 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/flake.nix b/flake.nix index e75a469a..42da98ff 100644 --- a/flake.nix +++ b/flake.nix @@ -50,7 +50,7 @@ look = import ./extras/look.nix; ws = import ./extras/workspaces.nix; - # NixOS configuration entrypointm use 'nixos-rebuild --flake .#your-hostname' + # NixOS configuration entrypoint, use 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = { JimDesktop = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; diff --git a/home/home.nix b/home/home.nix index a9fbf558..053fdac3 100644 --- a/home/home.nix +++ b/home/home.nix @@ -14,21 +14,13 @@ ]; nixpkgs = { - # You can add overlays here + config.allowUnfree = true; overlays = [ - # Add overlays your own flake exports (from overlays and pkgs dir): outputs.overlays.additions outputs.overlays.selfsuper outputs.overlays.finalprev inputs.blender-bin.overlays.default ]; - # Configure your nixpkgs instance - config = { - # Disable if you don't want unfree packages - allowUnfree = true; - # Workaround for https://github.com/nix-community/home-manager/issues/2942 - allowUnfreePredicate = _: true; - }; }; # Common programs I'll need everywhere diff --git a/system/hardware/machines/desktop.nix b/system/hardware/machines/desktop.nix index 7fdaf193..8dfaf0bb 100644 --- a/system/hardware/machines/desktop.nix +++ b/system/hardware/machines/desktop.nix @@ -98,11 +98,6 @@ in { fsType = "nfs4"; options = ["x-systemd.automount" "_netdev" "nofail" "noauto"]; }; - "/home/jimbo/FreecornNFS" = { - device = "${outputs.secrets.cornIP}:/export/freecornNFS"; - fsType = "nfs4"; - options = ["x-systemd.automount" "_netdev" "nofail" "noauto"]; - }; }; # Set the swap partition diff --git a/system/server/nfs.nix b/system/server/nfs.nix index db2456b4..fc15404f 100644 --- a/system/server/nfs.nix +++ b/system/server/nfs.nix @@ -1,5 +1,4 @@ { - # NFS server services.nfs.server = { enable = true; exports = ''