Compare commits

...

3 Commits

Author SHA1 Message Date
Astro ade76b343f heliwatch/module.nix: switch to a passwordFile 2024-04-13 04:16:19 +02:00
Astro 2871df9cfb Cargo.lock: update 2024-04-13 04:15:58 +02:00
Astro a0de257512 flake.lock: Update
Flake lock file updates:

• Updated input 'fenix':
    'github:nix-community/fenix/cb59ad177b991978ff571388bf8df6fed32e6bc2' (2023-09-22)
  → 'github:nix-community/fenix/c739f83545e625227f4d0af7fe2a71e69931fa4c' (2024-04-12)
• Updated input 'fenix/rust-analyzer-src':
    'github:rust-lang/rust-analyzer/d6fef2c7e3be2783369b4b84e320b163b8fd291a' (2023-09-20)
  → 'github:rust-lang/rust-analyzer/657b33b0cb9bd49085202e91ad5b4676532c9140' (2024-04-11)
• Updated input 'naersk':
    'github:nmattia/naersk/3f976d822b7b37fc6fb8e6f157c2dd05e7e94e89' (2023-09-07)
  → 'github:nmattia/naersk/aeb58d5e8faead8980a807c840232697982d47b9' (2023-10-27)
• Updated input 'nixpkgs':
    'path:/nix/store/z5r8imp4q5wjfl58d064rwm20cym02c0-source?lastModified=1693844670&narHash=sha256-t69F2nBB8DNQUWHD809oJZJVE%2B23XBrth4QZuVd6IE0%3D&rev=3c15feef7770eb5500a4b8792623e2d6f598c9c1' (2023-09-04)
  → 'path:/nix/store/bwibdavbf6p8lci025h3qmln6laq5x82-source?lastModified=1712741485&narHash=sha256-bCs0%2BMSTra80oXAsnM6Oq62WsirOIaijQ/BbUY59tR4%3D&rev=b2cf36f43f9ef2ded5711b30b1f393ac423d8f72' (2024-04-10)
• Updated input 'utils':
    'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384' (2023-09-12)
  → 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11)
2024-04-13 03:46:54 +02:00
3 changed files with 373 additions and 339 deletions

674
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -8,11 +8,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1695363721,
"narHash": "sha256-+VRVzXpWdSsZPcR2Cg9Q5LKhUQDVvoQFfH4V8iKNAkU=",
"lastModified": 1712903033,
"narHash": "sha256-KcvsEm0h1mIwBHFAzWFBjGihnbf2fxpAaXOdVbUfAI4=",
"owner": "nix-community",
"repo": "fenix",
"rev": "cb59ad177b991978ff571388bf8df6fed32e6bc2",
"rev": "c739f83545e625227f4d0af7fe2a71e69931fa4c",
"type": "github"
},
"original": {
@ -28,11 +28,11 @@
]
},
"locked": {
"lastModified": 1694081375,
"narHash": "sha256-vzJXOUnmkMCm3xw8yfPP5m8kypQ3BhAIRe4RRCWpzy8=",
"lastModified": 1698420672,
"narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=",
"owner": "nmattia",
"repo": "naersk",
"rev": "3f976d822b7b37fc6fb8e6f157c2dd05e7e94e89",
"rev": "aeb58d5e8faead8980a807c840232697982d47b9",
"type": "github"
},
"original": {
@ -43,10 +43,10 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1693844670,
"narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=",
"path": "/nix/store/z5r8imp4q5wjfl58d064rwm20cym02c0-source",
"rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1",
"lastModified": 1712741485,
"narHash": "sha256-bCs0+MSTra80oXAsnM6Oq62WsirOIaijQ/BbUY59tR4=",
"path": "/nix/store/bwibdavbf6p8lci025h3qmln6laq5x82-source",
"rev": "b2cf36f43f9ef2ded5711b30b1f393ac423d8f72",
"type": "path"
},
"original": {
@ -65,11 +65,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1695220688,
"narHash": "sha256-T54aKrnKMI7Cg2mid5h46mWAXd0xc0pYn0fju3dwXf0=",
"lastModified": 1712818880,
"narHash": "sha256-VDxsvgj/bNypHq48tQWtc3VRbWvzlFjzKf9ZZIVO10Y=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "d6fef2c7e3be2783369b4b84e320b163b8fd291a",
"rev": "657b33b0cb9bd49085202e91ad5b4676532c9140",
"type": "github"
},
"original": {
@ -99,11 +99,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {

View File

@ -5,7 +5,7 @@
jid = mkOption {
type = types.str;
};
password = mkOption {
passwordFile = mkOption {
type = types.str;
};
muc = mkOption {
@ -41,9 +41,9 @@
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
path = with pkgs; [ bash curl ];
script = ''
script = with cfg; ''
${./fetch_data.sh}
exec ${self.packages.${pkgs.system}.heliwatch}/bin/heliwatch ${lib.escapeShellArgs (with cfg; [ jid password muc ])}
exec ${self.packages.${pkgs.system}.heliwatch}/bin/heliwatch '${jid}' "$(cat ${passwordFile})" '${muc}'
'';
serviceConfig = {
Type = "simple";