diff --git a/configuration.nix b/configuration.nix index 8beb409..eb8495f 100644 --- a/configuration.nix +++ b/configuration.nix @@ -168,6 +168,7 @@ in }; virtualisation.docker.enable = true; + services.gvfs.enable = true; services.goxlr-utility.enable = true; services.lact.enable = true; services.rsync.enable = true; @@ -179,6 +180,10 @@ in programs.git = { enable = true; config = { + signing = { + key = "51AE8C6E80E6AF3BDFBE2BF804B31D181764898D"; + signByDefault = true; + }; user = { name = "KeksNino"; email = "KeksNino@proton.me"; @@ -189,17 +194,37 @@ in push = { autoSetupRemote = true; }; + commit = { + gpgsign = true; + }; + tag = { + gpgsign = true; + }; }; }; + programs.gnupg.agent = { + enable = true; + pinentryPackage = pkgs.pinentry-curses; + }; + + # programs.steam = { + # enable = true; + # package = pkgs.millennium-steam.override { + # extraEnv = { + # LD_AUDIT = "${ + # sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam + # }/library-inject.so:${ + # sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam + # }/SLSsteam.so"; + # }; + # }; + # }; + programs.steam = { enable = true; package = pkgs.millennium-steam.override { extraEnv = { - LD_AUDIT = "${ - sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam - }/library-inject.so:${ - sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam - }/SLSsteam.so"; + LD_AUDIT = "/home/user/Downloads/SLSsteam 20260722152506/bin/library-inject.so:/home/user/Downloads/SLSsteam 20260722152506/bin/SLSsteam.so"; }; }; }; diff --git a/flake.lock b/flake.lock index 75f1f4a..bebbc73 100644 --- a/flake.lock +++ b/flake.lock @@ -77,11 +77,11 @@ ] }, "locked": { - "lastModified": 1784926331, - "narHash": "sha256-EiyJny6oq41fes/x+vWmmzlbjZxwy+8TtbaQqKXyRgY=", + "lastModified": 1785085647, + "narHash": "sha256-VerKUIpQHGnXgpmRXzh767X0BJNjpACWdVp391t8n1s=", "owner": "rPlakama", "repo": "gsr-ui-nix", - "rev": "e463d47ca8724de7a83c394d9e323c6d9c449508", + "rev": "1f9a46bcdde0e805ced86a0e995f1449f8f7a12f", "type": "github" }, "original": { @@ -97,11 +97,11 @@ ] }, "locked": { - "lastModified": 1784913159, - "narHash": "sha256-JWq0BfjO4ktpH5USfQNQzdvHpIDT8fSKD5K7LvdMRFs=", + "lastModified": 1785239295, + "narHash": "sha256-aYFoftXjm7Df7CAoR0XoMQjJ9rTZ/l9d1jr9EqD7sHM=", "owner": "nix-community", "repo": "home-manager", - "rev": "079a3b5d1aa6a719920a51316253b7d6dd22738d", + "rev": "42bb40f7aaab63a107b64a20c4a4ade6550758d0", "type": "github" }, "original": { @@ -138,11 +138,11 @@ }, "locked": { "dir": "packages/nix", - "lastModified": 1784860807, - "narHash": "sha256-nznQFS9H8er9bTwxKG4LSa2D0lGsxIPUqDuWa1rbJkA=", + "lastModified": 1785163789, + "narHash": "sha256-nHTGaYBPKqOY4SPTqRJNX8MfV/GuIjgPCUxDHHeinGc=", "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "266e41ea8924c41e51145ae986a9bdf68f9415d9", + "rev": "1375ceda332171907e64e9a9324f9a869f715d6c", "type": "github" }, "original": { @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1784440659, - "narHash": "sha256-Q5kNLlWngt7TaIIZoxDKWMHjiSaNRVqr70FqWCRRfr4=", + "lastModified": 1785046085, + "narHash": "sha256-UiK+mmZJuLWQVhJ5b2wDzogIYWAesyRm6LA3h3Ulh3Y=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "4f8d52a3598b0dc7db7a5e7b419e3edd9d1ecfdb", + "rev": "11665045df8b9938ef811a3bfdc65cffb02b4b70", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1784992771, - "narHash": "sha256-xEE5I69+WNqcs7Z0v5D9xwcHYRbvC8k/fKBmlUBdCp4=", + "lastModified": 1785239275, + "narHash": "sha256-T/qG4MmyCmFzqo9YMQwkjK7va3Tukr2OZI4xkcUSCqQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "37bfb33419c6e367e8bb6f44041eaecf953b5236", + "rev": "f536d5c00cd7ad28be33108ec9d67fe50b28e2a2", "type": "github" }, "original": { @@ -290,11 +290,11 @@ ] }, "locked": { - "lastModified": 1784993591, - "narHash": "sha256-4/evHMKmkO482OWfvaPk4uwyvUJxrJWcxXhNHqMQbDU=", + "lastModified": 1785240175, + "narHash": "sha256-mv6ZTvqozDYvs8aygyo0q76kWoi+7mcLWFijWVDknCU=", "owner": "noctalia-dev", "repo": "noctalia", - "rev": "62975eea9ea64171c35382d904c7564cd3d4077b", + "rev": "c73f168db529b0a5a37e3c13442637848b71658a", "type": "github" }, "original": { @@ -345,11 +345,11 @@ ] }, "locked": { - "lastModified": 1784795486, - "narHash": "sha256-0tdz12pbTWs+V7eIMpv6foT/qN4B1tuxs5LLc8b3A5M=", + "lastModified": 1785224226, + "narHash": "sha256-Aj0ZA0boiYSPrvN+5ECpcYmx8OFEF+M1OoVY7ko0H/E=", "owner": "AceSLS", "repo": "SLSsteam", - "rev": "6725ff148090976a32cb4b717c1acfe48f95b48f", + "rev": "4f7b79143a47a8ecb97c323745c7593d55fd6f20", "type": "github" }, "original": { @@ -433,11 +433,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1784975066, - "narHash": "sha256-EoSjKF8AMBbtupTmen2n+CEJnWVW2ynSYIMNHYTTT2s=", + "lastModified": 1785208381, + "narHash": "sha256-oHCAhBClJmg2XTKwHNAyfTLnUXpwPk0Qq4oc3UiYgBA=", "owner": "sxyazi", "repo": "yazi", - "rev": "533d1aa3fbb9b388745c72d34d377ff8e8326d84", + "rev": "e58022b9aafc8dabf586e2cc29b79a230071716f", "type": "github" }, "original": { @@ -452,11 +452,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1784985989, - "narHash": "sha256-Mz4G81HXJlUtHoJtA31D+Ob7uma2BX7E/y7F9QazuFc=", + "lastModified": 1785224333, + "narHash": "sha256-8DNJUVM10ktK02V9ZIV064CH+fuPF272VCAZBn6arig=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a8f9b6d014c9cfe0615dccb2bc7808713f6e62c2", + "rev": "5f1a4be4d280e1ae06d61a75775a234b1714da3f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2363909..36da0c3 100644 --- a/flake.nix +++ b/flake.nix @@ -59,6 +59,9 @@ nix-index-database.nixosModules.default { nixpkgs.overlays = [ + (final: prev: { + samrewritten = final.callPackage ./package.nix {}; + }) yazi.overlays.default millennium.overlays.default ]; diff --git a/home-manager/home.nix b/home-manager/home.nix index 1a34e05..c603755 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -98,6 +98,7 @@ programs.rofi.enable = true; programs.rofi.plugins = [ pkgs.rofi-calc ]; + services.polkit-gnome.enable = true; services.cliphist.enable = true; programs.btop.enable = true; services.udiskie.enable = true; diff --git a/package.nix b/package.nix new file mode 100644 index 0000000..5cdf679 --- /dev/null +++ b/package.nix @@ -0,0 +1,71 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, + # Deps + gdk-pixbuf, + glib, + graphene, + gtk4, + openssl, + pango, + pkg-config, + wrapGAppsHook4, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "samrewritten"; + version = "1.4.5"; + + src = fetchFromGitHub { + owner = "PaulCombal"; + repo = "SamRewritten"; + tag = "v${finalAttrs.version}"; + hash = "sha256-sSZC7yN/WuMYkdcPmHyvasaWRFzppSxmlS1bYLZGvyM="; + }; + + cargoHash = "sha256-YKiICPP6z9lZWqdoPOYRq+0mmz7jY3/eJd7XzN8Vmnk="; + + # Tests require network access and a running Steam client. Skipping. + doCheck = false; + + nativeBuildInputs = [ + glib + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + gdk-pixbuf + glib + graphene + gtk4 + openssl + pango + ]; + + postInstall = '' + install -Dm644 assets/org.samrewritten.SamRewritten.gschema.xml \ + $out/share/glib-2.0/schemas/org.samrewritten.SamRewritten.gschema.xml + glib-compile-schemas $out/share/glib-2.0/schemas + cat package/samrewritten.desktop + substituteInPlace package/samrewritten.desktop \ + --replace-fail "Exec=/usr/bin/samrewritten" "Exec=samrewritten" + install -Dm644 package/samrewritten.desktop \ + $out/share/applications/samrewritten.desktop + ''; + + env.PKG_CONFIG_PATH = "${openssl.dev}/lib/pkgconfig"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Modern Steam achievements manager for Windows and Linux"; + mainProgram = "samrewritten"; + homepage = "https://github.com/PaulCombal/SamRewritten"; + changelog = "https://github.com/PaulCombal/SamRewritten/releases"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ludovicopiero ]; + platforms = [ "x86_64-linux" ]; + }; +})