diff --git a/flake.nix b/flake.nix index 073e75a..c196e1d 100755 --- a/flake.nix +++ b/flake.nix @@ -113,6 +113,7 @@ }; outputs = { self, nixpkgs, disko, sops-nix, musnix, nixos-generators, + ## Disabled outputs - part of 'flakeification': enable and use correctly. #lix, lix-module, flake-utils, flake-parts, #nix-colors, home-manager, nixvim, ... } @@ -122,7 +123,10 @@ inherit (self) outputs; - username = "serenity"; + primaryUser = "serenity"; # used for admin purposes + #flakePath = "/home/${primaryUser}/SerenityOS/"; # for v1.0.0 release + flakePath = "/home/${primaryUser}/flakes/nixdots/"; # current path + disksPath = "/home/${primaryUser}/Disks/"; in { @@ -143,7 +147,7 @@ hades = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs outputs; - inherit username; + inherit primaryUser flakePath disksPath; }; modules = [ musnix.nixosModules.musnix diff --git a/home/scripts/automount/default.nix b/home/scripts/automount/default.nix index 6e9590f..fe92837 100755 --- a/home/scripts/automount/default.nix +++ b/home/scripts/automount/default.nix @@ -6,22 +6,46 @@ { - ## need option for `zfs set mountpoint=/myspecialfolder mypool` + # need option for `zfs set mountpoint=/myspecialfolder mypool` + + home = { + + ## Directories to copy to /home/${username/} + file = { + + ## Path to automount disks to + "Disks" = { + source = ../automount/Disks; + recursive = true; + }; + ## (current) Flake path + "flakes/nixdots" = { + source = ../../../../nixdots; + recursive = true; + }; + ## (future) Flake path + "SerenityOS" = { + source = ../../../../nixdots; + recursive = true; + }; + + }; - home.file."Disks" = { - source = ../automount/Disks; - recursive = true; }; + ## Related services services = { + + ## Udiskie udiskie = { enable = true; - automount = true; + automount = true; # automounts new disks tray = "always"; - notify = true; + notify = true; # enables the tray applet #settings = { #}; }; + }; }