From ab042e03aa6ac979aa362aeba4e52b526d51fe97 Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Thu, 17 Oct 2024 18:41:10 +0100 Subject: [PATCH] Update Signed-off-by: Nikolaos Karaolidis --- flake.lock | 48 +++++++++---------- .../user/configs/gui/hyprland/default.nix | 2 +- .../user/configs/gui/qalculate/default.nix | 8 ---- .../gui/qalculate/skip-save-prefs.patch | 12 ----- lib/runtime/merge/default.nix | 2 +- lib/runtime/merge/key-value.sh | 18 +++---- submodules/home-manager | 2 +- submodules/nixpkgs | 2 +- 8 files changed, 34 insertions(+), 60 deletions(-) delete mode 100644 hosts/common/user/configs/gui/qalculate/skip-save-prefs.patch diff --git a/flake.lock b/flake.lock index 5e4364d..ecd9af8 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1727303518, - "narHash": "sha256-lO5JMynTxNZxg/+E4/Y9reeLGIz/M8cEue+Re4cP6qo=", + "lastModified": 1728326430, + "narHash": "sha256-tV1ABHuA1HItMdCTuNdA8fMB+qw7LpjvI945VwMSABI=", "owner": "Aylur", "repo": "ags", - "rev": "cd543afec4d9ed708990e5ba52184716809bf248", + "rev": "60180a184cfb32b61a1d871c058b31a3b9b0743d", "type": "github" }, "original": { @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1727359191, - "narHash": "sha256-5PltTychnExFwzpEnY3WhOywaMV/M6NxYI/y3oXuUtw=", + "lastModified": 1729099656, + "narHash": "sha256-VftVIg7UXTy1bq+tzi1aVYOWl7PQ35IpjW88yMYjjpc=", "owner": "nix-community", "repo": "disko", - "rev": "67dc29be3036cc888f0b9d4f0a788ee0f6768700", + "rev": "d7d57edb72e54891fa67a6f058a46b2bb405663b", "type": "github" }, "original": { @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1727420285, - "narHash": "sha256-p2C3NnsEQsT2cXJO0lilpYHrlbzE2NcTWlL6Tl1X73o=", + "lastModified": 1729177935, + "narHash": "sha256-PQBo+i+6xgaIIcCjR07GWZMxKoqNQTdQN0vy70p7uXc=", "owner": "karaolidis", "repo": "home-manager", - "rev": "c95de330277971e3954361199e049b0e38e8d441", + "rev": "3dd31bacce71de29154846f16cb51babd34cc874", "type": "github" }, "original": { @@ -98,11 +98,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727422092, - "narHash": "sha256-Toi/8GtCF9e0/ll+YKa1vH/hcoAgkWWapYZSGwdUPAM=", + "lastModified": 1729177931, + "narHash": "sha256-YVOMGa7ba02vUYNXxaSKzF1CAhzXR0oXBMVvo9fiZ2I=", "owner": "karaolidis", "repo": "nixpkgs", - "rev": "5ed1bb3fd1ded8e903d88f074615c35afeb4dc67", + "rev": "cfed8f19ed5d7f322b804d399a931db401eb2a2d", "type": "github" }, "original": { @@ -114,11 +114,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1725762081, - "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", + "lastModified": 1728156290, + "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", + "rev": "17ae88b569bb15590549ff478bab6494dde4a907", "type": "github" }, "original": { @@ -130,11 +130,11 @@ }, "nur": { "locked": { - "lastModified": 1727418871, - "narHash": "sha256-6pEpm13GAZD+1bJ+7x6skh4RBg+rogBSrP+XmH53Zxc=", + "lastModified": 1729176336, + "narHash": "sha256-9LwEGXAOIWbkeWYW3YHZ38WeC+4M3ZSF+6nlxS4lzUs=", "owner": "nix-community", "repo": "NUR", - "rev": "7741866413a6f232cc763b740d7e02a9cafa9b54", + "rev": "40f931587d8108e5737da3ab0dc69ffaf81fef41", "type": "github" }, "original": { @@ -163,11 +163,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1726524647, - "narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=", + "lastModified": 1728345710, + "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e2d404a7ea599a013189aa42947f66cede0645c8", + "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", "type": "github" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1727410670, - "narHash": "sha256-DI22QeBUBIHQQi5XCLq9tmy4z1IPiDD8IpnHVfBL0EM=", + "lastModified": 1729138662, + "narHash": "sha256-MYK8as0ltXcyPqisP9vl9VxAImAT1WrkEMnspgV5MRg=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "cc02909bbfaa51dfe5849cf6997cd2fd0492e972", + "rev": "f5bb3bd8cb92ee6a37510be477cbfb2fd6a682c1", "type": "github" }, "original": { diff --git a/hosts/common/user/configs/gui/hyprland/default.nix b/hosts/common/user/configs/gui/hyprland/default.nix index 69309c0..b4160c9 100644 --- a/hosts/common/user/configs/gui/hyprland/default.nix +++ b/hosts/common/user/configs/gui/hyprland/default.nix @@ -133,7 +133,7 @@ programs.zsh.loginExtra = lib.mkAfter '' if [ -z "$WAYLAND_DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq 1 ]; then - hyprland &> /tmp/hyprland.log + Hyprland &> /tmp/hyprland.log fi ''; diff --git a/hosts/common/user/configs/gui/qalculate/default.nix b/hosts/common/user/configs/gui/qalculate/default.nix index e3bc936..ca4bbb8 100644 --- a/hosts/common/user/configs/gui/qalculate/default.nix +++ b/hosts/common/user/configs/gui/qalculate/default.nix @@ -9,14 +9,6 @@ ... }: { - nixpkgs.overlays = [ - (final: prev: { - qalculate-gtk = prev.qalculate-gtk.overrideAttrs (oldAttrs: { - patches = oldAttrs.patches or [ ] ++ [ ./skip-save-prefs.patch ]; - }); - }) - ]; - environment.persistence."/cache"."${home}/.config/qalculate/qalculate-gtk.history" = { }; home-manager.users.${user} = { diff --git a/hosts/common/user/configs/gui/qalculate/skip-save-prefs.patch b/hosts/common/user/configs/gui/qalculate/skip-save-prefs.patch deleted file mode 100644 index f94bb22..0000000 --- a/hosts/common/user/configs/gui/qalculate/skip-save-prefs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/callbacks.cc b/src/callbacks.cc -index 14ab38a..5f73451 100644 ---- a/src/callbacks.cc -+++ b/src/callbacks.cc -@@ -23405,6 +23405,7 @@ bool save_history(bool allow_cancel) { - */ - - bool save_preferences(bool mode, bool allow_cancel) { -+ return true; - - FILE *file = NULL; - string homedir = getLocalDir(); diff --git a/lib/runtime/merge/default.nix b/lib/runtime/merge/default.nix index ae4daec..b94869b 100644 --- a/lib/runtime/merge/default.nix +++ b/lib/runtime/merge/default.nix @@ -4,8 +4,8 @@ pkgs.writeShellApplication { name = "merge-key-value"; runtimeInputs = with pkgs; [ - gnugrep coreutils + gawk ]; text = builtins.readFile ./key-value.sh; } diff --git a/lib/runtime/merge/key-value.sh b/lib/runtime/merge/key-value.sh index 68ba02a..001538f 100644 --- a/lib/runtime/merge/key-value.sh +++ b/lib/runtime/merge/key-value.sh @@ -1,19 +1,13 @@ SOURCE_FILE=$(realpath -m "$1") TARGET_FILE=$(realpath -m "$2") -mkdir -p "$(dirname "${TARGET_FILE}")" - -TEMP_FILE=$(mktemp) -cat "${SOURCE_FILE}" > "${TEMP_FILE}" - if [[ -f "${TARGET_FILE}" ]]; then - while IFS='=' read -r key value; do - if ! grep -q "^${key}=" "${TEMP_FILE}"; then - echo "${key}=${value}" >> "${TEMP_FILE}" - fi - done < "${TARGET_FILE}" + TEMP_FILE=$(mktemp) + awk -F '=' 'NR==FNR{a[$1]=$0;next}($1 in a){$0=a[$1]}1' "${SOURCE_FILE}" "${TARGET_FILE}" > "${TEMP_FILE}" + mv "${TEMP_FILE}" "${TARGET_FILE}" +else + mkdir -p "$(dirname "${TARGET_FILE}")" + cp "${SOURCE_FILE}" "${TARGET_FILE}" fi -mv "${TEMP_FILE}" "${TARGET_FILE}" - echo "Configuration file ${TARGET_FILE} has been updated." diff --git a/submodules/home-manager b/submodules/home-manager index c95de33..3dd31ba 160000 --- a/submodules/home-manager +++ b/submodules/home-manager @@ -1 +1 @@ -Subproject commit c95de330277971e3954361199e049b0e38e8d441 +Subproject commit 3dd31bacce71de29154846f16cb51babd34cc874 diff --git a/submodules/nixpkgs b/submodules/nixpkgs index 5ed1bb3..cfed8f1 160000 --- a/submodules/nixpkgs +++ b/submodules/nixpkgs @@ -1 +1 @@ -Subproject commit 5ed1bb3fd1ded8e903d88f074615c35afeb4dc67 +Subproject commit cfed8f19ed5d7f322b804d399a931db401eb2a2d