summaryrefslogtreecommitdiff
path: root/pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/barista/default.nix48
-rw-r--r--pkgs/default.nix35
-rw-r--r--pkgs/firefoxAddons/default.nix20
-rw-r--r--pkgs/lib/default.nix19
-rw-r--r--pkgs/lib/home-manager/default.nix16
-rw-r--r--pkgs/lockscreen/default.nix69
-rw-r--r--pkgs/rftg/default.nix9
-rw-r--r--pkgs/static/css/lineAwesome/default.nix9
-rw-r--r--pkgs/static/gitignore/default.nix16
-rw-r--r--pkgs/static/icons/default.nix24
-rw-r--r--pkgs/static/userjs/arkenfox/default.nix11
-rw-r--r--pkgs/static/userjs/thunderbird/default.nix11
-rw-r--r--pkgs/static/wallpapers/default.nix39
-rw-r--r--pkgs/watermark/default.nix6
14 files changed, 199 insertions, 133 deletions
diff --git a/pkgs/barista/default.nix b/pkgs/barista/default.nix
index 30f370a..d097996 100644
--- a/pkgs/barista/default.nix
+++ b/pkgs/barista/default.nix
@@ -1,7 +1,16 @@
-{ buildGoModule, fetchFromGitHub, wirelesstools, fontawesomeMetadata, materialDesignIconsMetadata, i3statusGo ? null }:
+{
+ buildGoModule,
+ fetchFromGitHub,
+ wirelesstools,
+ fontawesomeMetadata,
+ materialDesignIconsMetadata,
+ i3statusGo ? null,
+}:
-let useDefaultConfig = i3statusGo == null;
-in buildGoModule {
+let
+ useDefaultConfig = i3statusGo == null;
+in
+buildGoModule {
name = "barista";
version = "autorelease";
@@ -14,23 +23,28 @@ in buildGoModule {
patchPhase = ''
mkdir main
- '' + (if useDefaultConfig then # use samples/i3status/i3status.go as config
''
- mv samples/i3status/i3status.go main/i3status.go
- '' else # import config and patch font loading
- ''
- cp ${i3statusGo} main/i3status.go
- substituteInPlace main/i3status.go \
- --replace 'fontawesome.Load()' 'fontawesome.Load("${fontawesomeMetadata}")' \
- --replace 'mdi.Load()' 'mdi.Load("${materialDesignIconsMetadata}")'
- '') + # patch call to iwgetid
- ''
- substituteInPlace modules/wlan/wlan.go \
- --replace '/sbin/iwgetid' '${wirelesstools}/bin/iwgetid'
- '';
+ + (
+ if useDefaultConfig then # use samples/i3status/i3status.go as config
+ ''
+ mv samples/i3status/i3status.go main/i3status.go
+ ''
+ # import config and patch font loading
+ else
+ ''
+ cp ${i3statusGo} main/i3status.go
+ substituteInPlace main/i3status.go \
+ --replace 'fontawesome.Load()' 'fontawesome.Load("${fontawesomeMetadata}")' \
+ --replace 'mdi.Load()' 'mdi.Load("${materialDesignIconsMetadata}")'
+ ''
+ )
+ # patch call to iwgetid
+ + ''
+ substituteInPlace modules/wlan/wlan.go \
+ --replace '/sbin/iwgetid' '${wirelesstools}/bin/iwgetid'
+ '';
subPackages = [ "main/i3status.go" ];
vendorHash = "sha256-gpzxwtGxHcidRYY8o1Lz0iboU5aNnwsWfOoGo6Lvefo=";
}
-
diff --git a/pkgs/default.nix b/pkgs/default.nix
index f4712ce..9fd96e5 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,38 +1,39 @@
-super: let
+super:
+let
self = {
barista = super.callPackage ./barista {
fontawesomeMetadata = self.static.fontMetadata.fontawesome;
- materialDesignIconsMetadata =
- self.static.fontMetadata.materialDesignIcons;
+ materialDesignIconsMetadata = self.static.fontMetadata.materialDesignIcons;
};
- lib = import ./lib {inherit (super) lib;};
+ lib = import ./lib { inherit (super) lib; };
- lockscreen = super.callPackage ./lockscreen {};
+ lockscreen = super.callPackage ./lockscreen { };
firefoxAddons = super.callPackage ./firefoxAddons {
inherit (super.nur.repos.rycee.firefox-addons) buildFirefoxXpiAddon;
};
- rftg = super.callPackage ./rftg {};
+ rftg = super.callPackage ./rftg { };
static = {
- css = {lineAwesome = super.callPackage ./static/css/lineAwesome {};};
+ css = {
+ lineAwesome = super.callPackage ./static/css/lineAwesome { };
+ };
fontMetadata = {
- fontawesome = super.callPackage ./static/fontMetadata/fontawesome {};
- materialDesignIcons =
- super.callPackage ./static/fontMetadata/materialDesignIcons {};
+ fontawesome = super.callPackage ./static/fontMetadata/fontawesome { };
+ materialDesignIcons = super.callPackage ./static/fontMetadata/materialDesignIcons { };
};
- icons = super.callPackage ./static/icons {};
- gitignore = super.callPackage ./static/gitignore {};
+ icons = super.callPackage ./static/icons { };
+ gitignore = super.callPackage ./static/gitignore { };
userjs = {
- arkenfox = super.callPackage ./static/userjs/arkenfox {};
- thunderbird = super.callPackage ./static/userjs/thunderbird {};
+ arkenfox = super.callPackage ./static/userjs/arkenfox { };
+ thunderbird = super.callPackage ./static/userjs/thunderbird { };
};
- wallpapers = super.callPackage ./static/wallpapers {};
+ wallpapers = super.callPackage ./static/wallpapers { };
};
- watermark = super.callPackage ./watermark {};
+ watermark = super.callPackage ./watermark { };
};
in
- self
+self
diff --git a/pkgs/firefoxAddons/default.nix b/pkgs/firefoxAddons/default.nix
index 413b6da..f593305 100644
--- a/pkgs/firefoxAddons/default.nix
+++ b/pkgs/firefoxAddons/default.nix
@@ -2,7 +2,8 @@
buildFirefoxXpiAddon,
lib,
...
-}: {
+}:
+{
"add-custom-search-engine" = buildFirefoxXpiAddon {
pname = "add-custom-search-engine";
version = "4.2";
@@ -12,7 +13,10 @@
meta = with lib; {
description = "Add a custom search engine to the list of available search engines in the search bar and URL bar.";
license = licenses.mpl20;
- mozPermissions = ["https://paste.mozilla.org/api/" "search"];
+ mozPermissions = [
+ "https://paste.mozilla.org/api/"
+ "search"
+ ];
platforms = platforms.all;
};
};
@@ -492,7 +496,11 @@
homepage = "https://unpaywall.org/products/extension";
description = "Get free text of research papers as you browse, using Unpaywall's index of ten million legal, open-access articles.";
license = licenses.mit;
- mozPermissions = ["*://*.oadoi.org/*" "storage" "<all_urls>"];
+ mozPermissions = [
+ "*://*.oadoi.org/*"
+ "storage"
+ "<all_urls>"
+ ];
platforms = platforms.all;
};
};
@@ -506,7 +514,11 @@
homepage = "https://github.com/cloutierjo/titleUrl";
description = "Add the current host name to the windows title bar. It adds the possibility to recognize the window from other application that work based on windows titles like KeePass's autotype.";
license = licenses.gpl3;
- mozPermissions = ["<all_urls>" "tabs" "storage"];
+ mozPermissions = [
+ "<all_urls>"
+ "tabs"
+ "storage"
+ ];
platforms = platforms.all;
};
};
diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix
index 6ba56ef..22c9e07 100644
--- a/pkgs/lib/default.nix
+++ b/pkgs/lib/default.nix
@@ -4,12 +4,17 @@ let
self = {
homeManager = import ./home-manager { };
toUserJS = prefs: ''
- ${lib.concatStrings (lib.mapAttrsToList (name: value: ''
- user_pref("${name}", ${builtins.toJSON value});
- '') prefs)}
+ ${lib.concatStrings (
+ lib.mapAttrsToList (name: value: ''
+ user_pref("${name}", ${builtins.toJSON value});
+ '') prefs
+ )}
'';
- updateInputFlag = input: [ "--update-input" input ];
- updateInputFlags = inputs:
- builtins.concatLists (builtins.map self.updateInputFlag inputs);
+ updateInputFlag = input: [
+ "--update-input"
+ input
+ ];
+ updateInputFlags = inputs: builtins.concatLists (builtins.map self.updateInputFlag inputs);
};
-in self
+in
+self
diff --git a/pkgs/lib/home-manager/default.nix b/pkgs/lib/home-manager/default.nix
index ad3878f..e07e0b8 100644
--- a/pkgs/lib/home-manager/default.nix
+++ b/pkgs/lib/home-manager/default.nix
@@ -1,12 +1,22 @@
{ }:
{
- serviceWithTimer = name:
- { Unit, Service, Timer, Install, ... }@config: {
+ serviceWithTimer =
+ name:
+ {
+ Unit,
+ Service,
+ Timer,
+ Install,
+ ...
+ }@config:
+ {
services.${name} = { inherit (config) Unit Install Service; };
timers.${name} = {
inherit (config) Unit Install;
- Timer = config.Timer // { Unit = "${name}.service"; };
+ Timer = config.Timer // {
+ Unit = "${name}.service";
+ };
};
};
}
diff --git a/pkgs/lockscreen/default.nix b/pkgs/lockscreen/default.nix
index 500e856..2b6bbdc 100644
--- a/pkgs/lockscreen/default.nix
+++ b/pkgs/lockscreen/default.nix
@@ -5,38 +5,41 @@
lib,
backgroundImage ? null,
resolution ? "1920x1080",
-}: let
+}:
+let
useBackgroundImage = backgroundImage != null;
in
- runCommand "lockscreen" {envVariable = true;} (''
- mkdir -p $out/{bin,share}
- ''
- + (lib.optionalString useBackgroundImage ''
- ${imagemagick}/bin/convert ${backgroundImage} -resize ${resolution} -blur 0x5 RGB:$out/share/lockscreen.png
- '')
- + ''
- echo > $out/bin/lockscreen.sh \
- "export PATH=$PATH
- ${i3lock-color}/bin/i3lock-color \\
- ''
- + (lib.optionalString useBackgroundImage ''
- --raw ${resolution}:rgb \\
- --image $out/share/lockscreen.png \\
- --tiling \\
- '')
- + ''
- --no-unlock-indicator \\
- --composite \\
- --clock \\
- --ignore-empty-password \\
- --time-color=FFFFFFFF \\
- --date-color=00000000 \\
- --time-size=100"
- ''
- + (lib.optionalString useBackgroundImage ''
- chmod 444 $out/share/lockscreen.png
- '')
- + ''
- chmod 555 $out/bin/lockscreen.sh
- chmod 555 $out/{bin,share}
- '')
+runCommand "lockscreen" { envVariable = true; } (
+ ''
+ mkdir -p $out/{bin,share}
+ ''
+ + (lib.optionalString useBackgroundImage ''
+ ${imagemagick}/bin/convert ${backgroundImage} -resize ${resolution} -blur 0x5 RGB:$out/share/lockscreen.png
+ '')
+ + ''
+ echo > $out/bin/lockscreen.sh \
+ "export PATH=$PATH
+ ${i3lock-color}/bin/i3lock-color \\
+ ''
+ + (lib.optionalString useBackgroundImage ''
+ --raw ${resolution}:rgb \\
+ --image $out/share/lockscreen.png \\
+ --tiling \\
+ '')
+ + ''
+ --no-unlock-indicator \\
+ --composite \\
+ --clock \\
+ --ignore-empty-password \\
+ --time-color=FFFFFFFF \\
+ --date-color=00000000 \\
+ --time-size=100"
+ ''
+ + (lib.optionalString useBackgroundImage ''
+ chmod 444 $out/share/lockscreen.png
+ '')
+ + ''
+ chmod 555 $out/bin/lockscreen.sh
+ chmod 555 $out/{bin,share}
+ ''
+)
diff --git a/pkgs/rftg/default.nix b/pkgs/rftg/default.nix
index 67c41cd..d2ed791 100644
--- a/pkgs/rftg/default.nix
+++ b/pkgs/rftg/default.nix
@@ -15,14 +15,17 @@ stdenv.mkDerivation rec {
sha256 = "sha256-y/LluUDpNr5Umxc/XPO2mMQWhZ50NxoDkZ7VYt0Sd18=";
};
- nativeBuildInputs = [pkg-config];
- buildInputs = [gtk2.dev hostname];
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [
+ gtk2.dev
+ hostname
+ ];
preConfigure = ''
cd src/
'';
- installFlags = ["prefix=$(out)"];
+ installFlags = [ "prefix=$(out)" ];
meta = {
homepage = "http://keldon.net/rftg/";
diff --git a/pkgs/static/css/lineAwesome/default.nix b/pkgs/static/css/lineAwesome/default.nix
index b1376fe..7769e46 100644
--- a/pkgs/static/css/lineAwesome/default.nix
+++ b/pkgs/static/css/lineAwesome/default.nix
@@ -1,12 +1,15 @@
-{ stdenv, fetchurl, fontsRelativeDirectory ? "./webfonts", fontDisplay ? "auto"
+{
+ stdenv,
+ fetchurl,
+ fontsRelativeDirectory ? "./webfonts",
+ fontDisplay ? "auto",
}:
stdenv.mkDerivation rec {
name = "line-awesome.css";
version = "v1.2.1";
src = fetchurl {
- url =
- "https://raw.githubusercontent.com/icons8/line-awesome/${version}/dist/line-awesome/css/line-awesome.css";
+ url = "https://raw.githubusercontent.com/icons8/line-awesome/${version}/dist/line-awesome/css/line-awesome.css";
sha256 = "sha256:GU24Xz6l3Ww4ZCcL2ByssTe04fHBRz9k2aZVRdj0xm4=";
};
diff --git a/pkgs/static/gitignore/default.nix b/pkgs/static/gitignore/default.nix
index d97dec5..6ee8649 100644
--- a/pkgs/static/gitignore/default.nix
+++ b/pkgs/static/gitignore/default.nix
@@ -1,6 +1,6 @@
{
- templates ? [],
- toUncomment ? [],
+ templates ? [ ],
+ toUncomment ? [ ],
stdenvNoCC,
fetchFromGitHub,
lib,
@@ -18,12 +18,20 @@ stdenvNoCC.mkDerivation {
buildPhase = ''
mv {Global,community}/*.gitignore .
- for file in ${lib.concatStringsSep " " (builtins.map (name: lib.escapeShellArg "${name}.gitignore") templates)}
+ for file in ${
+ lib.concatStringsSep " " (builtins.map (name: lib.escapeShellArg "${name}.gitignore") templates)
+ }
do
echo "### $(basename "$file" .gitignore)" >> $out
cat "$file" >> $out
echo >> $out
done
- substituteInPlace $out ${lib.concatStringsSep " " (builtins.map (line: "--replace ${lib.escapeShellArg "# ${line}"} ${lib.escapeShellArg line}") toUncomment)}
+ substituteInPlace $out ${
+ lib.concatStringsSep " " (
+ builtins.map (
+ line: "--replace ${lib.escapeShellArg "# ${line}"} ${lib.escapeShellArg line}"
+ ) toUncomment
+ )
+ }
'';
}
diff --git a/pkgs/static/icons/default.nix b/pkgs/static/icons/default.nix
index 81acde6..0df7c12 100644
--- a/pkgs/static/icons/default.nix
+++ b/pkgs/static/icons/default.nix
@@ -1,15 +1,15 @@
{ fetchurl }:
{
- netflix = fetchurl {
- url = "https://www.vectorlogo.zone/logos/netflix/netflix-icon.svg";
- sha256 = "0i9211dsc8lrq8bvs9r217nwhfjcg84ja8b7lgqnza9ypv5lrqgs";
- };
- mubi = fetchurl {
- url = "https://mubi.com/MUBI-logo.png";
- sha256 = "0fc53c8j6dvphykabqiy146hjmpnczm5rvlf92fycyiqgrg260c4";
- };
- deezer = fetchurl {
- url = "https://raw.githubusercontent.com/edent/SuperTinyIcons/master/images/svg/deezer.svg";
- sha256 = "0gjh30082jc1yapkccp4fb9y2sr1q26gbqdjh0dkp9ldr00vy0q6";
- };
+ netflix = fetchurl {
+ url = "https://www.vectorlogo.zone/logos/netflix/netflix-icon.svg";
+ sha256 = "0i9211dsc8lrq8bvs9r217nwhfjcg84ja8b7lgqnza9ypv5lrqgs";
+ };
+ mubi = fetchurl {
+ url = "https://mubi.com/MUBI-logo.png";
+ sha256 = "0fc53c8j6dvphykabqiy146hjmpnczm5rvlf92fycyiqgrg260c4";
+ };
+ deezer = fetchurl {
+ url = "https://raw.githubusercontent.com/edent/SuperTinyIcons/master/images/svg/deezer.svg";
+ sha256 = "0gjh30082jc1yapkccp4fb9y2sr1q26gbqdjh0dkp9ldr00vy0q6";
+ };
}
diff --git a/pkgs/static/userjs/arkenfox/default.nix b/pkgs/static/userjs/arkenfox/default.nix
index 67dc77b..7650a34 100644
--- a/pkgs/static/userjs/arkenfox/default.nix
+++ b/pkgs/static/userjs/arkenfox/default.nix
@@ -1,7 +1,8 @@
-{fetchurl}: let
+{ fetchurl }:
+let
version = "135.0";
in
- fetchurl {
- url = "https://raw.githubusercontent.com/arkenfox/user.js/${version}/user.js";
- sha256 = "sha256-rPcH24YqEBOzoPB9yxMlke/3tqpi9L7GVMsZ3MUP8WY=";
- }
+fetchurl {
+ url = "https://raw.githubusercontent.com/arkenfox/user.js/${version}/user.js";
+ sha256 = "sha256-rPcH24YqEBOzoPB9yxMlke/3tqpi9L7GVMsZ3MUP8WY=";
+}
diff --git a/pkgs/static/userjs/thunderbird/default.nix b/pkgs/static/userjs/thunderbird/default.nix
index fada9dd..f08fa79 100644
--- a/pkgs/static/userjs/thunderbird/default.nix
+++ b/pkgs/static/userjs/thunderbird/default.nix
@@ -1,7 +1,8 @@
-{fetchurl}: let
+{ fetchurl }:
+let
version = "128.0";
in
- fetchurl {
- url = "https://raw.githubusercontent.com/HorlogeSkynet/thunderbird-user.js/v${version}/user.js";
- sha256 = "sha256-V1cTcG52o24bF/0tki/c9+uOdpWaCxqZtIBoSqoQLYk=";
- }
+fetchurl {
+ url = "https://raw.githubusercontent.com/HorlogeSkynet/thunderbird-user.js/v${version}/user.js";
+ sha256 = "sha256-V1cTcG52o24bF/0tki/c9+uOdpWaCxqZtIBoSqoQLYk=";
+}
diff --git a/pkgs/static/wallpapers/default.nix b/pkgs/static/wallpapers/default.nix
index a0efda3..7f228b9 100644
--- a/pkgs/static/wallpapers/default.nix
+++ b/pkgs/static/wallpapers/default.nix
@@ -3,7 +3,8 @@
fetchurl,
imagemagick,
lib,
-}: let
+}:
+let
fetchWallpaper = lib.makeOverridable (
{
name,
@@ -13,24 +14,24 @@
ratio ? "16:9",
gravity ? "center",
}:
- stdenv.mkDerivation {
- inherit name;
- src = fetchurl {
- inherit url sha256;
- };
- buildInputs = [imagemagick];
- phases = ["unpackPhase"];
- unpackPhase = ''
- convert "$src" -gravity '${gravity}' \
- -extent '${ratio}' \
- -resize '${resolution}!' \
- "$out"
- '';
- }
+ stdenv.mkDerivation {
+ inherit name;
+ src = fetchurl {
+ inherit url sha256;
+ };
+ buildInputs = [ imagemagick ];
+ phases = [ "unpackPhase" ];
+ unpackPhase = ''
+ convert "$src" -gravity '${gravity}' \
+ -extent '${ratio}' \
+ -resize '${resolution}!' \
+ "$out"
+ '';
+ }
);
sources = lib.importJSON ./sources.json;
in
- {
- fetcher = fetchWallpaper;
- }
- // builtins.mapAttrs (_: fetchWallpaper) sources
+{
+ fetcher = fetchWallpaper;
+}
+// builtins.mapAttrs (_: fetchWallpaper) sources
diff --git a/pkgs/watermark/default.nix b/pkgs/watermark/default.nix
index 6188ddb..5723516 100644
--- a/pkgs/watermark/default.nix
+++ b/pkgs/watermark/default.nix
@@ -6,7 +6,11 @@
}:
writeShellApplication {
name = "watermark";
- runtimeInputs = [coreutils imagemagick pdftk];
+ runtimeInputs = [
+ coreutils
+ imagemagick
+ pdftk
+ ];
text = ''
if [[ $1 == --help || $1 == -h ]]
then
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-25 03:46:45 +0000