From e307a12d77d00e71f9e07e4db8ea65df62f84b51 Mon Sep 17 00:00:00 2001 From: Patrick Date: Wed, 23 Oct 2024 14:44:05 +0200 Subject: [PATCH] update --- config/basic/boot.nix | 2 +- config/basic/nix.nix | 1 - config/optional/wayland.nix | 1 + flake.lock | 68 ++++++++++----------- hosts/elisabeth/guests.nix | 8 ++- pkgs/signal-to-blog.nix | 9 +-- users/common/graphical/wayland/hyprland.nix | 7 +++ users/patrick/impermanence.nix | 4 ++ 8 files changed, 59 insertions(+), 41 deletions(-) diff --git a/config/basic/boot.nix b/config/basic/boot.nix index 1efda23..48b5fca 100644 --- a/config/basic/boot.nix +++ b/config/basic/boot.nix @@ -9,7 +9,7 @@ initrd.systemd = { enable = true; emergencyAccess = config.secrets.secrets.global.users.root.passwordHash; - extraBin.ip = "${pkgs.iproute}/bin/ip"; + extraBin.ip = "${pkgs.iproute2}/bin/ip"; extraBin.cryptsetup = "${pkgs.cryptsetup}/bin/cryptsetup"; users.root.shell = "${pkgs.bashInteractive}/bin/bash"; storePaths = [ "${pkgs.bashInteractive}/bin/bash" ]; diff --git a/config/basic/nix.nix b/config/basic/nix.nix index 9853f0f..7aca18f 100644 --- a/config/basic/nix.nix +++ b/config/basic/nix.nix @@ -6,7 +6,6 @@ allowed-users = [ "@wheel" ]; trusted-users = [ "root" - "@wheel" ]; system-features = [ "recursive-nix" diff --git a/config/optional/wayland.nix b/config/optional/wayland.nix index 3514f33..429413f 100644 --- a/config/optional/wayland.nix +++ b/config/optional/wayland.nix @@ -9,6 +9,7 @@ lib.optionalAttrs (!minimal) { environment.systemPackages = with pkgs; [ wdisplays wl-clipboard + wev ]; xdg.portal = { enable = true; diff --git a/flake.lock b/flake.lock index e8ecaa0..cf85bfb 100644 --- a/flake.lock +++ b/flake.lock @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1729281548, - "narHash": "sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw=", + "lastModified": 1729588208, + "narHash": "sha256-PNONdMd+sG7JWzNIDerX7oVZXL8FTVlSAZ1BmUo2HjE=", "owner": "nix-community", "repo": "disko", - "rev": "a6a3179ddf396dfc28a078e2f169354d0c137125", + "rev": "4be2aadf13b67ffbb993deb73adff77c46b728fc", "type": "github" }, "original": { @@ -892,11 +892,11 @@ ] }, "locked": { - "lastModified": 1729321331, - "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=", + "lastModified": 1729551526, + "narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=", "owner": "nix-community", "repo": "home-manager", - "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68", + "rev": "5ec753a1fc4454df9285d8b3ec0809234defb975", "type": "github" }, "original": { @@ -995,11 +995,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1728821524, - "narHash": "sha256-Tc4g0n0WxGLLUJYJwrhSE3/l05xUcREEx9y+R4Gi4RA=", + "lastModified": 1729426412, + "narHash": "sha256-VGbpECf35W4LtWLfx2+ue8zZEPwKQnadJadlT8E1Ceo=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "8921856c37862428741a29cfd4c98c4893ca407d", + "rev": "736c43de3c953104e1610183d56e90b419c6344e", "type": "github" }, "original": { @@ -1116,11 +1116,11 @@ ] }, "locked": { - "lastModified": 1728790083, - "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=", + "lastModified": 1729394935, + "narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22", + "rev": "04f8a11f247ba00263b060fbcdc95484fd046104", "type": "github" }, "original": { @@ -1152,11 +1152,11 @@ }, "nixlib": { "locked": { - "lastModified": 1728781282, + "lastModified": 1729386149, "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "16340f605f4e8e5cf07fd74dcbe692eee2d4f51b", + "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e", "type": "github" }, "original": { @@ -1197,11 +1197,11 @@ ] }, "locked": { - "lastModified": 1729127034, - "narHash": "sha256-42AMGl+dh4I2wGgICSeDI1mqYaDEJhwqquHJ1vA0QiQ=", + "lastModified": 1729472750, + "narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "dd28a0806e7124fe392c33c9ccaa12f21970401f", + "rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565", "type": "github" }, "original": { @@ -1212,11 +1212,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1729333370, - "narHash": "sha256-NU+tYe3QWzDNpB8RagpqR3hNQXn4BNuBd7ZGosMHLL8=", + "lastModified": 1729509737, + "narHash": "sha256-8OHgqz+tFo21h3hg4/GHizFPws+MMzpEru/+62Z0E8c=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb", + "rev": "cc2d3c0e060f981905d52337340ee6ec8b8eb037", "type": "github" }, "original": { @@ -1276,11 +1276,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1728781282, + "lastModified": 1729386149, "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "16340f605f4e8e5cf07fd74dcbe692eee2d4f51b", + "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e", "type": "github" }, "original": { @@ -1395,11 +1395,11 @@ ] }, "locked": { - "lastModified": 1729330084, - "narHash": "sha256-3lGZyrHLmCSXcFEv1th04j/+2CUMzNDvQdbqXHMBqfM=", + "lastModified": 1729600663, + "narHash": "sha256-vAGqZXf1dsrBkElJzKHn2dZKVBBcw8Uw1P/me+m0+tE=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "349ce1dcf7ce051dccb7432f950203117f5995f4", + "rev": "9447d21fa4f6d5c0d0d385ef09511c1f71b240a5", "type": "github" }, "original": { @@ -1410,11 +1410,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "lastModified": 1729413321, + "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", "type": "github" }, "original": { @@ -1471,11 +1471,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1729332380, - "narHash": "sha256-ePzkpRV4zYR9cO1o5HrYuZRmoEthsPgNP0cvRGlHSro=", + "lastModified": 1729602958, + "narHash": "sha256-eKGQKlj1oShfR6uqE1RjB4CgQ3DBrMS4VPrGPDKq1J4=", "owner": "nix-community", "repo": "nixvim", - "rev": "e3239b4d328efaaf090892fbca71a1008dbc5a59", + "rev": "b076f006c6b0cc6644a651bd21d4449cc3e7e56d", "type": "github" }, "original": { @@ -1722,11 +1722,11 @@ ] }, "locked": { - "lastModified": 1729311378, - "narHash": "sha256-EJieGv/hQr3EIo5hEvYHjvi8dMZc8fdT1nXrq6I0Ob0=", + "lastModified": 1729570661, + "narHash": "sha256-gZj1hMVvZjE4inSUElqQuA9iiUioB/zIqgl0i3XcliU=", "owner": "Gerg-l", "repo": "spicetify-nix", - "rev": "3dd5c8c33ee1b8d20d855e9fa425361719931b04", + "rev": "96cf0aad6fe67a31567a51e54dc6b9fcbe90626a", "type": "github" }, "original": { diff --git a/hosts/elisabeth/guests.nix b/hosts/elisabeth/guests.nix index e90756f..02568bb 100644 --- a/hosts/elisabeth/guests.nix +++ b/hosts/elisabeth/guests.nix @@ -177,7 +177,13 @@ in } (blockOf "vaultwarden" { maxBodySize = "1G"; }) (blockOf "forgejo" { maxBodySize = "1G"; }) - (blockOf "immich" { maxBodySize = "5G"; }) + (blockOf "immich" { + maxBodySize = "5G"; + virtualHostExtraConfig = '' + proxy_buffering off; + proxy_request_buffering off; + ''; + }) (proxyProtect "adguardhome" { } true) (proxyProtect "oauth2-proxy" { } false) (blockOf "paperless" { maxBodySize = "5G"; }) diff --git a/pkgs/signal-to-blog.nix b/pkgs/signal-to-blog.nix index f04535e..a953aa5 100644 --- a/pkgs/signal-to-blog.nix +++ b/pkgs/signal-to-blog.nix @@ -1,13 +1,14 @@ -{ rustPlatform, fetchgit, }: +{ rustPlatform, fetchgit }: rustPlatform.buildRustPackage { name = "signal-to-blog"; src = fetchgit { url = "https://forge.lel.lol/patrick/signal-to-blog.git"; - rev = "b2c44e90030b1333e20012641904080def43b6dd"; - hash = "sha256-H846+65ImZqbUHt91xc8GCcNszXMnvTi+4jAs+JYLLA="; + rev = "280acaa8b03fb15d84ba594f1dd7f5c28aa1c2c1"; + hash = "sha256-ZoQUlR+qsBE9AP8s1kh5KyGmtWQQ0KSYakaxgUegSZ4="; }; - cargoHash = "sha256-0LLSxVpql6bFoSS3hsns5JuptJCmn4LxKjG7clPDrm8="; + cargoHash = "sha256-q9r1VeRQ5HOmBdst58MgS+hdyEXHIdncqV1v3OTmQv8="; + meta.mainProgram = "signal-to-blog"; } diff --git a/users/common/graphical/wayland/hyprland.nix b/users/common/graphical/wayland/hyprland.nix index cbc816d..7c3ecba 100644 --- a/users/common/graphical/wayland/hyprland.nix +++ b/users/common/graphical/wayland/hyprland.nix @@ -69,6 +69,10 @@ in scroll_factor = 0.7; }; }; + device = { + name = "xp-pen-g430s-pen"; + active_area_size = "48 27"; + }; gestures = { workspace_swipe = true; }; @@ -233,6 +237,9 @@ in ]; } (mkIf (nixosConfig.node.name == "desktopnix") { + input.tablet = { + output = "DP-3"; + }; monitor = [ "DVI-D-1,preferred,0x0,1" "HDMI-A-1,preferred,0x1080,1" diff --git a/users/patrick/impermanence.nix b/users/patrick/impermanence.nix index 10a4dea..9fa89ee 100644 --- a/users/patrick/impermanence.nix +++ b/users/patrick/impermanence.nix @@ -26,6 +26,10 @@ ".config/Mullvad VPN" + ".local/share/osu" + + ".config/obs-studio" + # For nextcloud client install "Nextcloud" ".config/Nextcloud"