From 9c164c7b92eacf134bb4220b0e01f378067d8a35 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 2 Oct 2023 00:03:36 +0000 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/ae896c810f501bf0c3a2fd7fc2de094dd0addf01' (2023-09-30) → 'github:nix-community/home-manager/6f9b5b83ad1f470b3d11b8a9fe1d5ef68c7d0e30' (2023-10-01) • Updated input 'hyprland': 'github:hyprwm/Hyprland/a2a29a60e5301df2cadf58c1bb18495d02710547' (2023-09-30) → 'github:hyprwm/Hyprland/9ec656a37df103edc111e8e48cdfe89528dfe92e' (2023-10-01) • Updated input 'nixos-hardware': 'github:nixos/nixos-hardware/adcfd6aa860d1d129055039696bc457af7d50d0e' (2023-09-28) → 'github:nixos/nixos-hardware/0ab3ee718e964fb42dc57ace6170f19cb0b66532' (2023-10-01) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2' (2023-09-27) → 'github:nixos/nixpkgs/f5892ddac112a1e9b3612c39af1b72987ee5783a' (2023-09-29) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/bedaae13271fd5cfd861698e591d6af7104174e4' (2023-09-30) → 'github:nix-community/nixpkgs-wayland/047ac635a222c9d6e38c61d10d3c5703954ad78c' (2023-10-01) • Updated input 'nixpkgs-wayland/lib-aggregate': 'github:nix-community/lib-aggregate/cb8bfd550aaaf32a330c1c8870a3d9a5bfa00954' (2023-09-24) → 'github:nix-community/lib-aggregate/273cc814826475216b2a8aa008697b939e784514' (2023-10-01) • Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib': 'github:nix-community/nixpkgs.lib/01fc4cd75e577ac00e7c50b7e5f16cd9b6d633e8' (2023-09-24) → 'github:nix-community/nixpkgs.lib/56992d3dfd3b8cee5c5b5674c1a477446839b6ad' (2023-10-01) • Updated input 'nur': 'github:nix-community/NUR/02ba0aeaddf56c02b8030f81d765e8de3d342f5b' (2023-09-30) → 'github:nix-community/NUR/72619f85c0eeec8864f0c365932e39e8935a5b93' (2023-10-01) • Updated input 'rustup-overlay': 'github:oxalica/rust-overlay/a4c3c904ab29e04a20d3a6da6626d66030385773' (2023-09-30) → 'github:oxalica/rust-overlay/fc6fe50d9a4540a1111731baaa00f207301fdeb7' (2023-10-01) --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index af464fe21..36b6f9855 100644 --- a/flake.lock +++ b/flake.lock @@ -540,11 +540,11 @@ ] }, "locked": { - "lastModified": 1696063111, - "narHash": "sha256-F2IJEbyH3xG0eqyAYn9JoV+niqNz+xb4HICYNkkviNI=", + "lastModified": 1696145345, + "narHash": "sha256-3dM7I/d4751SLPJah0to1WBlWiyzIiuCEUwJqwBdmr4=", "owner": "nix-community", "repo": "home-manager", - "rev": "ae896c810f501bf0c3a2fd7fc2de094dd0addf01", + "rev": "6f9b5b83ad1f470b3d11b8a9fe1d5ef68c7d0e30", "type": "github" }, "original": { @@ -564,11 +564,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1696090070, - "narHash": "sha256-f6/USsOSdb/niLroIh2Xr1ihlDXJnznJ5+D+SgTrnME=", + "lastModified": 1696165790, + "narHash": "sha256-18Yt3o3sjieqgOSjUXW8Apn6JuHLTKEJDt5k40sAf2A=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "a2a29a60e5301df2cadf58c1bb18495d02710547", + "rev": "9ec656a37df103edc111e8e48cdfe89528dfe92e", "type": "github" }, "original": { @@ -655,11 +655,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1695557304, - "narHash": "sha256-HYoJE+KE6/zGHgRI496n9E1abDFaqsl9EnEfGIEEqLo=", + "lastModified": 1696162106, + "narHash": "sha256-72gAqduG8CpBFWchiO4DxZClux5HAti4frrrYGr/5xo=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "cb8bfd550aaaf32a330c1c8870a3d9a5bfa00954", + "rev": "273cc814826475216b2a8aa008697b939e784514", "type": "github" }, "original": { @@ -785,11 +785,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1695887975, - "narHash": "sha256-u3+5FR12dI305jCMb0fJNQx2qwoQ54lv1tPoEWp0hmg=", + "lastModified": 1696161939, + "narHash": "sha256-HI1DxS//s46/qv9dcW06TzXaBjxL2DVTQP8R1QsnHzM=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "adcfd6aa860d1d129055039696bc457af7d50d0e", + "rev": "0ab3ee718e964fb42dc57ace6170f19cb0b66532", "type": "github" }, "original": { @@ -822,11 +822,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695830400, - "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", + "lastModified": 1696019113, + "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", + "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", "type": "github" }, "original": { @@ -854,11 +854,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1695516402, - "narHash": "sha256-pL7m8iu1OLs/7ywhh+Q8ltPgmtwbMpi7484yr32zgYI=", + "lastModified": 1696121361, + "narHash": "sha256-sstnEW0Qwqo3MHmy1In/hJHjypfsSDlnhegNKw5eplk=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "01fc4cd75e577ac00e7c50b7e5f16cd9b6d633e8", + "rev": "56992d3dfd3b8cee5c5b5674c1a477446839b6ad", "type": "github" }, "original": { @@ -909,11 +909,11 @@ ] }, "locked": { - "lastModified": 1696040396, - "narHash": "sha256-2EOjJ5bgjCmDso2shw70AiL6wsegbEs8KlMJk2sgHek=", + "lastModified": 1696202053, + "narHash": "sha256-C4J08y/QO/2uDsAjf0Qx2+ud5fwbjLQaK/cts9ByOz8=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "bedaae13271fd5cfd861698e591d6af7104174e4", + "rev": "047ac635a222c9d6e38c61d10d3c5703954ad78c", "type": "github" }, "original": { @@ -976,11 +976,11 @@ }, "nur": { "locked": { - "lastModified": 1696112267, - "narHash": "sha256-49s4Pm+H1/7D8RBuhKBFfnfauSIF0GteMwsDRLJmbdw=", + "lastModified": 1696203921, + "narHash": "sha256-qbrXHUJna2+5dJFSo8+0Db6cW4wgEix32SGh36dZPYI=", "owner": "nix-community", "repo": "NUR", - "rev": "02ba0aeaddf56c02b8030f81d765e8de3d342f5b", + "rev": "72619f85c0eeec8864f0c365932e39e8935a5b93", "type": "github" }, "original": { @@ -1116,11 +1116,11 @@ ] }, "locked": { - "lastModified": 1696039808, - "narHash": "sha256-7TbAr9LskWG6ISPhUdyp6zHboT7FsFrME5QsWKybPTA=", + "lastModified": 1696126582, + "narHash": "sha256-uo4cn/d2rHPy/fpKZKFBOaVO531zs/Doxz43imrpqZM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a4c3c904ab29e04a20d3a6da6626d66030385773", + "rev": "fc6fe50d9a4540a1111731baaa00f207301fdeb7", "type": "github" }, "original": { From b5933b561dee9c3a8aa18797d55b93d605239241 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 1 Oct 2023 21:13:19 -0500 Subject: [PATCH 2/3] fix: broken / disabled packages --- modules/nixos/desktop/addons/qt/default.nix | 8 -------- modules/nixos/suites/business/default.nix | 1 - modules/nixos/suites/development/default.nix | 3 ++- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/modules/nixos/desktop/addons/qt/default.nix b/modules/nixos/desktop/addons/qt/default.nix index 13bdaa78b..1c2df9776 100644 --- a/modules/nixos/desktop/addons/qt/default.nix +++ b/modules/nixos/desktop/addons/qt/default.nix @@ -34,18 +34,10 @@ in accent = "Blue"; variant = "Macchiato"; }) - # TODO: get qt5 and qt6 to work together properly with sddm and xdph - libsForQt5.qt5.qtgraphicaleffects - libsForQt5.qt5.qtquickcontrols2 - libsForQt5.qt5.qtsvg libsForQt5.qt5ct libsForQt5.qtstyleplugin-kvantum qt6Packages.qt6ct qt6Packages.qtstyleplugin-kvantum - # qt6.full - # qt6.qtsvg - # qt6.qtquick3d - # qt6.qtwayland ] ++ lib.optional config.khanelinix.suites.wlroots.enable libsForQt5.qt5.qtwayland; }; diff --git a/modules/nixos/suites/business/default.nix b/modules/nixos/suites/business/default.nix index 29b3c8b07..a83622fc0 100644 --- a/modules/nixos/suites/business/default.nix +++ b/modules/nixos/suites/business/default.nix @@ -18,7 +18,6 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ libreoffice - teams ]; khanelinix = { diff --git a/modules/nixos/suites/development/default.nix b/modules/nixos/suites/development/default.nix index 7bf7c3d76..0e9f549b0 100644 --- a/modules/nixos/suites/development/default.nix +++ b/modules/nixos/suites/development/default.nix @@ -56,7 +56,8 @@ in environment.systemPackages = with pkgs; [ github-desktop onefetch - qtcreator + # FIX: broken package + # qtcreator neovide vscode ] ++ lib.optionals cfg.nixEnable [ From 16aff5c532ad67d5f868a74de1bf5166aa43b83e Mon Sep 17 00:00:00 2001 From: khaneliman Date: Mon, 2 Oct 2023 02:14:04 +0000 Subject: [PATCH 3/3] Remove dead code --- overlays/yabai/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlays/yabai/default.nix b/overlays/yabai/default.nix index 9559ae363..bbdee28c1 100644 --- a/overlays/yabai/default.nix +++ b/overlays/yabai/default.nix @@ -1,4 +1,4 @@ -{ channels, ... }: (_final: prev: +{ channels, ... }: (_final: _prev: { inherit (channels.nixpkgs-khanelinix) yabai; })