From 4b530a1cb185948d540a140798ef92225f66b5d8 Mon Sep 17 00:00:00 2001 From: Xe Date: Sun, 26 Dec 2021 12:01:31 -0500 Subject: [PATCH] import printerfacts Signed-off-by: Xe --- common/default.nix | 26 +++++++++++- flake.lock | 102 ++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 8 +++- 3 files changed, 132 insertions(+), 4 deletions(-) diff --git a/common/default.nix b/common/default.nix index 723010f..a023657 100644 --- a/common/default.nix +++ b/common/default.nix @@ -4,7 +4,14 @@ boot.cleanTmpDir = true; boot.kernelModules = [ "wireguard" ]; - environment.systemPackages = with pkgs; [ age minisign tmate jq nfs-utils git ]; + environment.systemPackages = with pkgs; [ + age + minisign + tmate + jq + nfs-utils + git + ]; nix = { autoOptimiseStore = true; @@ -41,4 +48,21 @@ enable = true; dnssec = "false"; }; + + users.groups.within = { }; + systemd.services.within-homedir-setup = { + description = "Creates homedirs for /srv/within services"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig.Type = "oneshot"; + + script = with pkgs; '' + ${coreutils}/bin/mkdir -p /srv/within + ${coreutils}/bin/chown root:within /srv/within + ${coreutils}/bin/chmod 775 /srv/within + ${coreutils}/bin/mkdir -p /srv/within/run + ${coreutils}/bin/chown root:within /srv/within/run + ${coreutils}/bin/chmod 770 /srv/within/run + ''; + }; } diff --git a/flake.lock b/flake.lock index e0ba747..d8ebb4a 100644 --- a/flake.lock +++ b/flake.lock @@ -54,6 +54,21 @@ "type": "github" } }, + "flake-utils": { + "locked": { + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": "nixpkgs_3" @@ -72,6 +87,24 @@ "type": "github" } }, + "naersk": { + "inputs": { + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1639947939, + "narHash": "sha256-pGsM8haJadVP80GFq4xhnSpNitYNQpaXk4cnA796Cso=", + "owner": "nix-community", + "repo": "naersk", + "rev": "2fc8ce9d3c025d59fee349c1f80be9785049d653", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1618628710, @@ -131,13 +164,42 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1640418986, + "narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1640418986, + "narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "root": { "inputs": { "agenix": "agenix", "deploy-rs": "deploy-rs", "home-manager": "home-manager", "nixpkgs": "nixpkgs_4", - "utils": "utils_2" + "utils": "utils_2", + "xe-printerfacts": "xe-printerfacts" } }, "utils": { @@ -169,6 +231,44 @@ "repo": "flake-utils", "type": "github" } + }, + "xe-printerfacts": { + "inputs": { + "flake-utils": "flake-utils", + "naersk": "naersk", + "nixpkgs": "nixpkgs_6", + "xess": "xess" + }, + "locked": { + "lastModified": 1640537740, + "narHash": "sha256-lDUP2f67O3QEtZAJ6A7wrzyQJTqPojz7GMId/ae743g=", + "ref": "main", + "rev": "74ee429392f1be09e831f0ec750967b8c4021131", + "revCount": 44, + "type": "git", + "url": "https://tulpa.dev/cadey/printerfacts.git" + }, + "original": { + "ref": "main", + "type": "git", + "url": "https://tulpa.dev/cadey/printerfacts.git" + } + }, + "xess": { + "flake": false, + "locked": { + "lastModified": 1637634344, + "narHash": "sha256-63zWhmRpppLzh+H70gHSViHfZ4JvtnOFDRrrjkXtzJE=", + "owner": "Xe", + "repo": "Xess", + "rev": "f9ffc529fca9751afdce2408089c51e73d56fce8", + "type": "github" + }, + "original": { + "owner": "Xe", + "repo": "Xess", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index bdfaf4b..1c24d9b 100644 --- a/flake.nix +++ b/flake.nix @@ -7,17 +7,21 @@ home-manager.url = "github:nix-community/home-manager"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; utils.url = "github:numtide/flake-utils"; + + # my apps + xe-printerfacts.url = "git+https://tulpa.dev/cadey/printerfacts.git?ref=main"; }; - outputs = { self, nixpkgs, deploy-rs, home-manager, agenix, ... }: + outputs = { self, nixpkgs, deploy-rs, home-manager, agenix, xe-printerfacts, ... }: let pkgs = nixpkgs.legacyPackages."x86_64-linux"; mkSystem = extraModules: - nixpkgs.lib.nixosSystem { + nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; modules = [ agenix.nixosModules.age home-manager.nixosModules.home-manager + xe-printerfacts.nixosModules."${system}".printerfacts ({ config, ... }: { system.configurationRevision = self.sourceInfo.rev; services.getty.greetingLine =