Compare commits
	
		
			1 Commits
		
	
	
		
			nom
			...
			deploy-doo
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 7e7b576540 | 
							
								
								
									
										20
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										20
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							@@ -207,6 +207,25 @@
 | 
				
			|||||||
        "url": "https://git.pvv.ntnu.no/Projects/calendar-bot.git"
 | 
					        "url": "https://git.pvv.ntnu.no/Projects/calendar-bot.git"
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 | 
					    "pvv-doorbell-bot": {
 | 
				
			||||||
 | 
					      "inputs": {
 | 
				
			||||||
 | 
					        "nixpkgs": [
 | 
				
			||||||
 | 
					          "nixpkgs"
 | 
				
			||||||
 | 
					        ]
 | 
				
			||||||
 | 
					      },
 | 
				
			||||||
 | 
					      "locked": {
 | 
				
			||||||
 | 
					        "dirtyRev": "cec320746bbf5b5bc6618a145c1a997ebd0b5196-dirty",
 | 
				
			||||||
 | 
					        "dirtyShortRev": "cec3207-dirty",
 | 
				
			||||||
 | 
					        "lastModified": 1724515328,
 | 
				
			||||||
 | 
					        "narHash": "sha256-Vj3ZJkCaLq+6d1LJtl7Hg5f7XV4NDPeNC1xEyu9QkOI=",
 | 
				
			||||||
 | 
					        "type": "git",
 | 
				
			||||||
 | 
					        "url": "file:///home/felixalb/doorbell-matrix-bot"
 | 
				
			||||||
 | 
					      },
 | 
				
			||||||
 | 
					      "original": {
 | 
				
			||||||
 | 
					        "type": "git",
 | 
				
			||||||
 | 
					        "url": "file:///home/felixalb/doorbell-matrix-bot"
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
    "pvv-nettsiden": {
 | 
					    "pvv-nettsiden": {
 | 
				
			||||||
      "inputs": {
 | 
					      "inputs": {
 | 
				
			||||||
        "nixpkgs": [
 | 
					        "nixpkgs": [
 | 
				
			||||||
@@ -237,6 +256,7 @@
 | 
				
			|||||||
        "nixpkgs": "nixpkgs",
 | 
					        "nixpkgs": "nixpkgs",
 | 
				
			||||||
        "nixpkgs-unstable": "nixpkgs-unstable",
 | 
					        "nixpkgs-unstable": "nixpkgs-unstable",
 | 
				
			||||||
        "pvv-calendar-bot": "pvv-calendar-bot",
 | 
					        "pvv-calendar-bot": "pvv-calendar-bot",
 | 
				
			||||||
 | 
					        "pvv-doorbell-bot": "pvv-doorbell-bot",
 | 
				
			||||||
        "pvv-nettsiden": "pvv-nettsiden",
 | 
					        "pvv-nettsiden": "pvv-nettsiden",
 | 
				
			||||||
        "sops-nix": "sops-nix"
 | 
					        "sops-nix": "sops-nix"
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,6 +17,10 @@
 | 
				
			|||||||
    pvv-calendar-bot.url = "git+https://git.pvv.ntnu.no/Projects/calendar-bot.git";
 | 
					    pvv-calendar-bot.url = "git+https://git.pvv.ntnu.no/Projects/calendar-bot.git";
 | 
				
			||||||
    pvv-calendar-bot.inputs.nixpkgs.follows = "nixpkgs";
 | 
					    pvv-calendar-bot.inputs.nixpkgs.follows = "nixpkgs";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    pvv-doorbell-bot.url = "git+https://git.pvv.ntnu.no/Projects/doorbell-matrix-bot.git";
 | 
				
			||||||
 | 
					    #pvv-doorbell-bot.url = "git+file:///home/felixalb/doorbell-matrix-bot";
 | 
				
			||||||
 | 
					    pvv-doorbell-bot.inputs.nixpkgs.follows = "nixpkgs";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    matrix-next.url = "github:dali99/nixos-matrix-modules/v0.6.0";
 | 
					    matrix-next.url = "github:dali99/nixos-matrix-modules/v0.6.0";
 | 
				
			||||||
    matrix-next.inputs.nixpkgs.follows = "nixpkgs";
 | 
					    matrix-next.inputs.nixpkgs.follows = "nixpkgs";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -81,9 +85,11 @@
 | 
				
			|||||||
        modules = [
 | 
					        modules = [
 | 
				
			||||||
          inputs.matrix-next.nixosModules.default
 | 
					          inputs.matrix-next.nixosModules.default
 | 
				
			||||||
          inputs.pvv-calendar-bot.nixosModules.default
 | 
					          inputs.pvv-calendar-bot.nixosModules.default
 | 
				
			||||||
 | 
					          inputs.pvv-doorbell-bot.nixosModules.default
 | 
				
			||||||
        ];
 | 
					        ];
 | 
				
			||||||
        overlays = [
 | 
					        overlays = [
 | 
				
			||||||
          inputs.pvv-calendar-bot.overlays.x86_64-linux.default
 | 
					          inputs.pvv-calendar-bot.overlays.x86_64-linux.default
 | 
				
			||||||
 | 
					          inputs.pvv-doorbell-bot.overlays.x86_64-linux.default
 | 
				
			||||||
        ];
 | 
					        ];
 | 
				
			||||||
      };
 | 
					      };
 | 
				
			||||||
      bekkalokk = stableNixosConfig "bekkalokk" {
 | 
					      bekkalokk = stableNixosConfig "bekkalokk" {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,10 +9,11 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    ./acmeCert.nix
 | 
					    ./acmeCert.nix
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ./services/calendar-bot.nix
 | 
				
			||||||
 | 
					    ./services/doorbell-bot.nix
 | 
				
			||||||
 | 
					    ./services/mysql.nix
 | 
				
			||||||
    ./services/mysql.nix
 | 
					    ./services/mysql.nix
 | 
				
			||||||
    ./services/postgres.nix
 | 
					    ./services/postgres.nix
 | 
				
			||||||
    ./services/mysql.nix
 | 
					 | 
				
			||||||
    ./services/calendar-bot.nix
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ./services/matrix
 | 
					    ./services/matrix
 | 
				
			||||||
  ];
 | 
					  ];
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										16
									
								
								hosts/bicep/services/doorbell-bot.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								hosts/bicep/services/doorbell-bot.nix
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,16 @@
 | 
				
			|||||||
 | 
					{ config, lib, pkgs, ... }:
 | 
				
			||||||
 | 
					let
 | 
				
			||||||
 | 
					  cfg = config.services.pvv-doorbell-bot;
 | 
				
			||||||
 | 
					in {
 | 
				
			||||||
 | 
					  sops.secrets."doorbell-bot/config-json" = {
 | 
				
			||||||
 | 
					    owner = cfg.user;
 | 
				
			||||||
 | 
					    group = cfg.group;
 | 
				
			||||||
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  services.pvv-doorbell-bot = {
 | 
				
			||||||
 | 
					    enable = true;
 | 
				
			||||||
 | 
					    settings = {
 | 
				
			||||||
 | 
					      configFile = config.sops.secrets."doorbell-bot/config-json".path;
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
 | 
					  };
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -1,6 +1,8 @@
 | 
				
			|||||||
calendar-bot:
 | 
					calendar-bot:
 | 
				
			||||||
    matrix_token: ENC[AES256_GCM,data:zJv9sw6pEzb9hxKT682wsD87HC9iejbps2wl2Z5QW1XZUSBHdcqyg1pxd+jFKTeKGQ==,iv:zDbvF1H98NsECjCtGXS+Y9HIhXowzz9HF9mltqnArog=,tag:/ftcOSQ13ElkVJBxYIMUGQ==,type:str]
 | 
					    matrix_token: ENC[AES256_GCM,data:zJv9sw6pEzb9hxKT682wsD87HC9iejbps2wl2Z5QW1XZUSBHdcqyg1pxd+jFKTeKGQ==,iv:zDbvF1H98NsECjCtGXS+Y9HIhXowzz9HF9mltqnArog=,tag:/ftcOSQ13ElkVJBxYIMUGQ==,type:str]
 | 
				
			||||||
    mysql_password: ENC[AES256_GCM,data:Gqag8yOgPH3ntoT5TmaqJWv1j+si2qIyz5Ryfw5E2A==,iv:kQDcxnPfwJQcFovI4f87UDt18F8ah3z5xeY86KmdCyY=,tag:A1sCSNXJziAmtUWohqwJgg==,type:str]
 | 
					    mysql_password: ENC[AES256_GCM,data:Gqag8yOgPH3ntoT5TmaqJWv1j+si2qIyz5Ryfw5E2A==,iv:kQDcxnPfwJQcFovI4f87UDt18F8ah3z5xeY86KmdCyY=,tag:A1sCSNXJziAmtUWohqwJgg==,type:str]
 | 
				
			||||||
 | 
					doorbell-bot:
 | 
				
			||||||
 | 
					    config-json: ENC[AES256_GCM,data:QNFHiUqaBWfW9ZRAkZo9M18AMbn/oSxvEMq1N1NsDcBjxJMo/OE36fz1Uf4TagGccCDkWy56wSVSFZm8KZnXVaQ/X0EgJkUK1JZyR7i5yiEW8ByLaVzThMWBwxQoj2cz48z53krzfddyl250rLFQRa7Fco74yTFfBWruf/1clN5O/iHFspeW7uJtQh/oyFIVb87YisjKU2+jpU3IeDNsO6VFWOoOJd+ACmfwsAY0wOz5lzBEIrdU2k/PMgSVzECMV4S5ipwIUmVUpGzbvgAWZQGtsUeVevAbvZ1QgyH6bhDIUheeUrOKN0cbgEMc/xIi7yZ+VWHOMBqb8LkyBvunG2TjK31B1HAGL/krBS+gvvQnW0ZN,iv:K0djdxNOGaHBkE4vyh/22fruAHVsZYVT68cdVoMmogw=,tag:3fjjzD3bghvGy3aZ7/Ienw==,type:str]
 | 
				
			||||||
mysql:
 | 
					mysql:
 | 
				
			||||||
    password: ENC[AES256_GCM,data:KqEe0TVdeMIzPKsmFg9x0X9xWijnOk306ycyXTm2Tpqo/O0F,iv:Y+hlQ8n1ZIP9ncXBzd2kCSs/DWVTWhiEluFVwZFKRCA=,tag:xlaUk0Wftk62LpYE5pKNQw==,type:str]
 | 
					    password: ENC[AES256_GCM,data:KqEe0TVdeMIzPKsmFg9x0X9xWijnOk306ycyXTm2Tpqo/O0F,iv:Y+hlQ8n1ZIP9ncXBzd2kCSs/DWVTWhiEluFVwZFKRCA=,tag:xlaUk0Wftk62LpYE5pKNQw==,type:str]
 | 
				
			||||||
sops:
 | 
					sops:
 | 
				
			||||||
@@ -63,8 +65,8 @@ sops:
 | 
				
			|||||||
            cTh5bnJ3WW90aXRCSUp6NHFYeU1tZ0kK4afdtJwGNu6wLRI0fuu+mBVeqVeB0rgX
 | 
					            cTh5bnJ3WW90aXRCSUp6NHFYeU1tZ0kK4afdtJwGNu6wLRI0fuu+mBVeqVeB0rgX
 | 
				
			||||||
            0q5hwyzjiRnHnyjF38CmcGgydSfDRmF6P+WIMbCwXC6LwfRhAmBGPg==
 | 
					            0q5hwyzjiRnHnyjF38CmcGgydSfDRmF6P+WIMbCwXC6LwfRhAmBGPg==
 | 
				
			||||||
            -----END AGE ENCRYPTED FILE-----
 | 
					            -----END AGE ENCRYPTED FILE-----
 | 
				
			||||||
    lastmodified: "2024-08-15T21:18:33Z"
 | 
					    lastmodified: "2024-08-24T16:49:06Z"
 | 
				
			||||||
    mac: ENC[AES256_GCM,data:uR5HgeDAYqoqB9kk1V6p0T30+v6WpQJi4+qIeCDRnoUPnQKUVR10hvBhICck+E+Uh8p+tGhM6Uf3YrAJAV0ZCUiNJjtwDJQQLUDT53vdOAXN4xADCQqNuhgVwVMaruoTheEiwOswRuhFeEwy0gBj3Ze2pu47lueHYclmEzumLeQ=,iv:t0UyXN2YaR2m7M/pV2wTLJG5wVfqTIUs7wSQMmyeTVw=,tag:O7dIffzrDAXz3kGx5uazhw==,type:str]
 | 
					    mac: ENC[AES256_GCM,data:A5pYM3yNt5GdlvpdDbRXxQwUccC/dr5JZwPBMjjx4ZRaJMbewpmGL/ySITnsCEuxOG1cagc1S28ti8k3z0bR4rfFlt/fZ93K8uwI9rT6KW5pSEAa1vPEz8Jq+7asfJIBMCpxFxN704JDSeOnBMaSHwQdICdmG4jfN/F+YbXTPIA=,iv:Y6gloFlYtnJZ3kzcUtZZZmJQ8KowQ29pwZaqo/ePrm8=,tag:r8XFLU5PGMr3U3K0N0cmlQ==,type:str]
 | 
				
			||||||
    pgp:
 | 
					    pgp:
 | 
				
			||||||
        - created_at: "2024-08-04T00:03:40Z"
 | 
					        - created_at: "2024-08-04T00:03:40Z"
 | 
				
			||||||
          enc: |-
 | 
					          enc: |-
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user