From c16a0a8c3044ce1b80d6e6d522160ec41985eff7 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Mon, 3 Jan 2022 13:03:10 +0100 Subject: [PATCH] Flake updates, greetd theme, secrets updated --- flake.lock | 18 +++++++++--------- home-manager/modules/sway/default.nix | 2 +- machines/drone/secrets.yaml | 8 ++++---- machines/loki/secrets.yaml | 6 +++--- modules/greetd/default.nix | 10 ++++++++++ 5 files changed, 27 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 3ff6c71..f5a00b2 100644 --- a/flake.lock +++ b/flake.lock @@ -49,11 +49,11 @@ ] }, "locked": { - "lastModified": 1640417317, - "narHash": "sha256-jT2uMARXs0Xm65ccroFsKyr4LTHSecw+9HAnmBdJO8U=", + "lastModified": 1640943848, + "narHash": "sha256-AXmbspe5EXTr2WsGdtBhFgKtGvzMmPBgqOanFvQq974=", "owner": "nix-community", "repo": "home-manager", - "rev": "48f2b381dd397ec88040d3354ac9c036739ba139", + "rev": "89bdef7994a20b5285454bf42c7d2b53b98d5754", "type": "github" }, "original": { @@ -84,11 +84,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1640408860, - "narHash": "sha256-h2uF3+a8bVfM8SjcS4hLbsOzOuG3qsxuImC0BucWs1Q=", + "lastModified": 1640871638, + "narHash": "sha256-ty6sGnJUQEkCd43At5U3DRQZD7rPARz5VginSW6hZ3k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cb372c3b8880e504b06946e8fb2ca9777c685505", + "rev": "5b091d4fbe3b7b7493c3b46fe0842e4b30ea24b3", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1638821683, - "narHash": "sha256-oyqALhGijy2ZQxFSACrcC+Z8MzYLiomKCr9FQXVZ47U=", + "lastModified": 1640804118, + "narHash": "sha256-4qHIQbiFmb+qXKt0nOY09XO/KdSMTrlHdhRK7St4zzU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "afe00100b16648c1d79e62926caacac561df93a5", + "rev": "1514ac9fd54363a24c513de43dd0b963e2d17cb7", "type": "github" }, "original": { diff --git a/home-manager/modules/sway/default.nix b/home-manager/modules/sway/default.nix index de87dc5..0448e1b 100644 --- a/home-manager/modules/sway/default.nix +++ b/home-manager/modules/sway/default.nix @@ -19,7 +19,7 @@ in "1" = [{ app_id = "firefox"; }]; "2" = [{ app_id = "Alacritty"; } { app_id = "foot"; }]; "3" = [{ class = "Code"; }]; - "10" = [{ class = "telegramdesktop"; } { class = "Signal"; }]; + "10" = [{ class = "telegramdesktop"; } { app_id = "Signal"; }]; }; bars = [ { diff --git a/machines/drone/secrets.yaml b/machines/drone/secrets.yaml index 4715f5b..2e4e68e 100644 --- a/machines/drone/secrets.yaml +++ b/machines/drone/secrets.yaml @@ -1,13 +1,13 @@ -drone: ENC[AES256_GCM,data:QjRQzIrT9sqFmG4anJpbKl/p8IzazUjddjm9s3Szf5eVzD4Mq4xu3a+0jCDnBV8Ya8+s2o5+pEtqZCfU933NvJ/wSB7vF0ZF+JUfiZPDLwOCJfKG5szi25c7TkPi96yga/sClbIoaip0L4smY0ynKz3HhZAUCoUz33Gfc8mpWjA5LL15xT0heOAWHlR6qVy9FlmZzTH+Jwhkbxmf/3WK6RAsvHqhqVmuXmIaWteI8Q32zWjMerDgeTjjYuL3hxf9MxlQUHTtwiBeaFTT5mNWW7uw45bEP0YQCQYNRTzOy0qcw6hIiNWKYjkt13Mv3UIl6R9Qo9m/3uUXUXSJdoYjECfv61ZaoIFg37KMFwU2TcEYnOTZptF3oF+Gs5PLpJTum1wOxCYMsot4ZOHSzPb+bEiEtW6LFY9dKANVsTh5Iz+TcH5wz2iAXbV3qk6U,iv:xclLVEEYec2o0QCxq8DbLzpCgkapaEM8THEsBcC/nqs=,tag:gJwxJanQ6KsUcfmEAE0OyQ==,type:str] -drone-runner: ENC[AES256_GCM,data:REMBwzquLj9fgupRuZvlD0WaBJlOuKBwYUOFVbx65AzTzWdnWtPVp4VjC1yWMtb8qSFgOhDtgV+wt/HcTNV1tAc3nwIRoi5vB1IseuvnVDRbaANzmbRY4GgfSBAd6VbI1zZrrkJzwQZ3BqvM/wEI10l+hc3rdcyYQYZ0TrHefQhP3FyMWEgJXOykgwPmanLuGuK3gFr5fATLkwWJHlEKViaKZ5uRoyEXU8iE4rTUZevljJwzl/IV3UnJSlbzcVZaVN+Y5KMv/mUu7eDeItwV4HDkDw==,iv:UX7F1uCkTeEi/i+741+9D3zSDuSu6X30GxhQBJQICu8=,tag:oY90WdWXkYoqe+9SREGESA==,type:str] +drone: ENC[AES256_GCM,data:PZPChq/iQDw7gOfdmSOB4ZvtWgnT55lMc1/kSKVoh5kTkIX+FdNE7uJlhKJQHryYWdrbyoRu09RhhPLr27oWeiCvN4Z0QmM9ofrM4CfuUPotp3niZIjfXrLIiX2s1JlxT2eElEwkX2h1UCIC+tNqFCL+ThLkP4iMmeXRXwFBIOahYscskwbmutbyraj/yQq3KcwUyFLd618pDT+0VWiBETQudauWdmJXFDW/rKW7STTVhe/7ixCIw3O5BYThOin9YhZSZxje225+bBB8vPM6NfdvNCHEtzAwxTjtm3n0beqsAAxd6hzQXk3L7a2X6Y+mmK1XMjmLhsGgI5B6Zssmv3/3oTSczn+YdtfT9bz0KxaZtJdQrYEfVowKEQMTcWO5H55F5Mv+qShweIAcWqKInFb6+EDjyPzABlN/S9/XJakQsPxcCwBKKusYr3P3IFjNnzdZD18ayhc6frs4TJmSGcQIkW/cCWNjwpct/yVbkIrIXZEWb7DoZ0M=,iv:F++KLxnqAtBhcSdj5rZhGpVvCKfI8y5HhvlejCfwi/k=,tag:YdiiZUN7wGn9yA1evMu5jg==,type:str] +drone-runner: ENC[AES256_GCM,data:Uh7OQSDtV0M5j00oHHm4uz4zwi+1W1k2qd5uXoROj5tcgNs76YBcfkU7d+1qXj/Hma7++HOcga0LvF1+Dl/GJQyj47kVFi/+h6I9yiuoO5sW3nxh5pW5W1Ws1qchKqVhoyZLf0K4AnYE2puleKcYXfogJ1hjnB3vn5F/eOKA/QB+7KfaVPRUGZsUYQw3rHLdTbTFHXPv//z8xxYqY5JcG+vvWsHXiI/sKSTZBWoPJEZnKK2mo8+dbZn3nSj29luG,iv:40JTvOJ7isGcHGg9KI5ED8Ju5knmIWP1m/i/dwlpG/M=,tag:GHbkLIeuiGVlNsR2EW/PGw==,type:str] sops: kms: [] gcp_kms: [] azure_kv: [] hc_vault: [] age: [] - lastmodified: "2021-12-29T20:31:28Z" - mac: ENC[AES256_GCM,data:p9tjT3+HzIO+VgmQ1Yj6aTXzsQ0zdzDkgw0iXByhhgcmaPFI72D8hhTccXztWgRLsVimAVG3xw5YpA6DO9LpaWEJSVZ/Dz4H7PLIri6nX2l0Y2caVFfIjVxYI8IMja6VuIm37n9XPkvTMNySKeYHOfcNhlXW6k1bVvtIK1/Xmsw=,iv:On0n+/DDPpFJsAYrXRJVglbN7Ynm4nrcuPPGPya3phU=,tag:Y33AjsSx8X137EO/zzxRVA==,type:str] + lastmodified: "2021-12-29T21:03:09Z" + mac: ENC[AES256_GCM,data:WIoK7hdVGdIleSvlRO6OniQ8z94NtDOTw7g7bWDRL+M+fnaGwU7J5JeW6fuUyX45Kh/PbDVDWh8KSbbU/gCbhI6hhyFsccFI1imDvTJ4ryoLO8+yoRmBd9+aaIbjcrM8PfZITlJdyu7NewnuQ4kesfwWh07m2IxB2xerErrkayw=,iv:iBYU/PPe/NqIAUhEwSNVwHdeijs8sRZVx5d7qoNzAE8=,tag:D04BxYAjsS/+EXbjfIi1EQ==,type:str] pgp: - created_at: "2021-12-10T15:35:15Z" enc: | diff --git a/machines/loki/secrets.yaml b/machines/loki/secrets.yaml index 5167a53..ea330c8 100644 --- a/machines/loki/secrets.yaml +++ b/machines/loki/secrets.yaml @@ -1,14 +1,14 @@ ha_now_playing_token: ENC[AES256_GCM,data:2NKdfEn0tQx+DTE6HBVo79Ico8+afqJ2XFaBVOgIikaL4eMa34CqHwhX91T64VVdmWyjvhaC1kRzxsALoJvw1ZHEnSG2va6lX0vN36j/n8R3ulcX23ZJetMHYQQE6ss7A+gvnBHTnTBG+F9XyrPFT7xnfQ363lWHQ3nRFiGAZJjj6eYqLxSuG7KMWHtfSozy5gSy2JKoxyV4KnqpDs39PhBmNA7OSh3FRYZPIaq+i4qhdCfHRET+,iv:Znl6IW36aqhL/KBr0cRgPBPtqkhuc1GtoqCQEQJ/cXI=,tag:ubvLck9m9qiutU2zcQtdDw==,type:str] gh_token: ENC[AES256_GCM,data:7DBVEdZLReJQsyUoO9fITtHhE0UFcHr7XWod5XiaQ5iiwcI01tUdRA==,iv:HY82pn2rp9zf+xHWRg6Zwbl5V2qgp+67LghxHRQjiMI=,tag:OrkwDDYpJLXnsWZvqBtY9g==,type:str] -renovate_env: ENC[AES256_GCM,data:LZ1cCywgO4lqT18nM85oYCwtAgm0fDBlZdZUXYyCXcA6mOcDw0lvj0KqF/Y3+NKjvyl3qKMqhEw=,iv:xqjI0Vgl95WafQwg1Rs/+c6TyN96pBMXtlcusqX/QEM=,tag:VFmCukB36LDUFON0H40RPg==,type:str] +renovate_env: ENC[AES256_GCM,data:mzeS0FXsycD4hWMzRMgeEgTY+x2QtYtxmhcFCJcjwlD/q577kprHaU8otr1sOu9mwNud7K8kJGk=,iv:MMhr6CPsyvmP7+dKJUwt9cjnATm9JKZ/KbG4Dkj7hJ0=,tag:ubLmcW/CtT/uPiyswvr93w==,type:str] sops: kms: [] gcp_kms: [] azure_kv: [] hc_vault: [] age: [] - lastmodified: "2021-12-10T18:54:00Z" - mac: ENC[AES256_GCM,data:30K4XFb/WaIoJDtfFL4AJWjP8xu7PbRGkNIyTOUTBQMW0PkNHkSKPLLqtv9AEP04zAYGdJ/9jFBn0d3VJYSVuO0wgec/35AMEo5JA07Jd7miC4cPUp5LX0sjEm9bh9i7dLa6U/83xoDJpQ0+MeUs2DUlFumlhtGvGP9S/6JppO8=,iv:TtPjqB2nXkNjR/jGXkGNvZRN1MXhBZRPGp2FZBoKU8o=,tag:GOytAKkjcg0ozLjDerR7bw==,type:str] + lastmodified: "2021-12-28T23:28:51Z" + mac: ENC[AES256_GCM,data:Fqfnd3RTm9bDhlBNrrGh/BkScVOicUu79ZJdpr8ONSNOzVdAh3YbeEkuQoGQ6QxHnzJ/bAv0p0WF+OduoZipCl83U6Dg1Z87fziQHeDw4291zG0LoBsG5SEgGf9P5RvjpTNi2+O8kaYti4kf2ir/Dmg+JlAhuOoYEgAxtZl4V5g=,iv:HddVIwbmxqOH0C7Vw0TIwLgANnJjMcFSSpOtgvWcVY0=,tag:cWNnRYJvKfVDDGiPnnMhgg==,type:str] pgp: - created_at: "2021-11-25T22:00:17Z" enc: | diff --git a/modules/greetd/default.nix b/modules/greetd/default.nix index b463606..b9e6732 100644 --- a/modules/greetd/default.nix +++ b/modules/greetd/default.nix @@ -50,6 +50,16 @@ in exec_always --no-startup-id dbus-update-activation-environment --systemd _JAVA_AWT_WM_NONREPARENTING MOZ_ENABLE_WAYLAND MOZ_DBUS_REMOTE QT_QPA_PLATFORM QT_WAYLAND_DISABLE_WINDOWDECORATION QT_QPA_PLATFORMTHEME SDL_VIDEODRIVER SSH_AUTH_SOCK ''; }; + "xdg/gtk-3.0/settings.ini" = { + text = generators.toINI { } { + Settings = { + gtk-theme-name = "Arc-Dark"; + gtk-icon-theme-name = "Papirus-Dark"; + gtk-cursor-theme-name = "Quintom_Ink"; + gtk-application-prefer-dark-theme = "true"; + }; + }; + }; }; }; }