From 70976c79a6783e4ce32d808f094b21c6400929ff Mon Sep 17 00:00:00 2001 From: Nickiel12 Date: Fri, 25 Aug 2023 20:26:33 -0700 Subject: [PATCH] added nicks_nextcloud_integrations --- flake.lock | 223 +++++++++--------- flake.nix | 3 + hosts/Alaska/default.nix | 1 + .../modules/nicks_nextcould_integrations.nix | 8 + 4 files changed, 117 insertions(+), 118 deletions(-) create mode 100644 hosts/Alaska/modules/nicks_nextcould_integrations.nix diff --git a/flake.lock b/flake.lock index 2eb72a7..19bc3e9 100644 --- a/flake.lock +++ b/flake.lock @@ -23,22 +23,6 @@ "type": "github" } }, - "blobs": { - "flake": false, - "locked": { - "lastModified": 1604995301, - "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=", - "owner": "simple-nixos-mailserver", - "repo": "blobs", - "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265", - "type": "gitlab" - }, - "original": { - "owner": "simple-nixos-mailserver", - "repo": "blobs", - "type": "gitlab" - } - }, "flake-compat": { "flake": false, "locked": { @@ -55,26 +39,28 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" }, + "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" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { "lastModified": 1689068808, "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", @@ -89,9 +75,9 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1685518550, @@ -169,6 +155,25 @@ "type": "github" } }, + "nicks_nextcloud_integrations": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1693019487, + "narHash": "sha256-YC4HcSlFITrhV4HWDds1r3UPs3LuceYrpeBOPZLPI74=", + "ref": "refs/heads/main", + "rev": "a50efdeea06990eecdaa65ce4ef02f553cea1807", + "revCount": 8, + "type": "git", + "url": "https://git.nickiel.net/Nickiel/nicks_nextcloud_integrations.git" + }, + "original": { + "type": "git", + "url": "https://git.nickiel.net/Nickiel/nicks_nextcloud_integrations.git" + } + }, "nixpkgs": { "locked": { "lastModified": 1653326962, @@ -185,36 +190,6 @@ "type": "github" } }, - "nixpkgs-22_11": { - "locked": { - "lastModified": 1669558522, - "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-22.11", - "type": "indirect" - } - }, - "nixpkgs-23_05": { - "locked": { - "lastModified": 1684782344, - "narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8966c43feba2c701ed624302b6a935f97bcbdf88", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.05", - "type": "indirect" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1685801374, @@ -232,6 +207,38 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1692447944, + "narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d680ded26da5cf104dd2735a51e88d2d8f487b4d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1681358109, + "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1692447944, "narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=", @@ -247,7 +254,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_5": { "locked": { "lastModified": 1691990649, "narHash": "sha256-gMbKOiX1HwClRP9lADaaV/lnZr93NEaOFe4ApDx/zd8=", @@ -263,26 +270,11 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1670751203, - "narHash": "sha256-XdoH1v3shKDGlrwjgrNX/EN8s3c+kQV7xY6cLCE8vcI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "64e0bf055f9d25928c31fb12924e59ff8ce71e60", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "nixvim": { "inputs": { "beautysh": "beautysh", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_5", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { @@ -329,7 +321,7 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "gitignore": "gitignore", "nixpkgs": [ "nixvim", @@ -355,33 +347,28 @@ "inputs": { "home-manager": "home-manager", "kmonad": "kmonad", - "nixpkgs": "nixpkgs_2", - "nixvim": "nixvim", - "simple-nixos-mailserver": "simple-nixos-mailserver" + "nicks_nextcloud_integrations": "nicks_nextcloud_integrations", + "nixpkgs": "nixpkgs_4", + "nixvim": "nixvim" } }, - "simple-nixos-mailserver": { + "rust-overlay": { "inputs": { - "blobs": "blobs", - "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_4", - "nixpkgs-22_11": "nixpkgs-22_11", - "nixpkgs-23_05": "nixpkgs-23_05", - "utils": "utils_2" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1689976554, - "narHash": "sha256-uWJq3sIhkqfzPmfB2RWd5XFVooGFfSuJH9ER/r302xQ=", - "owner": "simple-nixos-mailserver", - "repo": "nixos-mailserver", - "rev": "c63f6e7b053c18325194ff0e274dba44e8d2271e", - "type": "gitlab" + "lastModified": 1692497375, + "narHash": "sha256-50w6YzSA+0utDmBY0TPndRGYypBbJrKQHlOFGedo70I=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "41ea15ff958038712f108332d68f32745af9dd35", + "type": "github" }, "original": { - "owner": "simple-nixos-mailserver", - "ref": "master", - "repo": "nixos-mailserver", - "type": "gitlab" + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" } }, "systems": { @@ -414,6 +401,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1678901627, @@ -428,21 +430,6 @@ "repo": "flake-utils", "type": "github" } - }, - "utils_2": { - "locked": { - "lastModified": 1605370193, - "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5021eac20303a61fafe17224c087f5519baed54d", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 8906b8b..7cae362 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,8 @@ nixvim.url = "github:nix-community/nixvim"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; kmonad.url = "github:kmonad/kmonad?dir=nix"; + nicks_nextcloud_integrations.url = "git+https://git.nickiel.net/Nickiel/nicks_nextcloud_integrations.git"; + # dead code? home-manager = { url = github:nix-community/home-manager; @@ -34,6 +36,7 @@ specialArgs = { inherit user; }; modules = [ + inputs.nicks_nextcloud_integrations.nixosModules.default { networking.hostName = "Alaska"; } diff --git a/hosts/Alaska/default.nix b/hosts/Alaska/default.nix index 268b996..adfb88d 100644 --- a/hosts/Alaska/default.nix +++ b/hosts/Alaska/default.nix @@ -8,6 +8,7 @@ (import ./modules/forgejo.nix) (import ./modules/nginx.nix) (import ./modules/nextcloud.nix) + (import ./modules/nicks_nextcould_integrations.nix) (import ./modules/msmtp.nix) (import ./modules/headscale.nix) (import ./modules/tailscale.nix) diff --git a/hosts/Alaska/modules/nicks_nextcould_integrations.nix b/hosts/Alaska/modules/nicks_nextcould_integrations.nix new file mode 100644 index 0000000..b6886b4 --- /dev/null +++ b/hosts/Alaska/modules/nicks_nextcould_integrations.nix @@ -0,0 +1,8 @@ +{ config, lib, pkgs, inputs, ... }: + +{ + services.status_cloud = { + enable = true; + config_path = "/home/nixolas/nextcloud_integrations.toml"; + }; +}