From 6797962d5a2f89f20c1623f365dec937f21e9e3f Mon Sep 17 00:00:00 2001 From: jacekpoz Date: Fri, 14 Jul 2023 22:10:38 +0200 Subject: [PATCH] caddy trollface fix and add ragenix --- flake.lock | 190 ++++++++++++++++++++++++++++++++- flake.nix | 2 + homes/jacek/default.nix | 2 +- hosts/chmura/configuration.nix | 2 +- hosts/default.nix | 5 +- 5 files changed, 197 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 211a72f6..fb3d3612 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,27 @@ { "nodes": { + "agenix": { + "inputs": { + "darwin": "darwin", + "nixpkgs": [ + "ragenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1682101079, + "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=", + "owner": "ryantm", + "repo": "agenix", + "rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, "conduit": { "inputs": { "crane": "crane", @@ -50,6 +72,59 @@ "type": "github" } }, + "crane_2": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": [ + "ragenix", + "flake-utils" + ], + "nixpkgs": [ + "ragenix", + "nixpkgs" + ], + "rust-overlay": [ + "ragenix", + "rust-overlay" + ] + }, + "locked": { + "lastModified": 1681680516, + "narHash": "sha256-EB8Adaeg4zgcYDJn9sR6UMjN/OHdIiMMK19+3LmmXQY=", + "owner": "ipetkov", + "repo": "crane", + "rev": "54b63c8eae4c50172cb50b612946ff1d2bc1c75c", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "darwin": { + "inputs": { + "nixpkgs": [ + "ragenix", + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1673295039, + "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -88,6 +163,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -106,6 +197,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -277,13 +386,52 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1681920287, + "narHash": "sha256-+/d6XQQfhhXVfqfLROJoqj3TuG38CAeoT6jO1g9r1k0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "645bc49f34fa8eff95479f0345ff57e55b53437e", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "ragenix": { + "inputs": { + "agenix": "agenix", + "crane": "crane_2", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_4", + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1682237245, + "narHash": "sha256-xbBR7LNK+d5Yi/D6FXQGc1R6u2VV2nwr/Df5iaEbOEQ=", + "owner": "yaxitech", + "repo": "ragenix", + "rev": "281f68c3d477904f79ff1cd5807a8c226cd80a50", + "type": "github" + }, + "original": { + "owner": "yaxitech", + "repo": "ragenix", + "type": "github" + } + }, "root": { "inputs": { "conduit": "conduit", "home-manager": "home-manager", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_3", + "ragenix": "ragenix" } }, "rust-analyzer-src": { @@ -330,6 +478,31 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "flake-utils": [ + "ragenix", + "flake-utils" + ], + "nixpkgs": [ + "ragenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1682129965, + "narHash": "sha256-1KRPIorEL6pLpJR04FwAqqnt4Tzcm4MqD84yhlD+XSk=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "2c417c0460b788328220120c698630947547ee83", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -345,6 +518,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "wlroots": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 782a4451..39440fd5 100644 --- a/flake.nix +++ b/flake.nix @@ -26,5 +26,7 @@ url = "gitlab:famedly/conduit"; inputs.nixpkgs.follows = "nixpkgs"; }; + + ragenix.url = "github:yaxitech/ragenix"; }; } diff --git a/homes/jacek/default.nix b/homes/jacek/default.nix index 2695c797..0926c460 100644 --- a/homes/jacek/default.nix +++ b/homes/jacek/default.nix @@ -20,7 +20,7 @@ home = { username = "jacek"; - homeDirectory = "/home/jacek"; + homeDirectory = "/home/${config.home.username}"; packages = with pkgs; [ git librewolf-wayland diff --git a/hosts/chmura/configuration.nix b/hosts/chmura/configuration.nix index 626b9011..37920bfd 100644 --- a/hosts/chmura/configuration.nix +++ b/hosts/chmura/configuration.nix @@ -52,7 +52,7 @@ services.caddy = { enable = true; virtualHosts."trollface.pl".extraConfig = '' - reverse_proxy * /home/chmura/trollface + root * /home/chmura/trollface ''; }; diff --git a/hosts/default.nix b/hosts/default.nix index f3893b3b..8953849f 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -16,7 +16,6 @@ in { ./niks ] ++ [ - # this list includes an alias for the home-manager module, and another for the global home-manager configuration directory home-manager home-configs ]; @@ -27,6 +26,10 @@ in { modules = [ {networking.hostName = "chmura";} ./chmura + ] + ++ [ + home-manager + home-configs ]; }; }