From 3b5045660c16a6b51b7d0fe69c23d485dbbbe218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= Date: Fri, 26 Apr 2024 20:26:34 +0200 Subject: [PATCH] update system --- flake.lock | 48 +++++++++---------- .../desktops/hyprland/default.nix | 2 +- modules/home-manager/packages/default.nix | 2 +- .../home-manager/packages/threema-desktop.nix | 8 ---- 4 files changed, 26 insertions(+), 34 deletions(-) delete mode 100644 modules/home-manager/packages/threema-desktop.nix diff --git a/flake.lock b/flake.lock index eaf0c94..442f929 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1711099426, - "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=", + "lastModified": 1713532798, + "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", "owner": "numtide", "repo": "devshell", - "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8", + "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1713294767, - "narHash": "sha256-LmaabaQZdx52MPGKPRt9Opoc9Gd9RbwvCdysUUYQoXI=", + "lastModified": 1714042918, + "narHash": "sha256-4AItZA3EQIiSNAxliuYEJumw/LaVfrMv84gYyrs0r3U=", "owner": "nix-community", "repo": "home-manager", - "rev": "fa8c16e2452bf092ac76f09ee1fb1e9f7d0796e7", + "rev": "0c5704eceefcb7bb238a958f532a86e3b59d76db", "type": "github" }, "original": { @@ -201,11 +201,11 @@ ] }, "locked": { - "lastModified": 1712989663, - "narHash": "sha256-r2X/DIAyKOLiHoncjcxUk1TENWDTTaigRBaY53Cts/w=", + "lastModified": 1713992342, + "narHash": "sha256-bW7K4WPo6jhYMo4ZUGoJfog6xJV0XZh8adXqZKunRoc=", "owner": "nix-community", "repo": "home-manager", - "rev": "40ab43ae98cb3e6f07eaeaa3f3ed56d589da21b0", + "rev": "2f072c127c041eec36621b8e38a531fe0fe07961", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1711763326, - "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", + "lastModified": 1713946171, + "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", + "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", "type": "github" }, "original": { @@ -273,11 +273,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1713248628, - "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", + "lastModified": 1714076141, + "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", + "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", "type": "github" }, "original": { @@ -300,11 +300,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1713294906, - "narHash": "sha256-xJJZdCBzVFpVppaYyUK4lTTNOnbAxrjhodoJL3Oi91E=", + "lastModified": 1714142618, + "narHash": "sha256-0ijCe5k7Q569PO/hP/yryh9aB33zJyjs4NKbPQxVW8c=", "owner": "nix-community", "repo": "nixvim", - "rev": "514a51877df9fe41ffc38c5237e3c4e5327e7607", + "rev": "0fc190144f9acf72ae8705ea304577e90389da20", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nur": { "locked": { - "lastModified": 1713341079, - "narHash": "sha256-DcLm3kt047X7ys563bWaIj08qakVEA27WECR/F/Zz/k=", + "lastModified": 1714153552, + "narHash": "sha256-+3CdMPm0E4fExxj3xZ8nZY/TW/Tc0BczK4DopNdr6gY=", "owner": "nix-community", "repo": "NUR", - "rev": "6bb5fc99b448bb7d2dd9bd3e9fc94facba074592", + "rev": "8f0f28c3bf4fb66368ecf10fd742a44c7f816d35", "type": "github" }, "original": { @@ -343,11 +343,11 @@ ] }, "locked": { - "lastModified": 1712897695, - "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "lastModified": 1713954846, + "narHash": "sha256-RWFafuSb5nkWGu8dDbW7gVb8FOQOPqmX/9MlxUUDguw=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "rev": "6fb82e44254d6a0ece014ec423cb62d92435336f", "type": "github" }, "original": { diff --git a/modules/home-manager/desktops/hyprland/default.nix b/modules/home-manager/desktops/hyprland/default.nix index ebe43d8..fad818d 100644 --- a/modules/home-manager/desktops/hyprland/default.nix +++ b/modules/home-manager/desktops/hyprland/default.nix @@ -204,7 +204,7 @@ }; qt = { enable = true; - platformTheme = "qtct"; + platformTheme.name = "qtct"; }; home = { diff --git a/modules/home-manager/packages/default.nix b/modules/home-manager/packages/default.nix index 249e44e..72d1ee2 100644 --- a/modules/home-manager/packages/default.nix +++ b/modules/home-manager/packages/default.nix @@ -26,7 +26,7 @@ #bitwarden # chat apps - (import ./threema-desktop.nix { inherit pkgs; }) + threema-desktop (vesktop.override { withSystemVencord = false; }) element-desktop diff --git a/modules/home-manager/packages/threema-desktop.nix b/modules/home-manager/packages/threema-desktop.nix deleted file mode 100644 index edfd48e..0000000 --- a/modules/home-manager/packages/threema-desktop.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ pkgs }: -pkgs.threema-desktop.overrideAttrs (prev: { - postFixup = - prev.postFixup - + '' - echo "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" >> $out/bin/threema - ''; -})