From b1b079da0f50a1cf257c1a2286931fb1c7f43fa9 Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Thu, 21 Mar 2024 17:12:22 +0100 Subject: [PATCH] Add foss games & fix pinentry --- flake.lock | 82 +++++++++++++++++------------------ home-mods/desktop/default.nix | 3 ++ home-mods/shell/default.nix | 1 + os-mods/common/default.nix | 1 + 4 files changed, 46 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index 578c23d..273334c 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1710717798, - "narHash": "sha256-KrZbpo83wnKbUXy0hnmENJTNy/mOCF3Un+nml67e+dU=", + "lastModified": 1710897688, + "narHash": "sha256-gEVR6wNoXYyeqLGsIP1J4ip3AUWee08Wr+bW46Dtz5k=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "cd5052eba475afc01072ebc239896a68edc17f95", + "rev": "10ab84ad5dee3669f6152d92713e4d9ce8689241", "type": "github" }, "original": { @@ -113,11 +113,11 @@ ] }, "locked": { - "lastModified": 1710562188, - "narHash": "sha256-KHlb4sK9fvp+9DoYWHLyaegoeLV7w8s7CsNMmNlKu1U=", + "lastModified": 1710602287, + "narHash": "sha256-6hjHSfH3jfTDxD6hELL7RGoqv2pnyVAtS81H5Le6qkk=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "8d8467a4eafd264adb9c710e0638c08ae547dec4", + "rev": "930bf3891c5a1279b23e16f3f10ce02c47b9b4cb", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1710724748, - "narHash": "sha256-aXlifKr6Brg0SBUBgRNEBaZf3JLUeGhM9BX2gam+vvo=", + "lastModified": 1710906792, + "narHash": "sha256-kFzpfZcInLhBFWHy452NlvFuzNr0BDEkz3w9Sgg2ypo=", "owner": "nix-community", "repo": "disko", - "rev": "c09c3a9639690f94ddff44c3dd25c85602e5aeb2", + "rev": "e9875b969086a53dff5ec4677575ad3156fc875d", "type": "github" }, "original": { @@ -177,11 +177,11 @@ ] }, "locked": { - "lastModified": 1710751845, - "narHash": "sha256-ZQTjdec8ucZEBrVcNe39ViHZ2A9LxhJHlOwvNMZ4//0=", + "lastModified": 1710922545, + "narHash": "sha256-5ZxDaXR0/wTfY3AEvD2+nXIhhzQfty6PtJosH/75iBQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8505f2676daa4c5387df15472bf1baaf72af12f5", + "rev": "44817d1f0a8150bafa1b5516d7896234ea867236", "type": "github" }, "original": { @@ -199,11 +199,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1709593798, - "narHash": "sha256-vuYPYV5A98ge3iw/bCEN1s5rOTE96O4ult9Noydjv9k=", + "lastModified": 1710843407, + "narHash": "sha256-PUCgqRuQ1tSM5eZIDZS+DnxuYpwdL+8xxSuFFvSocQI=", "owner": "Mic92", "repo": "envfs", - "rev": "141f1146a826094568069e9b9027c7738b6babfe", + "rev": "746b633ff25ff7302ace47a0d4bfd1e935f4d5f7", "type": "github" }, "original": { @@ -303,11 +303,11 @@ ] }, "locked": { - "lastModified": 1698882062, - "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -529,11 +529,11 @@ ] }, "locked": { - "lastModified": 1710714957, - "narHash": "sha256-eZCxuF58YWgaJMMRrn8oRkwRhxooe5kBS/s2wRVr9PA=", + "lastModified": 1710820906, + "narHash": "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=", "owner": "nix-community", "repo": "home-manager", - "rev": "7b3fca5adcf6c709874a8f2e0c364fe9c58db989", + "rev": "022464438a85450abb23d93b91aa82e0addd71fb", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1710563757, - "narHash": "sha256-H5SZIo7O4zg/NqSdM71V2gYH4ex5WbBf6s9ue5s4nL4=", + "lastModified": 1710753783, + "narHash": "sha256-Av5QpYJvJYNefRCKhsOfSzTBaqQ2o+rj60/NVzGytOQ=", "owner": "martinvonz", "repo": "jj", - "rev": "8600750fceafbf489d42a99b36b1f48bbc1e416b", + "rev": "54bb3b4114b1ee7fcd01e47553803f157c3635f5", "type": "github" }, "original": { @@ -806,12 +806,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710631334, - "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", - "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", - "revCount": 598085, + "lastModified": 1710806803, + "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", + "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", + "revCount": 598982, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.598085%2Brev-c75037bbf9093a2acb617804ee46320d6d1fea5a/018e4cfd-3f0a-7531-8a72-60a3a8a3d087/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.598982%2Brev-b06025f1533a1e07b6db3e75151caa155d1c7eb3/018e577a-86bd-7b2f-b434-442e9ada5378/source.tar.gz" }, "original": { "type": "tarball", @@ -870,11 +870,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1710701596, - "narHash": "sha256-v4lsAi3vE/sEWg0G8AydMjs3NTHlsNw8K01xw06cKLg=", + "lastModified": 1710827359, + "narHash": "sha256-/KY8hffTh9SN/tTcDn/FrEiYwTXnU8NKnr4D7/stmmA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "34ad8c9f29a18b4dd97a9ad40ceb16954f24afe7", + "rev": "5710127d9693421e78cca4f74fac2db6d67162b1", "type": "github" }, "original": { @@ -934,11 +934,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1710631334, - "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", + "lastModified": 1710806803, + "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", + "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ }, "nur": { "locked": { - "lastModified": 1710750753, - "narHash": "sha256-MQ5haKyTNKAFTw3oDaShLHiECiD5DVV4HfmzN3l77Yk=", + "lastModified": 1710923589, + "narHash": "sha256-lKYSsx0BQbcXVZf14vpf2yD7r7pakHQ7173pxXmgvk4=", "owner": "nix-community", "repo": "NUR", - "rev": "05351320d5ece2eb43cbd991edd4d1f56f5ca17f", + "rev": "6b42f9fe3099d436ada62d4e41a36673caa10bbf", "type": "github" }, "original": { @@ -1229,11 +1229,11 @@ ] }, "locked": { - "lastModified": 1699786194, - "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=", + "lastModified": 1710781103, + "narHash": "sha256-nehQK/XTFxfa6rYKtbi8M1w+IU1v5twYhiyA4dg1vpg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1", + "rev": "7ee5aaac63c30d3c97a8c56efe89f3b2aa9ae564", "type": "github" }, "original": { diff --git a/home-mods/desktop/default.nix b/home-mods/desktop/default.nix index 23f987b..d590090 100644 --- a/home-mods/desktop/default.nix +++ b/home-mods/desktop/default.nix @@ -39,6 +39,7 @@ in element-desktop inkscape jellyfin-mpv-shim + libsForQt5.kasts # miraclecast kate kdenlive @@ -53,6 +54,8 @@ in signal-desktop tutanota-desktop webcord-vencord + tome4 + shattered-pixel-dungeon ]; }; } diff --git a/home-mods/shell/default.nix b/home-mods/shell/default.nix index ecc4259..b59dc76 100644 --- a/home-mods/shell/default.nix +++ b/home-mods/shell/default.nix @@ -154,6 +154,7 @@ in enableExtraSocket = true; enableSshSupport = true; + pinentryPackage = lib.mkForce pkgs.pinentry-qt; }; lorri.enable = true; diff --git a/os-mods/common/default.nix b/os-mods/common/default.nix index 71c052f..b240ced 100644 --- a/os-mods/common/default.nix +++ b/os-mods/common/default.nix @@ -137,6 +137,7 @@ gnupg.agent = { enable = true; enableSSHSupport = true; + pinentryPackage = lib.mkForce pkgs.pinentry-qt; }; };