diff --git a/desktop/services.nix b/desktop/services.nix index e58d9b5..5e66b20 100644 --- a/desktop/services.nix +++ b/desktop/services.nix @@ -25,7 +25,7 @@ in home.services.protonmail-bridge = { enable = true; - path = with pkgs; [ + extraPackages = with pkgs; [ pass gnome-keyring ]; diff --git a/flake.lock b/flake.lock index 9743632..f828a12 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1754337839, - "narHash": "sha256-fEc2/4YsJwtnLU7HCFMRckb0u9UNnDZmwGhXT5U5NTw=", + "lastModified": 1754433428, + "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", "owner": "ryantm", "repo": "agenix", - "rev": "856df6f6922845abd4fd958ce21febc07ca2fa45", + "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", "type": "github" }, "original": { @@ -36,11 +36,11 @@ "stable": "stable" }, "locked": { - "lastModified": 1754254562, - "narHash": "sha256-vwu354kJ2fjK1StYmsi/M2vGQ2s72m+t9pIPHImt1Xw=", + "lastModified": 1755272288, + "narHash": "sha256-ypTPb2eKcOBbOoyvPV0j4ZOXs4kayo73/2KI456QnE0=", "owner": "zhaofengli", "repo": "colmena", - "rev": "5e0fbc4dbc50b3a38ecdbcb8d0a5bbe12e3f9a72", + "rev": "5bf4ce6a24adba74a5184f4a9bef01d545a09473", "type": "github" }, "original": { @@ -111,11 +111,11 @@ ] }, "locked": { - "lastModified": 1754421590, - "narHash": "sha256-TrlzGR5l/OltcTnBtihUxoKqv+JNEKWmUamDVWICtX0=", + "lastModified": 1757075491, + "narHash": "sha256-a+NMGl5tcvm+hyfSG2DlVPa8nZLpsumuRj1FfcKb2mQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "a0b1afdb5efbf59f4b6e934d090cf8d150517890", + "rev": "f56bf065f9abedc7bc15e1f2454aa5c8edabaacf", "type": "github" }, "original": { @@ -167,11 +167,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1754316476, - "narHash": "sha256-Ry1gd1BQrNVJJfT11cpVP0FY8XFMx4DJV2IDp01CH9w=", + "lastModified": 1757103352, + "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9368056b73efb46eb14fd4667b99e0f81b805f28", + "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", "type": "github" }, "original": { @@ -183,11 +183,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754214453, - "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", + "lastModified": 1756787288, + "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", + "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", "type": "github" }, "original": { @@ -265,11 +265,11 @@ ] }, "locked": { - "lastModified": 1754360356, - "narHash": "sha256-xQjfwhx2vjWsRVp/rwZFPLfp+AtVS6pLybZ86Y3qFcM=", + "lastModified": 1757123429, + "narHash": "sha256-wjWN/Ct1/MDJNJYYTkGc4J97lriBBXUdSAAkQjP+FJk=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "3f70879e7d44ea4463ce2d66ea57c4f7206d5f18", + "rev": "ade86861202d58da01fd7131d85a971d358e21c8", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index 367a897..557faca 100644 --- a/home/default.nix +++ b/home/default.nix @@ -23,7 +23,6 @@ home = { imports = [ ./unison.nix - ./protonmail-bridge.nix ]; home.stateVersion = config.system.stateVersion; diff --git a/home/protonmail-bridge.nix b/home/protonmail-bridge.nix deleted file mode 100644 index 65688f8..0000000 --- a/home/protonmail-bridge.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -let - cfg = config.services.protonmail-bridge; -in -{ - options.services.protonmail-bridge = { - enable = lib.mkEnableOption "protonmail bridge"; - - package = lib.mkPackageOption pkgs "protonmail-bridge" { }; - - path = lib.mkOption { - type = lib.types.listOf lib.types.path; - default = [ ]; - example = lib.literalExpression "with pkgs; [ pass gnome-keyring ]"; - description = "List of derivations to put in protonmail-bridge's path."; - }; - - logLevel = lib.mkOption { - type = lib.types.nullOr ( - lib.types.enum [ - "panic" - "fatal" - "error" - "warn" - "info" - "debug" - ] - ); - default = null; - description = "Log level of the Proton Mail Bridge service. If set to null then the service uses it's default log level."; - }; - }; - - config = lib.mkIf cfg.enable { - home.packages = [ cfg.package ]; - systemd.user.services.protonmail-bridge = { - Unit = { - Description = "protonmail bridge"; - }; - Install = { - WantedBy = [ "graphical-session.target" ]; - }; - Service = - let - logLevel = lib.optionalString (cfg.logLevel != null) "--log-level ${cfg.logLevel}"; - in - { - ExecStart = "${lib.getExe cfg.package} --noninteractive ${logLevel}"; - Restart = "always"; - Environment = [ "PATH=${lib.makeBinPath (cfg.path ++ [ cfg.package ])}" ]; - }; - }; - }; -}