From b7151f1feb31813625b48b66cf8c8a87523bdd82 Mon Sep 17 00:00:00 2001
From: DashieTM <fabio.lenherr@gmail.com>
Date: Fri, 7 Jun 2024 00:28:40 +0200
Subject: [PATCH] chore: change name to ReSet to avoid conflicts

---
 .github/workflows/release.yml | 12 +++++++-----
 PKGBUILD                      |  2 +-
 flake.nix                     |  8 ++++----
 nix/default.nix               |  8 ++++----
 nix/hm.nix                    |  8 ++++----
 reset.desktop                 |  2 +-
 6 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7929546..173e7e0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,7 +12,9 @@ jobs:
           profile: minimal
           toolchain: nightly
       - name: Build rust package
-        run: cargo build --release --verbose
+        run: |
+          cargo build --release --verbose
+          mv ./target/release/reset ./target/release/ReSet
       - name: Build Flatpak
         run: "cd flatpak\npython3 flatpak-generator.py ../Cargo.lock -o cargo-sources.json \nflatpak-builder build org.Xetibo.ReSet.json --force-clean \nflatpak build-export export build\nflatpak build-bundle export reset.flatpak org.Xetibo.ReSet\n"
       - name: Build Ubuntu package
@@ -22,15 +24,15 @@ jobs:
           mkdir -p ./debian/usr/share
           mkdir -p ./debian/usr/share/applications
           mkdir -p ./debian/usr/share/pixmaps
-          cp ./target/release/reset ./debian/usr/bin/.
+          cp ./target/release/ReSet ./debian/usr/bin/ReSet
           cp ./reset.desktop ./debian/usr/share/applications/.
           cp ./src/resources/icons/ReSet.svg ./debian/usr/share/pixmaps/.
           dpkg-deb --build debian
-          mv debian.deb reset.deb
+          mv debian.deb ReSet.deb
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
           files: |
-            target/release/reset
+            target/release/ReSet
             flatpak/reset.flatpak
-            reset.deb
+            ReSet.deb
diff --git a/PKGBUILD b/PKGBUILD
index 1871a64..0538a7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ build() {
 
 package() {
 	cd ..
-	install -Dm755 target/release/"$pkgname" "$pkgdir"/usr/bin/"$pkgname"
+	install -Dm755 target/release/"$pkgname" "$pkgdir"/usr/bin/ReSet
 	install -Dm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
 	install -Dm644 "src/resources/icons/ReSet.svg" "$pkgdir/usr/share/pixmaps/ReSet.svg"
 }
diff --git a/flake.nix b/flake.nix
index 9b92f41..3f1fe32 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,15 +47,15 @@
               lockFile = ./Cargo.lock;
             in
             rec {
-              reset = pkgs.callPackage ./nix/default.nix { inherit inputs lockFile; };
-              default = reset;
+              ReSet = pkgs.callPackage ./nix/default.nix { inherit inputs lockFile; };
+              default = ReSet;
             };
         };
       flake = _: rec {
         nixosModules.home-manager = homeManagerModules.default;
         homeManagerModules = rec {
-          reset = import ./nix/hm.nix inputs.self;
-          default = reset;
+          ReSet = import ./nix/hm.nix inputs.self;
+          default = ReSet;
         };
       };
     };
diff --git a/nix/default.nix b/nix/default.nix
index 23adde3..27dcb9d 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -19,7 +19,7 @@ let
   cargoToml = builtins.fromTOML (builtins.readFile ../Cargo.toml);
 in
 rustPlatform.buildRustPackage rec {
-  pname = cargoToml.package.name;
+  pname = "ReSet";
   version = cargoToml.package.version;
 
   src = ../.;
@@ -50,8 +50,8 @@ rustPlatform.buildRustPackage rec {
   copyLibs = true;
 
   postInstall = ''
-    	install -D --mode=444 $src/${pname}.desktop $out/share/applications/${pname}.desktop
-    	install -D --mode=444 $src/src/resources/icons/ReSet.svg $out/share/pixmaps/ReSet.svg
+    	install -D --mode=444 $src/reset.desktop $out/share/applications/reset.desktop
+    	install -D --mode=444 $src/src/resources/icons/${pname}.svg $out/share/pixmaps/${pname}.svg
   '';
 
   # test is broken in nix for some reason
@@ -64,6 +64,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/Xetibo/ReSet/releases/tag/${version}";
     license = licenses.gpl3;
     maintainers = with maintainers; [ DashieTM ];
-    mainProgram = "reset";
+    mainProgram = "ReSet";
   };
 }
diff --git a/nix/hm.nix b/nix/hm.nix
index a5e8bd6..dbd3438 100644
--- a/nix/hm.nix
+++ b/nix/hm.nix
@@ -5,19 +5,19 @@ self: { config
       , ...
       }:
 let
-  cfg = config.programs.reset;
+  cfg = config.programs.ReSet;
   defaultPackage = self.packages.${pkgs.stdenv.hostPlatform.system}.default;
 in
 {
   meta.maintainers = with lib.maintainers; [ DashieTM ];
-  options.programs.reset = with lib; {
-    enable = mkEnableOption "reset";
+  options.programs.ReSet = with lib; {
+    enable = mkEnableOption "ReSet";
 
     package = mkOption {
       type = with types; nullOr package;
       default = defaultPackage;
       defaultText = lib.literalExpression ''
-        reset.packages.''${pkgs.stdenv.hostPlatform.system}.default
+        ReSet.packages.''${pkgs.stdenv.hostPlatform.system}.default
       '';
       description = mdDoc ''
         Package to run
diff --git a/reset.desktop b/reset.desktop
index fd723ca..54736bb 100644
--- a/reset.desktop
+++ b/reset.desktop
@@ -2,7 +2,7 @@
 Name=ReSet
 GenericName=SettingsApplication
 GenericName[de]=SettingsApplikation
-Exec=reset
+Exec=ReSet
 Terminal=false
 Type=Application
 Keywords=settings;gtk;