diff options
Diffstat (limited to '')
| -rw-r--r-- | pkgs/arcanist/default.nix | 56 | ||||
| -rw-r--r-- | pkgs/astal/builder.nix | 63 | ||||
| -rw-r--r-- | pkgs/astal/default.nix | 36 | ||||
| -rw-r--r-- | pkgs/astal/theme.nix | 34 | ||||
| -rw-r--r-- | pkgs/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/ly/default.nix | 28 | ||||
| -rw-r--r-- | pkgs/ly/deps.nix | 37 | ||||
| -rw-r--r-- | pkgs/solaar-udev-rules/42-logitech-unify-permissions.rules (renamed from hosts/shinji/42-logitech-unify-permissions.rules) | 0 | ||||
| -rw-r--r-- | pkgs/solaar-udev-rules/default.nix | 14 |
9 files changed, 123 insertions, 165 deletions
diff --git a/pkgs/arcanist/default.nix b/pkgs/arcanist/default.nix index 2660589..9cdf8ed 100644 --- a/pkgs/arcanist/default.nix +++ b/pkgs/arcanist/default.nix @@ -1,34 +1,60 @@ { lib, - pkgs, + stdenv, + fetchFromGitHub, + makeWrapper, + php82, + python3, + git, + diffutils, }: -pkgs.stdenvNoCC.mkDerivation rec { +stdenv.mkDerivation rec { pname = "arcanist"; - version = "2025.18"; + version = "2025.51"; - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = "phorgeit"; repo = "arcanist"; rev = version; - hash = "sha256-yiHLMcgszV9jP/8qb9X/t9Vfm3Ad7DpU55cafWPPQHY="; + hash = "sha256-muqNbQBLDOLhzVSF7vTckhb6ouIcj6tHR20CFsgv9bQ="; }; - buildInputs = with pkgs; [ + nativeBuildInputs = [makeWrapper]; + + dontBuild = true; + + buildInputs = [ php82 python3 - ]; - - propagatedInputs = with pkgs; [ git diffutils ]; + configurePhase = '' + runHook preConfigure + + patchShebangs . + + runHook postConfigure + ''; + installPhase = '' - mkdir -p $out/share/php/${pname} - mkdir -p $out/bin - cp -a * $out/share/php/${pname} - patchShebangs $out/share/php/${pname} - ln -s $out/share/php/${pname}/bin/arc $out/bin/arc - ln -sf ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt $out/share/php/${pname}/resources/ssl/default.pem + runHook preInstall + mkdir -p $out/share/php/arcanist $out/bin + + cp --target-directory=$out/share/php/arcanist --recursive \ + bin externals resources scripts src support + + makeWrapper $out/share/php/arcanist/bin/arc $out/bin/arc \ + --inherit-argv0 \ + --chdir $out/share/php/arcanist \ + --prefix PATH : ${lib.makeBinPath buildInputs} + + makeWrapper $out/share/php/arcanist/bin/phage $out/bin/phage \ + --inherit-argv0 \ + --chdir $out/share/php/arcanist \ + --prefix PATH : ${lib.makeBinPath buildInputs} + + runHook postInstall ''; } diff --git a/pkgs/astal/builder.nix b/pkgs/astal/builder.nix index c48eaf5..ffb38ce 100644 --- a/pkgs/astal/builder.nix +++ b/pkgs/astal/builder.nix @@ -1,43 +1,44 @@ { - pkgs, + stdenvNoCC, astal, + gobject-introspection, + lib, + lua, name, src, - extraLuaPackages ? (ps: []), + wrapGAppsHook3, extraPackages ? [], }: let - lua = pkgs.lua.withPackages (ps: - (extraLuaPackages ps) - ++ [ - ps.lgi - (ps.luaPackages.toLuaModule (pkgs.stdenvNoCC.mkDerivation { - name = "astal"; - src = "${astal}/lang/lua/astal"; - dontBuild = true; - installPhase = '' - mkdir -p $out/share/lua/${ps.lua.luaversion}/astal - cp -r * $out/share/lua/${ps.lua.luaversion}/astal - ''; - })) - (ps.luaPackages.toLuaModule (pkgs.stdenvNoCC.mkDerivation { - inherit src name; - dontBuild = true; - installPhase = '' - mkdir -p $out/share/lua/${ps.lua.luaversion} - cp -r * $out/share/lua/${ps.lua.luaversion} - ''; - })) - ]); + lua_ = lua.withPackages (ps: [ + ps.lgi + (ps.luaPackages.toLuaModule (stdenvNoCC.mkDerivation { + name = "astal"; + src = "${astal}/lang/lua/astal"; + dontBuild = true; + installPhase = '' + mkdir -p $out/share/lua/${ps.lua.luaversion}/astal + cp -r * $out/share/lua/${ps.lua.luaversion}/astal + ''; + })) + (ps.luaPackages.toLuaModule (stdenvNoCC.mkDerivation { + inherit src name; + dontBuild = true; + installPhase = '' + mkdir -p $out/share/lua/${ps.lua.luaversion} + cp -r * $out/share/lua/${ps.lua.luaversion} + ''; + })) + ]); script = '' - #!${lua}/bin/lua + #!${lua_}/bin/lua require "init" ''; in - pkgs.stdenvNoCC.mkDerivation { + stdenvNoCC.mkDerivation { inherit src name; - nativeBuildInputs = with pkgs; [ + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; @@ -45,9 +46,9 @@ in buildInputs = extraPackages ++ [ - lua - astal.packages.${pkgs.stdenv.hostPlatform.system}.io - astal.packages.${pkgs.stdenv.hostPlatform.system}.astal3 + lua_ + astal.io + astal.astal3 ]; installPhase = '' @@ -63,7 +64,7 @@ in preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${pkgs.lib.makeBinPath extraPackages}" + --prefix PATH : "${lib.makeBinPath extraPackages}" ) ''; } diff --git a/pkgs/astal/default.nix b/pkgs/astal/default.nix index 6317f3b..d076f07 100644 --- a/pkgs/astal/default.nix +++ b/pkgs/astal/default.nix @@ -1,33 +1,29 @@ { - pkgs, - stdenv, - inputs, - options, + astal, + callPackage, + dart-sass, + networkmanager, + runCommand, + writeShellApplication, + # System theme must be passed in + theme ? null, ... }: let - runCommand = pkgs.runCommand; - dart-sass = pkgs.dart-sass; - - apkgs = inputs.astal.packages.${stdenv.hostPlatform.system}; - scss = "${dart-sass}/bin/sass"; - theme = import ./theme.nix {inherit options;}; - + vars = import ./theme.nix {inherit theme;}; mkAstal = file: - import ./builder.nix { - inherit pkgs; - astal = inputs.astal; + callPackage ./builder.nix { src = runCommand "src" {} '' mkdir -p $out cp -r ${./src}/{*.lua,widget} $out/ cp $out/${file}.lua $out/init.lua cp -r ${./src}/style/* . - echo '${theme}' > theme.scss + echo '${vars}' > theme.scss cat theme.scss style.scss widget/* > main.scss - ${scss} main.scss $out/main.css + ${dart-sass}/bin/sass main.scss $out/main.css ''; name = "astal-${file}"; extraPackages = - (with apkgs; [ + (with astal; [ apps battery hyprland @@ -37,15 +33,15 @@ tray wireplumber ]) - ++ (with pkgs; [ + ++ [ networkmanager - ]); + ]; }; mkAstalWrapper = file: let pkg = mkAstal file; in - pkgs.writeShellApplication { + writeShellApplication { name = "astal-${file}"; text = '' ${pkg}/bin/astal-${file} diff --git a/pkgs/astal/theme.nix b/pkgs/astal/theme.nix index 9774012..b76864c 100644 --- a/pkgs/astal/theme.nix +++ b/pkgs/astal/theme.nix @@ -1,26 +1,26 @@ -{options, ...}: '' +{theme, ...}: '' - $text: #${options.theme.colors.text}; - $subtext: #${options.theme.colors.subtext}; + $text: #${theme.colors.text}; + $subtext: #${theme.colors.subtext}; - $base: #${options.theme.colors.base}; - $surface: #${options.theme.colors.surface}; - $overlay: #${options.theme.colors.overlay}; + $base: #${theme.colors.base}; + $surface: #${theme.colors.surface}; + $overlay: #${theme.colors.overlay}; - $primary: #${options.theme.colors.primary}; - $success: #${options.theme.colors.success}; - $warning: #${options.theme.colors.warning}; - $error: #${options.theme.colors.error}; + $primary: #${theme.colors.primary}; + $success: #${theme.colors.success}; + $warning: #${theme.colors.warning}; + $error: #${theme.colors.error}; - $border: ${toString options.theme.borderWidth}px; + $border: ${toString theme.borderWidth}px; - $inner-radius: ${toString options.theme.innerRadius}px; - $outer-radius: ${toString options.theme.outerRadius}px; + $inner-radius: ${toString theme.innerRadius}px; + $outer-radius: ${toString theme.outerRadius}px; - $inner-gap: ${toString options.theme.innerGap}px; - $outer-gap: ${toString options.theme.outerGap}px; + $inner-gap: ${toString theme.innerGap}px; + $outer-gap: ${toString theme.outerGap}px; - $font-name: "${options.theme.font.regular}", "${options.theme.font.monospace}"; - $font-size: ${toString options.theme.font.size}px; + $font-name: "${theme.font.regular}", "${theme.font.monospace}"; + $font-size: ${toString theme.font.size}px; '' diff --git a/pkgs/default.nix b/pkgs/default.nix index b447dd7..3b6e894 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,20 +1,6 @@ -{ - pkgs, - inputs, - lib, - ... -}: let - options = - (lib.evalModules { - modules = [ - ../options.nix - ]; - }).config; -in { +{pkgs}: { arcanist = pkgs.callPackage ./arcanist {}; - astal = pkgs.callPackage ./astal { - inherit inputs options; - }; + astal = pkgs.callPackage ./astal {}; libfprint-2-tod1-vfs0090 = pkgs.callPackage ./libfprint-2-tod1-vfs0090 {}; - ly = pkgs.callPackage ./ly {}; + solaar-udev-rules = pkgs.callPackage ./solaar-udev-rules {}; } diff --git a/pkgs/ly/default.nix b/pkgs/ly/default.nix deleted file mode 100644 index f05a6ab..0000000 --- a/pkgs/ly/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - ly, - callPackage, - fetchFromGitea, - makeBinaryWrapper, - zig_0_14, - ... -}: -ly.overrideAttrs { - version = "1.2.0"; - - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "AnErrupTion"; - repo = "ly"; - rev = "d7a4535007bb98e78a21ccf4f57dfbbe3a145e9d"; - hash = "sha256-4jrtcj+6ZlHiBH/AEYmCZ2GyejEXrR/O8gAqt+jXjCQ="; - }; - - nativeBuildInputs = [ - makeBinaryWrapper - zig_0_14.hook - ]; - - postPatch = '' - ln -s ${callPackage ./deps.nix {}} $ZIG_GLOBAL_CACHE_DIR/p - ''; -} diff --git a/pkgs/ly/deps.nix b/pkgs/ly/deps.nix deleted file mode 100644 index a4b2029..0000000 --- a/pkgs/ly/deps.nix +++ /dev/null @@ -1,37 +0,0 @@ -# generated by zon2nix (https://github.com/nix-community/zon2nix) -{ - linkFarm, - fetchzip, - fetchgit, -}: -linkFarm "zig-packages" [ - { - name = "N-V-__8AAB9qAACwl56piR-krrhXSPxCvEskA52cmaTWXYk_"; - path = fetchzip { - url = "https://github.com/ziglibs/ini/archive/e18d36665905c1e7ba0c1ce3e8780076b33e3002.tar.gz"; - hash = "sha256-PmhXsK+mTmOrRC4u8cs9ol2XwKZv0HVRXpntaR5CJiw="; - }; - } - { - name = "N-V-__8AAMruBACJ7xT-O64hnS7lNeTiZQMketHdkHKrR1A8"; - path = fetchgit { - url = "https://github.com/AnErrupTion/termbox2"; - rev = "e975d250ee6567773400e9d5b0b5c2f175349c57"; - hash = "sha256-V1RangzmT2U0jtnOQPOXZ3s9imaCDTqS4egC69YKpTs="; - }; - } - { - name = "clap-0.10.0-oBajB434AQBDh-Ei3YtoKIRxZacVPF1iSwp3IX_ZB8f0"; - path = fetchzip { - url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.10.0.tar.gz"; - hash = "sha256-leXnA97ITdvmBhD2YESLBZAKjBg+G4R/+PPPRslz/ec="; - }; - } - { - name = "zigini-0.3.1-BSkB7XJGAAB2E-sKyzhTaQCBlYBL8yqzE4E_jmSY99sC"; - path = fetchzip { - url = "https://github.com/Kawaii-Ash/zigini/archive/2ed3d417f17fab5b0ee8cad8a63c6d62d7ac1042.tar.gz"; - hash = "sha256-7UTzOauaAx7TjHotj8LrB/vAh/mwSLa2Uwsb9Ku/9rg="; - }; - } -] diff --git a/hosts/shinji/42-logitech-unify-permissions.rules b/pkgs/solaar-udev-rules/42-logitech-unify-permissions.rules index e52c9b0..e52c9b0 100644 --- a/hosts/shinji/42-logitech-unify-permissions.rules +++ b/pkgs/solaar-udev-rules/42-logitech-unify-permissions.rules diff --git a/pkgs/solaar-udev-rules/default.nix b/pkgs/solaar-udev-rules/default.nix new file mode 100644 index 0000000..a4148a0 --- /dev/null +++ b/pkgs/solaar-udev-rules/default.nix @@ -0,0 +1,14 @@ +{stdenv}: +stdenv.mkDerivation { + name = "solaar-udev-rules"; + + src = ./.; + + dontBuild = true; + dontConfigure = true; + + installPhase = '' + mkdir -p $out/etc/udev/rules.d + cp 42-logitech-unify-permissions.rules $out/etc/udev/rules.d + ''; +} |