From 062df5bbdcd925cd9f3c0c24310f5cd7d9c8f5e1 Mon Sep 17 00:00:00 2001 From: illustris Date: Fri, 30 Sep 2022 13:47:02 +0530 Subject: [PATCH] bump nixpkgs, enable scrub --- configuration.nix | 3 +++ flake.lock | 43 ++++++++++++++++++++++++++++++++++++++++--- flake.nix | 17 ++++++++++++++--- 3 files changed, 57 insertions(+), 6 deletions(-) diff --git a/configuration.nix b/configuration.nix index 4dbb6c0..fd512ee 100644 --- a/configuration.nix +++ b/configuration.nix @@ -157,6 +157,7 @@ in }; services = { + zfs.autoScrub.enable = true; openssh = { enable = true; forwardX11 = true; @@ -181,6 +182,8 @@ in docker = { enable = true; enableNvidia = true; + # extraOptions = "--storage-opt dm.basesize=20G"; + storageDriver = "zfs"; }; libvirtd.enable = true; }; diff --git a/flake.lock b/flake.lock index 79fcb44..3d37ab0 100644 --- a/flake.lock +++ b/flake.lock @@ -1,12 +1,33 @@ { "nodes": { + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils" + }, + "locked": { + "lastModified": 1663629861, + "narHash": "sha256-CjfQUyPfG/hkE4jnMcTvVJ0ubc84u8ySruZL+emXMjw=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "41790ba656bafc023f48ccdbbe7816d30fd52d76", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1662019588, - "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=", + "lastModified": 1663494472, + "narHash": "sha256-fSowlaoXXWcAM8m9wA6u+eTJJtvruYHMA+Lb/tFi/qM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2da64a81275b68fdad38af669afeda43d401e94b", + "rev": "f677051b8dc0b5e2a9348941c99eea8c4b0ff28f", "type": "github" }, "original": { @@ -18,8 +39,24 @@ }, "root": { "inputs": { + "home-manager": "home-manager", "nixpkgs": "nixpkgs" } + }, + "utils": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index a2bab43..eda83ac 100644 --- a/flake.nix +++ b/flake.nix @@ -1,13 +1,24 @@ { description = "A very basic flake"; - inputs.nixpkgs = { url = "github:nixos/nixpkgs/nixos-unstable"; }; + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + # nixpkgs1.url = "/home/illustris/src/nixpkgs"; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; - outputs = { self, nixpkgs }: { + outputs = { self, nixpkgs, home-manager, ... }: { nixosConfigurations = { desktop = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - modules = [ ./configuration.nix ]; + modules = [ + ./configuration.nix + home-manager.nixosModule + {nix.registry.np.flake = nixpkgs;} + ]; }; }; };