From 70d953b18cdf6daf1942a2448be85be732414029 Mon Sep 17 00:00:00 2001 From: Menno van Leeuwen Date: Fri, 27 Dec 2024 11:02:45 +0100 Subject: [PATCH 1/3] add ddrescue to home packages for data recovery --- config/home-manager/packages/server/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/home-manager/packages/server/packages.nix b/config/home-manager/packages/server/packages.nix index 32297e4..f293108 100644 --- a/config/home-manager/packages/server/packages.nix +++ b/config/home-manager/packages/server/packages.nix @@ -1,4 +1,4 @@ { pkgs, ... }: { - home.packages = with pkgs; [ ]; + home.packages = with pkgs; [ ddrescue ]; } From a480aa58040d10bd9e45f50ed4bb2f5b0afd3667 Mon Sep 17 00:00:00 2001 From: Menno van Leeuwen Date: Fri, 27 Dec 2024 11:03:42 +0100 Subject: [PATCH 2/3] refactor hyprland configuration to use external monitors.local.conf for monitor settings --- config/hyprland.conf | 3 +-- config/monitors.local.conf | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 config/monitors.local.conf diff --git a/config/hyprland.conf b/config/hyprland.conf index a55571a..aa28d08 100644 --- a/config/hyprland.conf +++ b/config/hyprland.conf @@ -6,8 +6,7 @@ ################ # See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=eDP-1, highrr, 0x0, 1 -monitor=DP-2, highrr, 2560x0, 1 +source = /home/menno/dotfiles/config/monitors.local.conf ################### diff --git a/config/monitors.local.conf b/config/monitors.local.conf new file mode 100644 index 0000000..7bbf9ce --- /dev/null +++ b/config/monitors.local.conf @@ -0,0 +1,5 @@ +# See https://wiki.hyprland.org/Configuring/Monitors/ +# 5120x1440 at 240hz left monitor +monitor=DP-2, highrr, 0x0, 1 +# 3440x1440 at 120hz right monitor portrait mode +monitor=DP-3, highrr, 5120x-1440, 1, transform, 3 \ No newline at end of file From 65c42118e2a25b64456a4d4bc078590a391cf242 Mon Sep 17 00:00:00 2001 From: Menno van Leeuwen Date: Fri, 27 Dec 2024 12:35:51 +0100 Subject: [PATCH 3/3] add Whatsie Flatpak reference; update flake.lock for nixpkgs and hyprland; enable NTFS support in ZFS configuration --- config/autostart/ulauncher.desktop | 2 +- .../flatpaks/com.ktechpit.whatsie.flatpakref | 10 ++++++++++ config/home-manager/flake.lock | 6 +++--- config/nixos/flake.lock | 18 +++++++++--------- config/nixos/hardware/mennos-server/zfs.nix | 5 ++++- 5 files changed, 27 insertions(+), 14 deletions(-) create mode 100644 config/flatpaks/com.ktechpit.whatsie.flatpakref diff --git a/config/autostart/ulauncher.desktop b/config/autostart/ulauncher.desktop index 0b71532..829e188 120000 --- a/config/autostart/ulauncher.desktop +++ b/config/autostart/ulauncher.desktop @@ -1 +1 @@ -/nix/store/nqbwwlvirdq4xc9n2x9rmkb8bv885n39-home-manager-files/.config/autostart/ulauncher.desktop \ No newline at end of file +/nix/store/c9d6gxqsxdxk6fki5844wv0c6yrx86n1-home-manager-files/.config/autostart/ulauncher.desktop \ No newline at end of file diff --git a/config/flatpaks/com.ktechpit.whatsie.flatpakref b/config/flatpaks/com.ktechpit.whatsie.flatpakref new file mode 100644 index 0000000..03829a0 --- /dev/null +++ b/config/flatpaks/com.ktechpit.whatsie.flatpakref @@ -0,0 +1,10 @@ +[Flatpak Ref] +Name=com.ktechpit.whatsie +Branch=stable +Title=com.ktechpit.whatsie from flathub +IsRuntime=false +Url=https://dl.flathub.org/repo/ +SuggestRemoteName=flathub +GPGKey=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 +RuntimeRepo=https://dl.flathub.org/repo/flathub.flatpakrepo + diff --git a/config/home-manager/flake.lock b/config/home-manager/flake.lock index a1b2dab..4a79d92 100644 --- a/config/home-manager/flake.lock +++ b/config/home-manager/flake.lock @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734875076, - "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", + "lastModified": 1735141468, + "narHash": "sha256-VIAjBr1qGcEbmhLwQJD6TABppPMggzOvqFsqkDoMsAY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1807c2b91223227ad5599d7067a61665c52d1295", + "rev": "4005c3ff7505313cbc21081776ad0ce5dfd7a3ce", "type": "github" }, "original": { diff --git a/config/nixos/flake.lock b/config/nixos/flake.lock index 4f85f1e..05326c1 100644 --- a/config/nixos/flake.lock +++ b/config/nixos/flake.lock @@ -145,11 +145,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1734988658, - "narHash": "sha256-SSPQCHeqMRsR6rhONWFAHDMtQ5NEKnU8G2BktlDwIoY=", + "lastModified": 1735209119, + "narHash": "sha256-zarY0tzIHyWcaImbIJOYRbBbHdLRdNDkRfOmzPVapRk=", "owner": "hyprwm", "repo": "hyprland", - "rev": "2e2e2e2cad97eb017ab02f8a67b751e0abe3bb72", + "rev": "e75e2cdac79417ffdbbbe903f72668953483a4e7", "type": "github" }, "original": { @@ -175,11 +175,11 @@ ] }, "locked": { - "lastModified": 1734887159, - "narHash": "sha256-boPq+l4/D/Q+MvDqAI79fCdp/3Dit57YBuPbXa1cjW0=", + "lastModified": 1735295819, + "narHash": "sha256-iHDDF1kj+wX7fHGTgKaM6rli6+O8mVFNmpypo+SgnNs=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "859b9cd371b4e1bf1043cedc8ab6c514e13ab358", + "rev": "a41bcdccac7d3fe220b3a8519633f0a812da3439", "type": "github" }, "original": { @@ -371,11 +371,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734875076, - "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", + "lastModified": 1735141468, + "narHash": "sha256-VIAjBr1qGcEbmhLwQJD6TABppPMggzOvqFsqkDoMsAY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1807c2b91223227ad5599d7067a61665c52d1295", + "rev": "4005c3ff7505313cbc21081776ad0ce5dfd7a3ce", "type": "github" }, "original": { diff --git a/config/nixos/hardware/mennos-server/zfs.nix b/config/nixos/hardware/mennos-server/zfs.nix index 58a1297..e0c3f1c 100644 --- a/config/nixos/hardware/mennos-server/zfs.nix +++ b/config/nixos/hardware/mennos-server/zfs.nix @@ -60,7 +60,10 @@ in }; # Enable ZFS support - boot.supportedFilesystems = [ "zfs" ]; + boot.supportedFilesystems = [ + "ntfs" + "zfs" + ]; # ZFS system services services.zfs = {