diff options
author | Freya Murphy <freya@freyacat.org> | 2025-06-17 22:08:20 -0400 |
---|---|---|
committer | Freya Murphy <freya@freyacat.org> | 2025-06-17 22:08:20 -0400 |
commit | 640476ab01c501bbaa5b7854b561201bfe40d2ea (patch) | |
tree | 1516ebdda1180a910c4a7ff2e870058a936297e1 /pkgs | |
parent | add formatter (diff) | |
download | dotfiles-nix-640476ab01c501bbaa5b7854b561201bfe40d2ea.tar.gz dotfiles-nix-640476ab01c501bbaa5b7854b561201bfe40d2ea.tar.bz2 dotfiles-nix-640476ab01c501bbaa5b7854b561201bfe40d2ea.zip |
fmt
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/astal/default.nix | 62 | ||||
-rw-r--r-- | pkgs/astal/theme.nix | 41 | ||||
-rw-r--r-- | pkgs/default.nix | 28 | ||||
-rw-r--r-- | pkgs/unofficial-homestuck-collection/default.nix | 13 |
4 files changed, 72 insertions, 72 deletions
diff --git a/pkgs/astal/default.nix b/pkgs/astal/default.nix index dc19a19..a7e86fe 100644 --- a/pkgs/astal/default.nix +++ b/pkgs/astal/default.nix @@ -6,36 +6,38 @@ runCommand, dart-sass, ... -}: - -let +}: let apkgs = inputs.astal.packages.${system}; scss = "${dart-sass}/bin/sass"; - theme = import ./theme.nix { inherit options; }; + theme = import ./theme.nix {inherit options;}; in -inputs.astal.lib.mkLuaPackage { - pkgs = pkgs // { - # use luajit - lua = pkgs.luajit; - }; - src = runCommand "src" {} '' - mkdir -p $out - cp -r ${./src}/{*.lua,widget} $out/ - cp -r ${./src}/style/* . - echo '${theme}' > theme.scss - cat theme.scss style.scss widget/* > main.scss - ${scss} main.scss $out/main.css - ''; - name = "astal"; - extraPackages = (with apkgs; [ - battery - hyprland - mpris - network - notifd - tray - wireplumber - ]) ++ (with pkgs; [ - networkmanager - ]); -} + inputs.astal.lib.mkLuaPackage { + pkgs = + pkgs + // { + # use luajit + lua = pkgs.luajit; + }; + src = runCommand "src" {} '' + mkdir -p $out + cp -r ${./src}/{*.lua,widget} $out/ + cp -r ${./src}/style/* . + echo '${theme}' > theme.scss + cat theme.scss style.scss widget/* > main.scss + ${scss} main.scss $out/main.css + ''; + name = "astal"; + extraPackages = + (with apkgs; [ + battery + hyprland + mpris + network + notifd + tray + wireplumber + ]) + ++ (with pkgs; [ + networkmanager + ]); + } diff --git a/pkgs/astal/theme.nix b/pkgs/astal/theme.nix index 1efd1fe..2802d6c 100644 --- a/pkgs/astal/theme.nix +++ b/pkgs/astal/theme.nix @@ -1,33 +1,28 @@ -{ - options, - ... -}: +{options, ...}: '' -'' - -$fg: #${options.theme.colors.fg}; -$bg: #${options.theme.colors.bg}; + $fg: #${options.theme.colors.fg}; + $bg: #${options.theme.colors.bg}; -$surface-fg: #${options.theme.colors.surface.fg}; -$surface-bg: #${options.theme.colors.surface.bg}; + $surface-fg: #${options.theme.colors.surface.fg}; + $surface-bg: #${options.theme.colors.surface.bg}; -$hover-fg: #${options.theme.colors.hover.fg}; -$hover-bg: #${options.theme.colors.hover.bg}; + $hover-fg: #${options.theme.colors.hover.fg}; + $hover-bg: #${options.theme.colors.hover.bg}; -$primary: #${options.theme.colors.primary}; -$success: #${options.theme.colors.success}; -$warning: #${options.theme.colors.warning}; -$error: #${options.theme.colors.error}; + $primary: #${options.theme.colors.primary}; + $success: #${options.theme.colors.success}; + $warning: #${options.theme.colors.warning}; + $error: #${options.theme.colors.error}; -$border: ${toString options.theme.borderWidth}px; + $border: ${toString options.theme.borderWidth}px; -$inner-radius: ${toString options.theme.innerRadius}px; -$outer-radius: ${toString options.theme.outerRadius}px; + $inner-radius: ${toString options.theme.innerRadius}px; + $outer-radius: ${toString options.theme.outerRadius}px; -$inner-gap: ${toString options.theme.innerGap}px; -$outer-gap: ${toString options.theme.outerGap}px; + $inner-gap: ${toString options.theme.innerGap}px; + $outer-gap: ${toString options.theme.outerGap}px; -$font-name: "${options.theme.font.regular}", "${options.theme.font.monospace}"; -$font-size: ${toString options.theme.font.size}px; + $font-name: "${options.theme.font.regular}", "${options.theme.font.monospace}"; + $font-size: ${toString options.theme.font.size}px; '' diff --git a/pkgs/default.nix b/pkgs/default.nix index 18b7c50..2ce9dac 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,14 +1,18 @@ -{ pkgs, inputs, system, options, ... }: - -let - build = (path: pkgs.callPackage path { - inherit pkgs; - inherit inputs; - inherit system; - inherit options; - }); -in { - astal = build ./astal; - unofficial-homestuck-collection = build ./unofficial-homestuck-collection; + pkgs, + inputs, + system, + options, + ... +}: let + build = path: + pkgs.callPackage path { + inherit pkgs; + inherit inputs; + inherit system; + inherit options; + }; +in { + astal = build ./astal; + unofficial-homestuck-collection = build ./unofficial-homestuck-collection; } diff --git a/pkgs/unofficial-homestuck-collection/default.nix b/pkgs/unofficial-homestuck-collection/default.nix index d9dea07..ccb5903 100644 --- a/pkgs/unofficial-homestuck-collection/default.nix +++ b/pkgs/unofficial-homestuck-collection/default.nix @@ -5,17 +5,16 @@ fetchurl, ... }: - appimageTools.wrapType2 rec { pname = "unofficial-homestuck-collection"; - version = "2.6.5"; + version = "2.6.5"; - src = fetchurl { - url = "https://github.com/GiovanH/unofficial-homestuck-collection/releases/download/v${version}/The-Unofficial-Homestuck-Collection-${version}.AppImage"; - hash = "sha256-3c5xhrdF1R5s4cVKhrdTmff3o0fU1GNEAFfIDC4pvfs="; - }; + src = fetchurl { + url = "https://github.com/GiovanH/unofficial-homestuck-collection/releases/download/v${version}/The-Unofficial-Homestuck-Collection-${version}.AppImage"; + hash = "sha256-3c5xhrdF1R5s4cVKhrdTmff3o0fU1GNEAFfIDC4pvfs="; + }; extraInstallCommands = '' - sed -i 's/$@"/$@" --no-sandbox/' "$out/bin/unofficial-homestuck-collection" + sed -i 's/$@"/$@" --no-sandbox/' "$out/bin/unofficial-homestuck-collection" ''; } |