diff --git a/profiles/work/home.nix b/profiles/work/home.nix index f99c628..b219182 100644 --- a/profiles/work/home.nix +++ b/profiles/work/home.nix @@ -99,6 +99,7 @@ blender-hip cura curaengine_stable + openscad (stdenv.mkDerivation { name = "cura-slicer"; version = "0.0.7"; @@ -141,6 +142,7 @@ texinfo libffi zlib nodePackages.ungit + ventoy ]) ++ ([ pkgs-kdenlive.kdenlive ]); services.syncthing.enable = true; diff --git a/user/pkgs/blockbench.nix b/user/pkgs/blockbench.nix deleted file mode 100644 index 4f852ae..0000000 --- a/user/pkgs/blockbench.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib, pkgs, ... }: - -{ - nixpkgs.overlays = [ - (self: super: - { - blockbench-electron = - super.blockbench-electron.overrideAttrs (oldAttrs: rec { - pname = "blockbench-electron"; - alias = "blockbench"; - version = "4.8.1"; - - src = super.fetchurl { - inherit pname version; - url = "https://github.com/JannisX11/blockbench/releases/download/v${version}/Blockbench_${version}.AppImage"; - sha256 = "sha256-CE2wDOt1WBcYmPs4sEyZ3LYvKLequFZH0B3huMYHlwA="; - name = "${pname}-${version}.AppImage"; - }; - - appimageContents = super.appimageTools.extractType2 { - inherit pname version; - name = "${pname}-${version}"; - inherit src; - }; - - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - - nativeBuildInputs = [ super.makeWrapper ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin $out/share/${pname} $out/share/applications - cp -a ${appimageContents}/{locales,resources} $out/share/${pname} - cp -a ${appimageContents}/blockbench.desktop $out/share/applications/${pname}.desktop - cp -a ${appimageContents}/usr/share/icons $out/share - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - runHook postInstall - ''; - - postFixup = '' - makeWrapper ${super.electron_22}/bin/electron $out/bin/${pname} \ - --add-flags $out/share/${pname}/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ super.stdenv.cc.cc ]}" - - makeWrapper ${super.electron_22}/bin/electron $out/bin/${alias} \ - --add-flags $out/share/${pname}/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ super.stdenv.cc.cc ]}" - ''; - }); - } - ) - ]; - - home.packages = [ pkgs.blockbench-electron ]; -} diff --git a/user/pkgs/impressive.nix b/user/pkgs/impressive.nix deleted file mode 100644 index 6ee0ea3..0000000 --- a/user/pkgs/impressive.nix +++ /dev/null @@ -1,45 +0,0 @@ -# THIS DOES NOT WORK YET! -{ lib, buildPythonPackage, pkgs, ... }: - -let name = "Impressive"; - _name = "impressive"; - version = "0.13.2"; -in - buildPythonPackage rec { - inherit name version; - - src = fetchTarball { - url = "https://sourceforge.net/projects/${_name}/files/${name}/${version}/${name}-${version}.tar.gz/download"; - sha256 = "sha256:0zbkqc29mgm93mysf3y5gvkaj4xxp1jv4ix1fqrcpfx3cricrkql"; - }; - - phases = "installPhase"; - - pyproject = false; - doCheck = false; - - propagatedBuildInputs = with pkgs; [ - python3Packages.pygame - python3Packages.pyopengl - python3Packages.pillow - python3Packages.pygame_sdl2 - python3Packages.pygame-gui - ffmpeg - mplayer - xdg-utils - ]; - - installPhase = '' - mkdir -p $out $out/bin $out/opt $out/share $out/share/doc $out/share/man - cp $src/impressive.py $out/opt - chmod +x $out/opt/impressive.py - ln -s $out/opt/impressive.py $out/bin/impressive - ''; - - meta = { - homepage = "https://impressive.sourceforge.net/"; - description = "the Chuck Norris of presentation software"; - license = lib.licenses.gpl2Only; - maintainers = []; - }; - } diff --git a/user/pkgs/pokefinder.nix b/user/pkgs/pokefinder.nix deleted file mode 100644 index 5fb86ef..0000000 --- a/user/pkgs/pokefinder.nix +++ /dev/null @@ -1,32 +0,0 @@ -# THIS DOESN'T WORK YET!!! -# I'M NOT SMART ENOUGH TO FIGURE THIS OUT XD -{ lib, stdenv, fetchgit, pkgs, ... }: - -let name = "pokefinder"; - version = "4.1.2"; -in - stdenv.mkDerivation { - inherit name version; - - src = fetchgit { - url = "https://github.com/Admiral-Fish/${name}"; - fetchSubmodules = true; - rev = "v${version}"; - sha256 = "sha256-ps8F6IcbCNybrZ02tbLNyB3YEvKlcYgCpv5Em7Riv+Q="; - }; - - buildInputs = with pkgs; [ qt6.full qt6.qttools ]; - nativeBuildInputs = with pkgs; [ python3 pkgs.cmake qt6.wrapQtAppsHook ]; - - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=RELEASE" - "-DCMAKE_PREFIX_PATH=${pkgs.qt6.full}" - ]; - - meta = { - homepage = "https://github.com/Admiral-Fish/PokeFinder"; - description = "Cross platform Pokémon RNG tool"; - license = lib.licenses.gpl3; - maintainers = []; - }; - } diff --git a/user/pkgs/smartcalc.nix b/user/pkgs/smartcalc.nix deleted file mode 100644 index 8258f2a..0000000 --- a/user/pkgs/smartcalc.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, pkgs, ... }: -let - rustPlatform = pkgs.makeRustPlatform { - cargo = pkgs.rust-bin.stable.latest.minimal; - rustc = pkgs.rust-bin.stable.latest.minimal; - }; -in -rustPlatform.buildRustPackage rec { - pname = "smartcalc-tui"; - version = "1.0.7"; - - src = fetchTarball { - url = "https://github.com/superhawk610/smartcalc-tui/archive/refs/tags/v1.0.7.tar.gz"; - sha256 = "1dv24rsj87avpbrmab0hy3v729fdqh1cfbvl1xsjmfn8y35z4m5m"; - }; - - cargoSha256 = "sha256-0AWsJccfzkUkpB6imibN6iUNDEx3vrX9kEgD98nXURw="; - - checkType = "debug"; - - meta = with lib; { - description = "Terminal UI for erhanbaris/smartcalc"; - homepage = "https://github.com/superhawk610/smartcalc-tui"; - license = licenses.mit; - maintainers = []; - }; -} diff --git a/user/shell/cli-collection.nix b/user/shell/cli-collection.nix index 468feed..f753928 100644 --- a/user/shell/cli-collection.nix +++ b/user/shell/cli-collection.nix @@ -1,5 +1,4 @@ { pkgs, ... }: - { # Collection of useful CLI apps home.packages = with pkgs; [ @@ -15,16 +14,12 @@ bat eza fd bottom ripgrep rsync unzip - tmux w3m pandoc hwinfo pciutils numbat - (pkgs.callPackage ../pkgs/smartcalc.nix { }) - #(pkgs.writeShellScriptBin "sc" ''smartcalc'') - #(pkgs.callPackage ../pkgs/pokemon-colorscripts.nix { }) - #(pkgs.python3Packages.callPackage ../pkgs/impressive.nix { }) + (pkgs.callPackage ../pkgs/pokemon-colorscripts.nix { }) (pkgs.writeShellScriptBin "airplane-mode" '' #!/bin/sh connectivity="$(nmcli n connectivity)"