diff options
| -rw-r--r-- | flake.lock | 88 | ||||
| -rw-r--r-- | flake.nix | 16 | ||||
| -rw-r--r-- | home/packages.nix | 6 |
3 files changed, 85 insertions, 25 deletions
@@ -12,6 +12,28 @@ "type": "path" } }, + "deploy-rs": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils" + }, + "locked": { + "lastModified": 1642113498, + "narHash": "sha256-4tNIt2EGDppYQI06gsid0QKW5dtBEOAiNKfMYC8wxv8=", + "owner": "serokell", + "repo": "deploy-rs", + "rev": "0ac333cdc03407538b5b19d60a8e7c64588490fb", + "type": "github" + }, + "original": { + "owner": "serokell", + "repo": "deploy-rs", + "type": "github" + } + }, "feeds": { "flake": false, "locked": { @@ -24,6 +46,22 @@ "type": "path" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1627913399, + "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -47,7 +85,9 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1639947939, @@ -65,16 +105,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1642069818, - "narHash": "sha256-666w6j8wl/bojfgpp0k58/UJ5rbrdYFbI2RFT2BXbSQ=", + "lastModified": 1641982078, + "narHash": "sha256-QmJNdGPWYzxYXTf23N26dAkvwNkBBA5SqCdz6hn4HpU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46821ea01c8f54d2a20f5a503809abfc605269d7", + "rev": "6e3482858da95eca9e8fb5796ac72e14ada9e254", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "backport-154729-to-release-21.11", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-unstable": { @@ -93,22 +135,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1641982078, - "narHash": "sha256-QmJNdGPWYzxYXTf23N26dAkvwNkBBA5SqCdz6hn4HpU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6e3482858da95eca9e8fb5796ac72e14ada9e254", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "backport-154729-to-release-21.11", - "repo": "nixpkgs", - "type": "github" - } - }, "playground": { "flake": false, "locked": { @@ -128,10 +154,11 @@ "root": { "inputs": { "blog": "blog", + "deploy-rs": "deploy-rs", "feeds": "feeds", "home-manager": "home-manager", "naersk": "naersk", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "playground": "playground", "sfz": "sfz", @@ -188,6 +215,21 @@ "type": "git", "url": "https://stuebinm.eu/git/uplcg" } + }, + "utils": { + "locked": { + "lastModified": 1631561581, + "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", @@ -23,13 +23,17 @@ playground.url = "git+https://stuebinm.eu/git/playground"; playground.flake = false; naersk.url = "github:nix-community/naersk"; + naersk.inputs.nixpkgs.follows = "nixpkgs"; sfz.url = "github:weihanglo/sfz"; sfz.flake = false; feeds.url = "path:/home/stuebinm/newsboat-feeds-private.nix"; feeds.flake = false; + + deploy-rs.url = "github:serokell/deploy-rs"; + deploy-rs.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, nixpkgs, ... }@inputs: + outputs = { self, nixpkgs, deploy-rs, ... }@inputs: let mkConfig = imports: config: nixpkgs.lib.nixosSystem { @@ -49,6 +53,16 @@ cyberbox = mkDesktop ./cyberbox/configuration.nix; }; + + deploy.nodes.chaski.profiles.system = { + user = "root"; + sshUser = "root"; + path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.chaski; + }; + deploy.nodes.chaski.hostname = "chaski"; + + checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib; + homeConfigurations.stuebinm = inputs.home-manager.lib.homeManagerConfiguration rec { system = "x86_64-linux"; diff --git a/home/packages.nix b/home/packages.nix index 55036d8..993d055 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -4,6 +4,10 @@ let naersk = pkgs.callPackage inputs.naersk {}; extras = { sfz = naersk.buildPackage inputs.sfz; + leylines = pkgs.callPackage "${(pkgs.fetchgit { + url = "https://gitlab.infra4future.de/stuebinm/leylines"; + sha256 = "sha256-592tRsEVUsAR7V4pPQ1s6nnDlheTTEAasZJjqwRCwto="; + }).outPath}/package.nix" {}; }; in { @@ -40,7 +44,7 @@ in tree dnsutils inetutils pijul bat age libsecret gping bottom dogdns cifs-utils jekyll fzf ripgrep fd bandwhich exa dive ripgrep python39Packages.isort shellcheck graphviz - poppler unzip acpi extras.sfz + poppler unzip acpi extras.sfz viu extras.leylines youtube-dl # git gitAndTools.gitAnnex git-bug git-appraise |