diff --git a/flake.lock b/flake.lock index 32af657..7de34c8 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,17 @@ "agenix": { "inputs": { "darwin": "darwin", + "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1682101079, - "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=", + "lastModified": 1684153753, + "narHash": "sha256-PVbWt3qrjYAK+T5KplFcO+h7aZWfEj1UtyoKlvcDxh0=", "owner": "ryantm", "repo": "agenix", - "rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447", + "rev": "db5637d10f797bb251b94ef9040b237f4702cde3", "type": "github" }, "original": { @@ -84,11 +85,11 @@ ] }, "locked": { - "lastModified": 1683052812, - "narHash": "sha256-GcIjNKHHn9zHg/JetcxiEKNLF7c2gS2RLbdNfKVLxlI=", + "lastModified": 1684257455, + "narHash": "sha256-lYQ8uYP6ZR+hBmKxt8DHPAdCdlF44eK6gsBzFZgJNhE=", "owner": "tailscale", "repo": "golink", - "rev": "3ec5bd96933e42ceae6ab6a9a0e4bf2ccb716e23", + "rev": "a762273463270325834af3f498cb7917ae7a559f", "type": "github" }, "original": { @@ -100,15 +101,36 @@ "home-manager": { "inputs": { "nixpkgs": [ + "agenix", "nixpkgs" ] }, "locked": { - "lastModified": 1683196088, - "narHash": "sha256-MO4i1ceO2WqwyEn/iggDyMOWMVUb0oIicRpfY4MgNko=", + "lastModified": 1682203081, + "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", "owner": "nix-community", "repo": "home-manager", - "rev": "6abb775e75a7f25451781dc704cfe03f27ad7496", + "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1684824189, + "narHash": "sha256-k3nCkn5Qy67rCguuw6YkGuL6hOUNRKxQoKOjnapk5sU=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "58eb968c21d309a6c2b020ea8d64e25c38ceebba", "type": "github" }, "original": { @@ -126,11 +148,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1683143433, - "narHash": "sha256-nTSYUkhE7M9l9lKlbBQ6HWOmsf4OTtV0VcJzyx/FrTk=", + "lastModified": 1684844798, + "narHash": "sha256-ZrMXFoEA535jOZ+eDA3s+URZ5MkVRksBgL5qGnb6Ciw=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "da093a8aec7d3e5030f7ef4b0813f1d8160f47f5", + "rev": "eb1f832fcec5838053c6b031b656e4f949ada57b", "type": "github" }, "original": { @@ -200,11 +222,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1683014792, - "narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=", + "lastModified": 1684754342, + "narHash": "sha256-plGnjnbnPLoZCTdQX21oT7xliQhFtgcWlkuDHgtEb1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42", + "rev": "7084250df3d7f9735087d3234407f3c1fc2400e3", "type": "github" }, "original": { @@ -217,7 +239,7 @@ "inputs": { "agenix": "agenix", "golink": "golink", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "hyprland": "hyprland", "i3utils": "i3utils", "nixpkgs": "nixpkgs_2" diff --git a/hosts/bigding/configuration.nix b/hosts/bigding/configuration.nix index 02465fd..6bae5c0 100644 --- a/hosts/bigding/configuration.nix +++ b/hosts/bigding/configuration.nix @@ -19,7 +19,6 @@ # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; - boot.loader.grub.version = 2; boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only networking = { @@ -34,7 +33,7 @@ }; services.syncthing = { - extraOptions = { + settings = { gui = { insecureSkipHostcheck = true; }; diff --git a/modules/gitea/default.nix b/modules/gitea/default.nix index 2eeff42..1baf724 100644 --- a/modules/gitea/default.nix +++ b/modules/gitea/default.nix @@ -9,10 +9,12 @@ database = { type = "sqlite3"; }; - httpPort = 3030; - domain = "git.broccoli.town"; - rootUrl = "https://git.broccoli.town/"; settings = { + server = { + ROOT_URL = "https://git.broccoli.town/"; + HTTP_PORT = 3030; + DOMAIN = "git.broccoli.town"; + }; service = { DISABLE_REGISTRATION = true; ENABLE_PUSH_CREATE_USER = true;