diff --git a/flake.nix b/flake.nix index 42da98ff..e75a469a 100644 --- a/flake.nix +++ b/flake.nix @@ -50,7 +50,7 @@ look = import ./extras/look.nix; ws = import ./extras/workspaces.nix; - # NixOS configuration entrypoint, use 'nixos-rebuild --flake .#your-hostname' + # NixOS configuration entrypointm 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 053fdac3..a9fbf558 100644 --- a/home/home.nix +++ b/home/home.nix @@ -14,13 +14,21 @@ ]; nixpkgs = { - config.allowUnfree = true; + # You can add overlays here 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 8dfaf0bb..7fdaf193 100644 --- a/system/hardware/machines/desktop.nix +++ b/system/hardware/machines/desktop.nix @@ -98,6 +98,11 @@ 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 fc15404f..db2456b4 100644 --- a/system/server/nfs.nix +++ b/system/server/nfs.nix @@ -1,4 +1,5 @@ { + # NFS server services.nfs.server = { enable = true; exports = '' diff --git a/system/services/qemukvm.nix b/system/services/qemukvm.nix index f50caa92..a33ccb2a 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