From 384092291c166e5c4bca2807bc28f67306f5f277 Mon Sep 17 00:00:00 2001 From: installer Date: Thu, 22 May 2025 18:07:57 +0200 Subject: [PATCH] =?UTF-8?q?dodanie=20wrappera=20do=20scp.=20wywalenie=20cr?= =?UTF-8?q?ystala=20w=20pizdu.=20Pr=C3=B3ba=20dodania=20autosugestii=20do?= =?UTF-8?q?=20silnika=20wyszukiwania.=20Aktualizacja=20zale=C5=BCno=C5=9Bc?= =?UTF-8?q?i.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 68 ++++++---------- hosts/garand-laptop/config/nixpkgs.nix | 6 -- hosts/garand-laptop/config/nixpkgs/gaming.nix | 1 - .../garand-laptop/home/programs.librewolf.nix | 1 + hosts/garand-laptop/home/programs.nix | 1 + packages/crystal-launcher.nix | 78 ------------------- 6 files changed, 26 insertions(+), 129 deletions(-) delete mode 100644 packages/crystal-launcher.nix diff --git a/flake.lock b/flake.lock index a2814bc..be12fca 100644 --- a/flake.lock +++ b/flake.lock @@ -95,11 +95,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1747195422, - "narHash": "sha256-tr4ATmqPQ+9LtFtfTLfugSXcsXcow8T6PJvidCeAnwg=", + "lastModified": 1747800214, + "narHash": "sha256-4zStSk4O6GT0kZhN/zERhMHbcJnwFtYt3rM01t6gNhA=", "owner": "rycee", "repo": "nur-expressions", - "rev": "7f04c28c17c2c84404e4cdf9e7d371a7f65becc9", + "rev": "54be6f6687f510002f7a1e6c3583278d989f3833", "type": "gitlab" }, "original": { @@ -144,7 +144,6 @@ "inputs": { "nixpkgs-lib": [ "stylix", - "nur", "nixpkgs" ] }, @@ -162,27 +161,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": [ - "stylix", - "systems" - ] - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -250,16 +228,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1732369855, - "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", + "lastModified": 1744584021, + "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "dadd58f630eeea41d645ee225a63f719390829dc", + "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", "type": "github" }, "original": { "owner": "GNOME", - "ref": "47.2", + "ref": "48.1", "repo": "gnome-shell", "type": "github" } @@ -271,11 +249,11 @@ ] }, "locked": { - "lastModified": 1747225851, - "narHash": "sha256-4IbmZrNOdXP143kZEUzxBS5SqyxUlaSHLgdpeJfP2ZU=", + "lastModified": 1747875884, + "narHash": "sha256-tdVx4kghhdy62LKuTnwE2RytOe8o88tah/yhpyuL0D4=", "owner": "nix-community", "repo": "home-manager", - "rev": "6bf057fc8326e83bda05a669fc08d106547679fb", + "rev": "f9186c64fcc6ee5f0114547acf9e814c806a640b", "type": "github" }, "original": { @@ -287,11 +265,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746904237, - "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -303,7 +281,10 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts", + "flake-parts": [ + "stylix", + "flake-parts" + ], "nixpkgs": [ "stylix", "nixpkgs" @@ -341,7 +322,7 @@ "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "flake-parts": "flake-parts", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": [ @@ -359,11 +340,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1747248043, - "narHash": "sha256-uEEhchsf9l2u7JJk04GZIMRIkuCeJFPSAuTMByqYfIQ=", + "lastModified": 1747904607, + "narHash": "sha256-2JWxCVAb8qnssrn/4FeIgs+Gk0VZuAfDsF+rUBE7cZU=", "owner": "danth", "repo": "stylix", - "rev": "98444a942a85072baf12c4a1c4cd5ef9531c8ab0", + "rev": "230705d5fb6c308402579b17e0261e9f15de6f46", "type": "github" }, "original": { @@ -407,17 +388,16 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" } }, diff --git a/hosts/garand-laptop/config/nixpkgs.nix b/hosts/garand-laptop/config/nixpkgs.nix index cf23c45..ecc8251 100644 --- a/hosts/garand-laptop/config/nixpkgs.nix +++ b/hosts/garand-laptop/config/nixpkgs.nix @@ -61,10 +61,4 @@ ZANEYOS = "true"; }; }; - - nixpkgs.overlays = [ - (self: super: { - crystal-launcher = super.callPackage ../../../packages/crystal-launcher.nix {}; - }) - ]; } diff --git a/hosts/garand-laptop/config/nixpkgs/gaming.nix b/hosts/garand-laptop/config/nixpkgs/gaming.nix index 3e5c1e6..e5d6b67 100644 --- a/hosts/garand-laptop/config/nixpkgs/gaming.nix +++ b/hosts/garand-laptop/config/nixpkgs/gaming.nix @@ -5,6 +5,5 @@ wineWowPackages.waylandFull # wine64 lutris space-cadet-pinball - crystal-launcher ]; } diff --git a/hosts/garand-laptop/home/programs.librewolf.nix b/hosts/garand-laptop/home/programs.librewolf.nix index c002e72..adb01b8 100644 --- a/hosts/garand-laptop/home/programs.librewolf.nix +++ b/hosts/garand-laptop/home/programs.librewolf.nix @@ -59,6 +59,7 @@ "garand's-search" = { definedAliases = ["@g"]; urls = [{template = "https://search.garandplg.com/search?q={searchTerms}";}]; + suggestUrl = "https://search.garandplg.com/autocompleter?q={searchTerms}"; }; "youtube" = { definedAliases = ["@yt"]; diff --git a/hosts/garand-laptop/home/programs.nix b/hosts/garand-laptop/home/programs.nix index 5266932..e8f1dea 100644 --- a/hosts/garand-laptop/home/programs.nix +++ b/hosts/garand-laptop/home/programs.nix @@ -85,6 +85,7 @@ in { ll = "eza -lh --icons --grid --group-directories-first"; la = "eza -lah --icons --grid --group-directories-first"; ssh-server = "ssh garand_plg@192.168.1.156 -p 556 -i ~/.ssh/hp-t640-homeserver"; + scp-to-server = "function scp-to-server() { scp -i ~/.ssh/hp-t640-homeserver -P 556 $1 garand_plg@192.168.1.156:$2; }; scp-to-server"; fc = "fortune | cowsay"; terminal = "cat /home/garand_plg/Documents/terminal.txt"; e-terminal = "nano /home/garand_plg/Documents/terminal.txt"; diff --git a/packages/crystal-launcher.nix b/packages/crystal-launcher.nix deleted file mode 100644 index 24df2c4..0000000 --- a/packages/crystal-launcher.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - makeWrapper, - bash, - curl, - wget, - xorg, - host, -}: -stdenv.mkDerivation { - pname = "crystal-launcher"; - version = "1.0.0"; # możesz zaktualizować wersję, jeśli ją znasz - - src = fetchurl { - url = "https://launcher.crystal-launcher.net/linux/launcher.tar.xz"; - sha256 = "sha256-NkngV1nH5oYP7wRUAuDylRkne0Q65FmHn0mnlibjV0c="; # uzupełnij po pierwszym uruchomieniu - Nix podpowie prawidłowy hash - }; - - icon = fetchurl { - url = "https://launcher.crystal-launcher.net/linux/icon.png"; - sha256 = "sha256-IU9PEut3LSzpRXI6t7Emsfs+eMAJ9BMtaw+Y6iJwqww="; # uzupełnij po pierwszym uruchomieniu - Nix podpowie prawidłowy hash - }; - - nativeBuildInputs = [makeWrapper]; - buildInputs = [bash wget curl xorg.xrdb]; - - dontUnpack = true; - - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/applications - mkdir -p $out/share/crystal-launcher/pybootstrap - - # Rozpakuj archiwum - tar -xf $src -C $out/share/crystal-launcher/pybootstrap - - # Skopiuj ikonę - cp $icon $out/share/crystal-launcher/pybootstrap/icon.png - - # Utwórz skrypt uruchamiający - cat > $out/bin/crystal-launcher << EOF - #!/bin/sh - - # manjaro fix - xrdb -load /dev/null - xrdb -query - - cd $out/share/crystal-launcher && ./pybootstrap/launcher - EOF - - chmod +x $out/bin/crystal-launcher - - # Utwórz plik .desktop - cat > $out/share/applications/CrystalLauncher.desktop << EOF - [Desktop Entry] - Name=Crystal Launcher - GenericName=CrystalLauncher - Comment=A Minecraft modpack launcher - Exec=$out/bin/crystal-launcher - Icon=$out/share/crystal-launcher/pybootstrap/icon.png - Terminal=false - Type=Application - Categories=Game; - EOF - ''; - - meta = with lib; { - description = "A Minecraft modpack launcher"; - homepage = "https://launcher.crystal-launcher.net/"; - license = licenses.unfree; # dostosuj do właściwej licencji - platforms = platforms.linux; - maintainers = with maintainers; [ - host - ]; - }; -}