From 4b08e874b77cbc3921deba6224a218ee5109b301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Thu, 3 Nov 2022 21:03:36 +0100 Subject: [PATCH 1/6] :rocket: add ssh module --- modules/profiles/desktop.nix | 4 ++++ modules/programs/default.nix | 1 + modules/programs/ssh.nix | 39 ++++++++++++++++++++++++++++++++++++ secrets/secrets.nix | 7 ++++--- secrets/ssh-home.age | 17 ++++++++++++++++ 5 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 modules/programs/ssh.nix create mode 100644 secrets/ssh-home.age diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index d8b8e12..3be4db6 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -81,6 +81,10 @@ with lib; { logseq.enable = true; python.enable = true; rofi.enable = true; + ssh = { + enable = true; + includeSecrets = [ ../../secrets/ssh-home.age ]; + }; spotify.enable = true; thunar.enable = true; zathura.enable = true; diff --git a/modules/programs/default.nix b/modules/programs/default.nix index 02ef7d9..82e2dd4 100644 --- a/modules/programs/default.nix +++ b/modules/programs/default.nix @@ -25,6 +25,7 @@ ./python.nix ./rofi ./spotify.nix + ./ssh.nix ./sway.nix ./thunar.nix ./vim.nix diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix new file mode 100644 index 0000000..2c484ae --- /dev/null +++ b/modules/programs/ssh.nix @@ -0,0 +1,39 @@ +{ config +, lib +, pkgs +, ... +}: + +with lib; +let + cfg = config.my.programs.ssh; + + baseName = path: removeSuffix ".age" (baseNameOf path); +in +{ + options.my.programs.ssh = { + enable = mkEnableOption "ssh"; + includeSecrets = mkOption { + default = [ ]; + type = with types; listOf path; + }; + }; + + config = + mkIf cfg.enable + { + age.secrets = listToAttrs (map + (path: { + name = baseName path; + value = { + file = path; + owner = "1000"; + }; + }) + cfg.includeSecrets); + home-manager.users.moritz.programs.ssh = { + enable = true; + includes = map (path: "/run/agenix/" + baseName path) cfg.includeSecrets; + }; + }; +} diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 90e1b43..0862e22 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -11,10 +11,11 @@ let all = users ++ hosts; in { + "github.age".publicKeys = all; + "home-vpn-password.age".publicKeys = all; + "home-vpn.age".publicKeys = all; "nordvpn.age".publicKeys = all; "spotifyd.age".publicKeys = all; - "home-vpn.age".publicKeys = all; - "home-vpn-password.age".publicKeys = all; - "github.age".publicKeys = all; + "ssh-home.age".publicKeys = all; "uni-vpn.age".publicKeys = all; } diff --git a/secrets/ssh-home.age b/secrets/ssh-home.age new file mode 100644 index 0000000..29c1542 --- /dev/null +++ b/secrets/ssh-home.age @@ -0,0 +1,17 @@ +age-encryption.org/v1 +-> ssh-ed25519 CjuqfA wMWvHzKojsGU5q8ElLz2IiwI0NvWZN6rPLL8nvIu9xE +n0FjkxhJTOaG7RF6MEzaAz9ZWiP1trQHdNiaPCc5aCo +-> ssh-ed25519 QRYDmg ChVNe6JXbocNnJnO0Y7XVrW0Tic5V5aIWuxGiG6pXnw +FIDIKw6K0Y+WY5GJV262KTayMwxPCCBXMqXXMQruCPI +-> ssh-ed25519 wG6LYg X/hbVXUoJNAkrgGz5MtyMjYRtBkF+FERXsRg1t8lFio +x7zWga14+MZKbTQxRhoQjeBvuQOoG/uF6ZOW2XSgm/g +-> ssh-ed25519 ZYd7Zg 2ONwuLBf5b3SrCdH+8ZiebO7KBqfKjan1Sw+LX/oTQ4 +bk6LwwvZ/i5UCxUakWA9J4MUT+3ENWMGAZyXpHRFMNI +-> ssh-ed25519 as9VYQ H2i5xdWKf96tzdmTOZ0PHZciuZgSHSYTNxbvcQ3PzDs +LRwILXh0IzTJrXJf2xa97m8cBV6KuvjDPWdeNTRZNdw +-> G(S/7!"#-grease 0y 81:sY?B +r6URopooo8jE5fqfSgjBHWrwDVMa0IwklhiWXsbMzgzBhac8DSDiGMEfXxKAFDFV +GTFSR0sZoA +--- QLqXqFiqJnIc1aMFvU0Giexu9m6E2ESU6kVpiu/vD5I +9v.}rcdnqü7 |nA4H̿P4~ +8m%꥟p'di97>rx\KüeaxD7CtGlsEvŔIc |Cw6G%,%yT᭵8 \ No newline at end of file From cff6561279531078b93b79374232b7abc95757e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Thu, 3 Nov 2022 21:04:24 +0100 Subject: [PATCH 2/6] :bug: fix openssl issues --- flake.lock | 94 +++++++++++++++++--------------------------- overlays/default.nix | 2 +- 2 files changed, 37 insertions(+), 59 deletions(-) diff --git a/flake.lock b/flake.lock index 6edd3ac..a579e21 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1664140963, - "narHash": "sha256-pFxDtOLduRFlol0Y4ShE+soRQX4kbhaCNBtDOvx7ykw=", + "lastModified": 1665870395, + "narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=", "owner": "ryantm", "repo": "agenix", - "rev": "6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0", + "rev": "a630400067c6d03c9b3e0455347dc8559db14288", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "arkenfox-userjs": { "flake": false, "locked": { - "lastModified": 1662893183, - "narHash": "sha256-NyP/kJlV1Ai7os3gMqukKMdRSQ78GAjPCJkZDZtDdeo=", + "lastModified": 1665257885, + "narHash": "sha256-4PNnCRLomAd5OdN4UEbsVSm8eNuteZHKaUqRVvIBvN8=", "owner": "arkenfox", "repo": "user.js", - "rev": "3f09afdee07c5aea33f6dc4194e1425d6400a0d7", + "rev": "f4187632faef76df4de0cbb0cdc7199f22fadd76", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1663284638, - "narHash": "sha256-rXAX14yB8v9BOG4ZsdGEedpZAnNqhQ4DtjQwzFX/TLY=", + "lastModified": 1666010793, + "narHash": "sha256-6zhTpR0cfaHrupOXRZAdCzLAGINgsB6h3HQnj7+qHWs=", "owner": "nix-community", "repo": "comma", - "rev": "c83ff3839983b3cb8deb407ff618ca12179de588", + "rev": "691120d169189f3a9cb29b1c72bcd521ac372b2b", "type": "github" }, "original": { @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1664251341, - "narHash": "sha256-1f0KvK1VA8tGK7RVYZv17vSJ6URyt8fs81kRGfzPK3Q=", + "lastModified": 1666352875, + "narHash": "sha256-kbzTmj9ihe4rowgjLxD4uT4nKh304lN0RJMd5yBX03w=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "550ce5667fee8f74aa20ad6456720ed84ebdd241", + "rev": "3d7c61b6dc5fc9d7c5e4a74e575c582aa567d547", "type": "github" }, "original": { @@ -212,11 +212,11 @@ "forgit-git": { "flake": false, "locked": { - "lastModified": 1663431390, - "narHash": "sha256-dz7HNm9+dgb2ibomdrYdtSUC+ksrYdRR5RjBxSmc9eI=", + "lastModified": 1665756353, + "narHash": "sha256-NKL4c4k9Nath8NQ3sWUTGUzp517jRX4v0qVaKMJSMrw=", "owner": "wfxr", "repo": "forgit", - "rev": "49579b2d1f620db6a71d070b40416c1af8a32168", + "rev": "2872548075e63bc83a0b960e2813b16571998563", "type": "github" }, "original": { @@ -233,11 +233,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1664273942, - "narHash": "sha256-PFQR1UJQs7a7eaH5YoCZky5dmxR5cjaKRK+MpPbR7YE=", + "lastModified": 1666253070, + "narHash": "sha256-MtaNgghmfp+ywh5mv9FcspFT4ACaYINSN+D98PCkrP0=", "owner": "nix-community", "repo": "home-manager", - "rev": "1f5ef2bb419a327fae28a83b50fab50959132c24", + "rev": "c485669ca529e01c1505429fa9017c9a93f15559", "type": "github" }, "original": { @@ -250,15 +250,14 @@ "inputs": { "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks", - "utils": "utils_3" + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1665340940, - "narHash": "sha256-6IIBGkD4spWRvMTEXRxWa31IerfVc1SSTruggY/lNR4=", + "lastModified": 1665343480, + "narHash": "sha256-mMaZFrDDiBcHDe8+lA87P3iMPea+RGfik5/E4Dyzk8U=", "ref": "refs/heads/main", - "rev": "17159cf269ce194703bc04671bb6d2378d124959", - "revCount": 3, + "rev": "24a7cfb8c2fef1873275dbdf7c8ad562c22083de", + "revCount": 5, "type": "git", "url": "https://git.sr.ht/~moritzboehme/howdy" }, @@ -269,11 +268,11 @@ }, "master": { "locked": { - "lastModified": 1664278750, - "narHash": "sha256-frpTZQ+QMS7Xwi3fQSYdUTKd5e4YnrrDcS4WT+fdpfI=", + "lastModified": 1666360603, + "narHash": "sha256-EbTKhA5z4us1tOwitpbwHy42K6VF0jeisHuM197Ak5I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ff346a442d1e5ec81b24c312c06fd134bcc9c088", + "rev": "2615fa1055a8462db5c5be0b2ef5fd77b42aad10", "type": "github" }, "original": { @@ -322,11 +321,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1664235386, - "narHash": "sha256-hlkYFCJ9VKZPRW50vtpHHq4h1PJrptD5BbdLOEp4Lyc=", + "lastModified": 1666333455, + "narHash": "sha256-oHXIeLB/sPWxKNcSdV1DQi1ddNVoJ17T1yDiMMeygL4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ea4a87537cfdc83eebcd1804a5ec51057018784f", + "rev": "93e0ac196106dce51878469c9a763c6233af5c57", "type": "github" }, "original": { @@ -381,11 +380,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1663082609, - "narHash": "sha256-lmCCIu4dj59qbzkGKHQtolhpIEQMeAd2XUbXVPqgPYo=", + "lastModified": 1666160137, + "narHash": "sha256-8bQu+6poMzUyS2n3C1v3hkO6ZhRzj8Pf3CDCNckqQE4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "60cad1a326df17a8c6cf2bb23436609fdd83024e", + "rev": "e6c8efee1c108bb27522b9fd25b1cd0eb3288681", "type": "github" }, "original": { @@ -410,16 +409,16 @@ "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks_2", "stable": "stable", - "utils": "utils_4" + "utils": "utils_3" } }, "stable": { "locked": { - "lastModified": 1664178928, - "narHash": "sha256-+WVCZH/3Ifef4Da9N1tkGnmfX0QwtkJQz013QuImu10=", + "lastModified": 1666249138, + "narHash": "sha256-CzK8NA8xEMKAhvHXB8UMODckcH97sZXm6lziKNWLv0M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b542cc75fa03a3a29350d4c3b69739e946268a93", + "rev": "44fc3cb097324c9f9f93313dd3f103e78d722968", "type": "github" }, "original": { @@ -460,27 +459,6 @@ } }, "utils_3": { - "inputs": { - "flake-utils": [ - "howdy", - "flake-utils" - ] - }, - "locked": { - "lastModified": 1657226504, - "narHash": "sha256-GIYNjuq4mJlFgqKsZ+YrgzWm0IpA4axA3MCrdKYj7gs=", - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "rev": "2bf0f91643c2e5ae38c1b26893ac2927ac9bd82a", - "type": "github" - }, - "original": { - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "type": "github" - } - }, - "utils_4": { "inputs": { "flake-utils": "flake-utils_4" }, diff --git a/overlays/default.nix b/overlays/default.nix index dc2ac76..d29fe96 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,7 +1,7 @@ { inputs }: final: prev: { inherit (inputs.comma.packages."${prev.system}") comma; nixpkgs-review-checks = inputs.nixpkgs-review-checks.defaultPackage."${prev.system}"; - kdeconnect = prev.plasma5Packages.kdeconnect-kde; + openssl = final.master.openssl_3; # HACK to fix openssl CVE-2022-3786 and CVE-2022-3602 agenix = inputs.agenix.defaultPackage."${prev.system}"; master = import inputs.master { inherit (prev) system; From 01d3e38d4ad5dea2b128ffe9aae3d42426c14619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Thu, 10 Nov 2022 22:12:36 +0100 Subject: [PATCH 3/6] :bug: fix ssh --- modules/programs/kitty.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/programs/kitty.nix b/modules/programs/kitty.nix index 8ab1958..76c4a10 100644 --- a/modules/programs/kitty.nix +++ b/modules/programs/kitty.nix @@ -12,7 +12,7 @@ in options.my.programs.kitty.enable = mkEnableOption "kitty"; config = mkIf cfg.enable { - my.shell.aliases.ssh = "kitty +kitten ssh"; + my.shell.aliases.ssh = "TERM=xterm-256color command ssh"; home-manager.users.moritz = { programs.kitty = { enable = true; @@ -32,11 +32,6 @@ in size = 10; }; }; - xdg.configFile."kitty/ssh.conf" = { - text = '' - env TERM=xterm-color - ''; - }; }; }; } From 89958d0fd76ad5d7b3abb27b3d5eb64cbfb58362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Thu, 10 Nov 2022 22:13:39 +0100 Subject: [PATCH 4/6] :rocket: add keyboard layout switching --- modules/programs/bspwm/sxhkdrc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/programs/bspwm/sxhkdrc b/modules/programs/bspwm/sxhkdrc index 52f51f3..1f25526 100755 --- a/modules/programs/bspwm/sxhkdrc +++ b/modules/programs/bspwm/sxhkdrc @@ -30,7 +30,7 @@ alt + shift + c alt + {t,shift + t,s,f} bspc node -t {tiled,pseudo_tiled,floating,fullscreen} -# switch layout +# switch window layout alt + space bsp-layout next --layouts wide,tall,tiled @@ -107,6 +107,10 @@ super + h super + s share +# switch keyboard layout +super + l + setxkbmap -query | grep -Eq "layout:\s+de" && setxkbmap us && dunstify "Layout US"|| (setxkbmap de && dunstify "Layout DE") + # Apps # start firefox super + {_,shift} + f From c4aa2ccc268a29fac3d0307256376482e88aa8e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Thu, 10 Nov 2022 22:14:15 +0100 Subject: [PATCH 5/6] :lock: update inputs --- flake.lock | 68 +++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index a579e21..cd15729 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ "arkenfox-userjs": { "flake": false, "locked": { - "lastModified": 1665257885, - "narHash": "sha256-4PNnCRLomAd5OdN4UEbsVSm8eNuteZHKaUqRVvIBvN8=", + "lastModified": 1667741320, + "narHash": "sha256-WB9w/UoFqp/WyRhe87dNqwbMAXa8lmsK/QCeTzRWmj8=", "owner": "arkenfox", "repo": "user.js", - "rev": "f4187632faef76df4de0cbb0cdc7199f22fadd76", + "rev": "8a65c5a7bad0ec764d968b0941ebdf01bdcd2408", "type": "github" }, "original": { @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1666352875, - "narHash": "sha256-kbzTmj9ihe4rowgjLxD4uT4nKh304lN0RJMd5yBX03w=", + "lastModified": 1667823539, + "narHash": "sha256-AwDCZgUT004T+skxK62ZWAlP+60yomMaHb0/+hHH448=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3d7c61b6dc5fc9d7c5e4a74e575c582aa567d547", + "rev": "a864e84bd842d00d686e040f552e2fa7030351a0", "type": "github" }, "original": { @@ -151,11 +151,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -181,11 +181,11 @@ }, "flake-utils_3": { "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1667077288, + "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", "type": "github" }, "original": { @@ -233,11 +233,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1666253070, - "narHash": "sha256-MtaNgghmfp+ywh5mv9FcspFT4ACaYINSN+D98PCkrP0=", + "lastModified": 1667708081, + "narHash": "sha256-FChEy05x4ed/pttjfTeKxjPCnHknMYrUtDyBiYbreT4=", "owner": "nix-community", "repo": "home-manager", - "rev": "c485669ca529e01c1505429fa9017c9a93f15559", + "rev": "1ef0da321217c6c19b7a30509631c080a19321e5", "type": "github" }, "original": { @@ -268,11 +268,11 @@ }, "master": { "locked": { - "lastModified": 1666360603, - "narHash": "sha256-EbTKhA5z4us1tOwitpbwHy42K6VF0jeisHuM197Ak5I=", + "lastModified": 1667830549, + "narHash": "sha256-4ndTwPd+lMMWN/3oJlEBxkVw+8wQs9hB5a2+CvyHHwI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2615fa1055a8462db5c5be0b2ef5fd77b42aad10", + "rev": "1ef74a785480396ba179200196cac8256a67cfce", "type": "github" }, "original": { @@ -321,11 +321,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1666333455, - "narHash": "sha256-oHXIeLB/sPWxKNcSdV1DQi1ddNVoJ17T1yDiMMeygL4=", + "lastModified": 1667669848, + "narHash": "sha256-nD2dk2A+1zUlUT18ppDFVWwimi26+ultc2QRsulQwQ8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "93e0ac196106dce51878469c9a763c6233af5c57", + "rev": "1f3ebb2bd1a353a42e8f833895c26d8415c7b791", "type": "github" }, "original": { @@ -337,11 +337,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1645655918, - "narHash": "sha256-ZfbEFRW7o237+A1P7eTKhXje435FCAoe0blj2n20Was=", - "owner": "nixos", + "lastModified": 1667292599, + "narHash": "sha256-7ISOUI1aj6UKMPIL+wwthENL22L3+A9V+jS8Is3QsRo=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "77a7a4197740213879b9a1d2e1788c6c8ade4274", + "rev": "ef2f213d9659a274985778bff4ca322f3ef3ac68", "type": "github" }, "original": { @@ -380,11 +380,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1666160137, - "narHash": "sha256-8bQu+6poMzUyS2n3C1v3hkO6ZhRzj8Pf3CDCNckqQE4=", + "lastModified": 1667760143, + "narHash": "sha256-+X5CyeNEKp41bY/I1AJgW/fn69q5cLJ1bgiaMMCKB3M=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e6c8efee1c108bb27522b9fd25b1cd0eb3288681", + "rev": "06f48d63d473516ce5b8abe70d15be96a0147fcd", "type": "github" }, "original": { @@ -414,11 +414,11 @@ }, "stable": { "locked": { - "lastModified": 1666249138, - "narHash": "sha256-CzK8NA8xEMKAhvHXB8UMODckcH97sZXm6lziKNWLv0M=", + "lastModified": 1667653703, + "narHash": "sha256-Xow4vx52/g5zkhlgZnMEm/TEXsj+13jTPCc2jIhW1xU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "44fc3cb097324c9f9f93313dd3f103e78d722968", + "rev": "f09ad462c5a121d0239fde645aacb2221553a217", "type": "github" }, "original": { @@ -445,11 +445,11 @@ }, "utils_2": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { From 592e58370c2c7e5329ec857ef111c34a69f52cd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sun, 13 Nov 2022 11:50:25 +0100 Subject: [PATCH 6/6] :bug: fix picard not compiling --- modules/profiles/desktop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index 3be4db6..7e08788 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -110,7 +110,7 @@ with lib; { # ripping abcde handbrake - picard + stable.picard # HACK to fix broken picard 2.8.3 # other anki