diff --git a/flake.lock b/flake.lock index ecd9af8..90de3d5 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1729099656, - "narHash": "sha256-VftVIg7UXTy1bq+tzi1aVYOWl7PQ35IpjW88yMYjjpc=", + "lastModified": 1729281548, + "narHash": "sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw=", "owner": "nix-community", "repo": "disko", - "rev": "d7d57edb72e54891fa67a6f058a46b2bb405663b", + "rev": "a6a3179ddf396dfc28a078e2f169354d0c137125", "type": "github" }, "original": { @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1729177935, - "narHash": "sha256-PQBo+i+6xgaIIcCjR07GWZMxKoqNQTdQN0vy70p7uXc=", + "lastModified": 1729507872, + "narHash": "sha256-5ChymD+5No/9lt1b4C3nlDigKLLyelcWy5KhgutbK2g=", "owner": "karaolidis", "repo": "home-manager", - "rev": "3dd31bacce71de29154846f16cb51babd34cc874", + "rev": "44e29caf69a545978e6018c6df42ac0bc228df0d", "type": "github" }, "original": { @@ -98,11 +98,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729177931, - "narHash": "sha256-YVOMGa7ba02vUYNXxaSKzF1CAhzXR0oXBMVvo9fiZ2I=", + "lastModified": 1729507870, + "narHash": "sha256-m/kt901Md6uYHdLSFqGNvYFKd3cYbNlQsunip7pqTMQ=", "owner": "karaolidis", "repo": "nixpkgs", - "rev": "cfed8f19ed5d7f322b804d399a931db401eb2a2d", + "rev": "ba1134c0cd1f0b06f6607747db0bcbeaac4cfe3f", "type": "github" }, "original": { @@ -114,11 +114,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728156290, - "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", + "lastModified": 1729357638, + "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17ae88b569bb15590549ff478bab6494dde4a907", + "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22", "type": "github" }, "original": { @@ -130,11 +130,11 @@ }, "nur": { "locked": { - "lastModified": 1729176336, - "narHash": "sha256-9LwEGXAOIWbkeWYW3YHZ38WeC+4M3ZSF+6nlxS4lzUs=", + "lastModified": 1729491640, + "narHash": "sha256-k2mR4w+yvko/JsWaH+1fIqjWRFixEs+jv/lNw8qnfkQ=", "owner": "nix-community", "repo": "NUR", - "rev": "40f931587d8108e5737da3ab0dc69ffaf81fef41", + "rev": "41ca6cfe238fdfab2831386c5a65f5c0a01e1cfd", "type": "github" }, "original": { @@ -163,11 +163,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1728345710, - "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", + "lastModified": 1729394972, + "narHash": "sha256-fADlzOzcSaGsrO+THUZ8SgckMMc7bMQftztKFCLVcFI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", + "rev": "c504fd7ac946d7a1b17944d73b261ca0a0b226a5", "type": "github" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1729138662, - "narHash": "sha256-MYK8as0ltXcyPqisP9vl9VxAImAT1WrkEMnspgV5MRg=", + "lastModified": 1729484282, + "narHash": "sha256-VnLaP3OH9rP/+5ZuEsETSyyKtBif5l3mNL3YOxPhBVo=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "f5bb3bd8cb92ee6a37510be477cbfb2fd6a682c1", + "rev": "7dcfbba64faedd15574e6df5d89b2bcf5bb20128", "type": "github" }, "original": { diff --git a/hosts/common/user/configs/gui/gtk/default.nix b/hosts/common/user/configs/gui/gtk/default.nix index 9f807a5..a7c8c28 100644 --- a/hosts/common/user/configs/gui/gtk/default.nix +++ b/hosts/common/user/configs/gui/gtk/default.nix @@ -77,7 +77,10 @@ in lib.meta.getExe ( pkgs.writeShellApplication { name = "theme-gtk"; - runtimeInputs = with pkgs; [ dconf ]; + runtimeInputs = with pkgs; [ + dbus + dconf + ]; text = '' MODE=$(cat "${hmConfig.theme.configDir}/mode") @@ -87,8 +90,16 @@ in GTK_THEME="adw-gtk3-dark" fi - dconf write /org/gnome/desktop/interface/gtk-theme "'$GTK_THEME'" - dconf write /org/gnome/desktop/interface/color-scheme "'prefer-$MODE'" + if [[ -v DBUS_SESSION_BUS_ADDRESS ]]; then + DCONF_DBUS_RUN_SESSION="" + else + DCONF_DBUS_RUN_SESSION="dbus-run-session --dbus-daemon=dbus-daemon" + fi + + $DCONF_DBUS_RUN_SESSION bash -c " + dconf write /org/gnome/desktop/interface/gtk-theme "'$GTK_THEME'" + dconf write /org/gnome/desktop/interface/color-scheme "'prefer-$MODE'" + " ''; } ) diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/custom-sort/default.nix b/hosts/common/user/configs/gui/obsidian/config/plugins/custom-sort/default.nix index 428b78d..46a2832 100644 --- a/hosts/common/user/configs/gui/obsidian/config/plugins/custom-sort/default.nix +++ b/hosts/common/user/configs/gui/obsidian/config/plugins/custom-sort/default.nix @@ -1,13 +1,13 @@ { pkgs, ... }: pkgs.stdenv.mkDerivation rec { pname = "obsidian.plugins.custom-sort"; - version = "2.1.12"; + version = "2.1.14"; src = pkgs.fetchFromGitHub { owner = "SebastianMC"; repo = "obsidian-custom-sort"; rev = version; - hash = "sha256-i+Ckh1sqUqFGY5xPQLOCd0sq9kmxsN276wLbhEMAt5g="; + hash = "sha256-DM2aKCsFC2Z4a/ZX95ZMBzshBx2C2Z8a7j94ABS2UGI="; }; offlineCache = pkgs.fetchYarnDeps { diff --git a/submodules/home-manager b/submodules/home-manager index 3dd31ba..44e29ca 160000 --- a/submodules/home-manager +++ b/submodules/home-manager @@ -1 +1 @@ -Subproject commit 3dd31bacce71de29154846f16cb51babd34cc874 +Subproject commit 44e29caf69a545978e6018c6df42ac0bc228df0d diff --git a/submodules/nixpkgs b/submodules/nixpkgs index cfed8f1..ba1134c 160000 --- a/submodules/nixpkgs +++ b/submodules/nixpkgs @@ -1 +1 @@ -Subproject commit cfed8f19ed5d7f322b804d399a931db401eb2a2d +Subproject commit ba1134c0cd1f0b06f6607747db0bcbeaac4cfe3f