From 331bc69af452a303156b835c6d430e86eb9902e5 Mon Sep 17 00:00:00 2001 From: m3tam3re Date: Thu, 1 Jun 2023 11:23:52 +0200 Subject: [PATCH] 23-05 release update --- flake.lock | 42 +++++++++++++------------- home/features/desktop/plasma.nix | 11 ++++++- home/features/gaming/default.nix | 2 ++ hosts/lkk-nix-1/services/syncthing.nix | 19 +++++------- hosts/lkk-prod-1/default.nix | 2 +- hosts/lkk-prod-2/default.nix | 2 +- 6 files changed, 43 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 176bb1f..30d50c8 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1685189510, - "narHash": "sha256-Hq5WF7zIixojPgvhgcd6MBvywwycVZ9wpK/8ogOyoaA=", + "lastModified": 1685573051, + "narHash": "sha256-zrpbdQVJFpNVFK3SlA6mE0le8qnKjUjcuY4OzL+wSHw=", "owner": "nix-community", "repo": "home-manager", - "rev": "2d963854ae2499193c0c72fd67435fee34d3e4fd", + "rev": "3876cc613ac3983078964ffb5a0c01d00028139e", "type": "github" }, "original": { @@ -127,11 +127,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1685346756, - "narHash": "sha256-pZNHeNkBBgi5o2DOT1T8MPHnrpJN+eEfYeqdg2ASjZA=", + "lastModified": 1685560280, + "narHash": "sha256-OA2oyvNcJRCo4JS/CqqVlR76TNprLcXK4ZuRffoE8+8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "b3a86952cf14b6f556159eb898eaa7b6ceac4335", + "rev": "e76bd43f53197af2c64608ba6b0792326e79db07", "type": "github" }, "original": { @@ -148,11 +148,11 @@ ] }, "locked": { - "lastModified": 1681065697, - "narHash": "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=", + "lastModified": 1684265364, + "narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "4d29e48433270a2af06b8bc711ca1fe5109746cd", + "rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1683014792, - "narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=", + "lastModified": 1685383865, + "narHash": "sha256-3uQytfnotO6QJv3r04ajSXbEFMII0dUtw0uqYlZ4dbk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42", + "rev": "5e871d8aa6f57cc8e0dc087d1c5013f6e212b4ce", "type": "github" }, "original": { @@ -211,11 +211,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1685290091, - "narHash": "sha256-GGQYNZ7POoqPTtXgPOLUuSiHkOKFRWYpCoWUOSeSRoU=", + "lastModified": 1685383865, + "narHash": "sha256-3uQytfnotO6QJv3r04ajSXbEFMII0dUtw0uqYlZ4dbk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4e37b4e55b60fb7d43d2b62deb51032a489bcbe8", + "rev": "5e871d8aa6f57cc8e0dc087d1c5013f6e212b4ce", "type": "github" }, "original": { @@ -253,11 +253,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1682436395, - "narHash": "sha256-GGEjkQO9m7YLYIXIXM76HWdhjg4Ye+oafOtyaFAYKI4=", + "lastModified": 1685491729, + "narHash": "sha256-YfpP8tKpcr0Lxlr3PdoMaY3GD/uJRl6E5pp5KQCEuzg=", "owner": "wlroots", "repo": "wlroots", - "rev": "6830bfc17fd94709e2cdd4da0af989f102a26e59", + "rev": "3f0487d310974f6ff889ca80e4fb4005553814ed", "type": "gitlab" }, "original": { @@ -279,11 +279,11 @@ ] }, "locked": { - "lastModified": 1682439384, - "narHash": "sha256-zHDa8LCZs05TZHQSIZ3ucwyMPglBGHcqTBzfkLjYXTM=", + "lastModified": 1685385764, + "narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "c0e233955568fbea4e859336f6d3d14d51294d7c", + "rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1", "type": "github" }, "original": { diff --git a/home/features/desktop/plasma.nix b/home/features/desktop/plasma.nix index fe5d451..3c22271 100644 --- a/home/features/desktop/plasma.nix +++ b/home/features/desktop/plasma.nix @@ -3,6 +3,15 @@ # ]; - home.packages = with pkgs; [ alacritty brave libreoffice nextcloud-client ]; + home.packages = with pkgs; [ + alacritty + brave + libreoffice + nextcloud-client + xclip + libnotify + espanso + firefox + ]; services.espanso.enable = true; } diff --git a/home/features/gaming/default.nix b/home/features/gaming/default.nix index 0de9bb8..8ba5d35 100644 --- a/home/features/gaming/default.nix +++ b/home/features/gaming/default.nix @@ -7,6 +7,8 @@ gamescope goverlay mangohud + yuzu-early-access + ryujinx protontricks protonup-ng winetricks diff --git a/hosts/lkk-nix-1/services/syncthing.nix b/hosts/lkk-nix-1/services/syncthing.nix index 95563fa..566dddf 100644 --- a/hosts/lkk-nix-1/services/syncthing.nix +++ b/hosts/lkk-nix-1/services/syncthing.nix @@ -5,18 +5,15 @@ guiAddress = "0.0.0.0:8384"; overrideDevices = true; overrideFolders = true; - settings = { - devices = { - "LK-DATA" = { - id = - "BI7CMZF-2SGQMXW-RG47HRG-FEH454J-ZTCE544-BXNSCSJ-PXCE7A7-R4CX2Q3"; - }; + devices = { + "LK-DATA" = { + id = "BI7CMZF-2SGQMXW-RG47HRG-FEH454J-ZTCE544-BXNSCSJ-PXCE7A7-R4CX2Q3"; }; - folders = { - "Bildvorschauen" = { - path = "/opt/service-data/http-images"; - devices = [ "LK-DATA" ]; - }; + }; + folders = { + "Bildvorschauen" = { + path = "/opt/service-data/http-images"; + devices = [ "LK-DATA" ]; }; }; }; diff --git a/hosts/lkk-prod-1/default.nix b/hosts/lkk-prod-1/default.nix index e763e6e..7821f95 100644 --- a/hosts/lkk-prod-1/default.nix +++ b/hosts/lkk-prod-1/default.nix @@ -27,7 +27,7 @@ }; services.openssh = { enable = true; - permitRootLogin = "yes"; + settings.PermitRootLogin = "yes"; }; services.avahi = { enable = true; diff --git a/hosts/lkk-prod-2/default.nix b/hosts/lkk-prod-2/default.nix index 16c0f0a..838fa5d 100644 --- a/hosts/lkk-prod-2/default.nix +++ b/hosts/lkk-prod-2/default.nix @@ -27,7 +27,7 @@ }; services.openssh = { enable = true; - permitRootLogin = "yes"; + settings.PermitRootLogin = "yes"; }; services.avahi = { enable = true;