diff options
| -rw-r--r-- | flake.lock | 23 | ||||
| -rw-r--r-- | flake.nix | 21 | ||||
| -rw-r--r-- | hosts/profiles/nas.nix | 8 |
3 files changed, 44 insertions, 8 deletions
diff --git a/flake.lock b/flake.lock index 6a02041..812551c 100644 --- a/flake.lock +++ b/flake.lock @@ -56,6 +56,28 @@ "type": "github" } }, + "mytools": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1648397736, + "narHash": "sha256-G8jJQJxeYaZBWHQLduYLo0FahriR+DvtJW3YL0t8Q6A=", + "ref": "fcuny/nix", + "rev": "3ea9c82d551b6f1bf415ced29f572a6372f097d8", + "revCount": 51, + "type": "git", + "url": "https://git.fcuny.net/fcuny/tools.git" + }, + "original": { + "ref": "fcuny/nix", + "rev": "3ea9c82d551b6f1bf415ced29f572a6372f097d8", + "type": "git", + "url": "https://git.fcuny.net/fcuny/tools.git" + } + }, "nixpkgs": { "locked": { "lastModified": 1644266748, @@ -108,6 +130,7 @@ "agenix": "agenix", "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", + "mytools": "mytools", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", diff --git a/flake.nix b/flake.nix index 2e58b89..4dbdc8f 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,13 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + mytools = { + url = + "git+https://git.fcuny.net/fcuny/tools.git?ref=fcuny/nix&rev=3ea9c82d551b6f1bf415ced29f572a6372f097d8"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "utils"; + }; + nur.url = "github:nix-community/NUR"; home-manager = { @@ -28,8 +35,7 @@ # Output config, or config for NixOS system outputs = { ... }@inputs: - let - lib = import ./lib { inherit inputs; }; + let lib = import ./lib { inherit inputs; }; in { nixosConfigurations = { carmel = lib.mkSystem { @@ -69,12 +75,17 @@ let pkgs = import inputs.nixpkgs { inherit system; }; home-manager = inputs.home-manager.defaultPackage."${system}"; - in - { + in { packages = pkgs // { inherit home-manager; }; devShell = pkgs.mkShell { - buildInputs = with pkgs; [ nixUnstable nixfmt rnix-lsp home-manager git ]; + buildInputs = with pkgs; [ + nixUnstable + nixfmt + rnix-lsp + home-manager + git + ]; }; }); } diff --git a/hosts/profiles/nas.nix b/hosts/profiles/nas.nix index 10ba67c..314b405 100644 --- a/hosts/profiles/nas.nix +++ b/hosts/profiles/nas.nix @@ -1,6 +1,6 @@ -{ config, pkgs, lib, ... }: - -{ +{ inputs, config, pkgs, lib, ... }: +let music-organizer = inputs.mytools.music-organizer.${pkgs.system}; +in { imports = [ # other profiles ./server.nix @@ -14,6 +14,8 @@ ../common/server/rclone.nix ]; + environment.systemPackages = with pkgs; [ music-organizer ]; + users.groups.nas.gid = 5000; users.users.nas = { uid = 5000; |