diff --git a/flake.nix b/flake.nix index e75a469..42da98f 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 a9fbf55..053fdac 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 7fdaf19..8dfaf0b 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 db2456b..fc15404 100644 --- a/system/server/nfs.nix +++ b/system/server/nfs.nix @@ -1,5 +1,4 @@ { - # NFS server services.nfs.server = { enable = true; exports = ''