From 71a33608d93729c5e654dafd863b84b87fe415fb Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Fri, 10 May 2024 22:34:37 -0600 Subject: [PATCH] fstab export mounts miniserver --- flake.lock | 92 -------------------- hosts/workstation/hardware-configuration.nix | 7 +- 2 files changed, 4 insertions(+), 95 deletions(-) diff --git a/flake.lock b/flake.lock index 1f85948..ce3ba0f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,38 +1,5 @@ { "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flakey-profile": { - "locked": { - "lastModified": 1712898590, - "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", - "owner": "lf-", - "repo": "flakey-profile", - "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", - "type": "github" - }, - "original": { - "owner": "lf-", - "repo": "flakey-profile", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -54,48 +21,6 @@ "type": "github" } }, - "lix": { - "flake": false, - "locked": { - "lastModified": 1714955862, - "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=", - "ref": "refs/tags/2.90-beta.1", - "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c", - "revCount": 15501, - "type": "git", - "url": "https://git@git.lix.systems/lix-project/lix" - }, - "original": { - "ref": "refs/tags/2.90-beta.1", - "type": "git", - "url": "https://git@git.lix.systems/lix-project/lix" - } - }, - "lix-module": { - "inputs": { - "flake-utils": "flake-utils", - "flakey-profile": "flakey-profile", - "lix": [ - "lix" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1715278311, - "narHash": "sha256-Z787hdZuwBhQCQOeOmln5j9cCKxDWql7tbF1ukKDFZU=", - "ref": "refs/heads/main", - "rev": "c8ab1e79ba0140bc75731c75177242089506260b", - "revCount": 75, - "type": "git", - "url": "https://git.lix.systems/lix-project/nixos-module" - }, - "original": { - "type": "git", - "url": "https://git.lix.systems/lix-project/nixos-module" - } - }, "nixpkgs": { "locked": { "lastModified": 1714272655, @@ -131,26 +56,9 @@ "root": { "inputs": { "home-manager": "home-manager", - "lix": "lix", - "lix-module": "lix-module", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/hosts/workstation/hardware-configuration.nix b/hosts/workstation/hardware-configuration.nix index 4f9024f..8e5c19e 100644 --- a/hosts/workstation/hardware-configuration.nix +++ b/hosts/workstation/hardware-configuration.nix @@ -17,6 +17,7 @@ }; }; boot = { + kernelPackages = pkgs.linuxPackages_zen; kernel.sysctl = { "vm.swappiness" = 80; "net.ipv6.conf.all.disable_ipv6" = 1; @@ -60,7 +61,7 @@ fileSystems = let nfsMount = nfsDisk: { - device = "server:/${nfsDisk}"; + device = "miniserver:/${nfsDisk}"; fsType = "nfs"; options = [ "x-systemd.automount" "noauto" "x-systemd.idle-timeout=600" ]; }; @@ -81,8 +82,8 @@ "/" = btrfsMount "nixos" // { }; "/home" = btrfsMount "home" // { }; "/mnt/games" = btrfsMount "games" // { }; - # "/mnt/pool" = nfsMount "pool" // { }; - # "/mnt/jawz" = nfsMount "jawz" // { }; + "/mnt/pool" = nfsMount "pool" // { }; + "/mnt/jawz" = nfsMount "jawz" // { }; # "/mnt/btrfs" = nfsMount "btrfs" // { }; "/boot" = { device = "/dev/disk/by-uuid/ac6d349a-96b9-499e-9009-229efd7743a5";