feat: update

fix: dont get scripts from overlay
2026-03-26 22:31:08 +01:00 · 2022-09-23 23:31:27 +02:00 · 2022-09-23 23:31:14 +02:00
6 changed files with 39 additions and 39 deletions
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -7,6 +7,7 @@
 }: let
  inherit (lib.strings) makeBinPath;
  inherit (import <niveum/lib>) localAddresses kieran;
+  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
 in {
  imports = [
    <home-manager/nixos>
@@ -38,14 +39,6 @@ in {
            });
          };
        };
-        overlays = [
-          (self: super: {
-            scripts = import <niveum/packages/scripts> {
-              pkgs = super;
-              lib = super.lib;
-            };
-          })
-        ];
      };
    }
    {
@@ -121,7 +114,7 @@ in {
          cd "$(mktemp -d)"
          pwd
        '';
-        swallow = command: "${pkgs.scripts.swallow}/bin/swallow ${command}";
+        swallow = command: "${scripts.swallow}/bin/swallow ${command}";
      in {
        "ß" = "${pkgs.utillinux}/bin/setsid";
        cat = "${pkgs.bat}/bin/bat --style=plain";
--- a/configs/i3.nix
+++ b/configs/i3.nix
@@ -5,6 +5,7 @@
  ...
 }: let
  inherit (import <niveum/lib>) defaultApplications colours;
+  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
  klem = import <niveum/packages/scripts/klem.nix> {
    inherit pkgs lib;
    config.scripts = {
@@ -26,13 +27,13 @@
        ${pkgs.coreutils}/bin/tr '[A-Za-z]' '[N-ZA-Mn-za-m]'
      '';
      "ipa" = pkgs.writers.writeDash "ipa" ''
-        ${pkgs.scripts.ipa}/bin/ipa
+        ${scripts.ipa}/bin/ipa
      '';
      "betacode" = pkgs.writers.writeDash "betacode" ''
-        ${pkgs.scripts.betacode}/bin/betacode
+        ${scripts.betacode}/bin/betacode
      '';
      "devanagari" = pkgs.writers.writeDash "devanagari" ''
-        ${pkgs.scripts.devanagari}/bin/devanagari
+        ${scripts.devanagari}/bin/devanagari
      '';
      "avesta" = pkgs.writeScript "avesta" (builtins.readFile <niveum/packages/scripts/avesta.sed>);
      "curl" = pkgs.writers.writeDash "curl" ''
@@ -227,9 +228,9 @@ in {
        "${modifier}+Return" = "exec ${(defaultApplications pkgs).terminal}";
        "${modifier}+t" = "exec ${(defaultApplications pkgs).fileManager}";
        "${modifier}+y" = "exec ${(defaultApplications pkgs).browser}";
-        "${modifier}+0" = "exec ${pkgs.scripts.menu-calc}/bin/=";
+        "${modifier}+0" = "exec ${scripts.menu-calc}/bin/=";

-        "${modifier}+Shift+w" = "exec ${pkgs.scripts.k-lock}/bin/k-lock";
+        "${modifier}+Shift+w" = "exec ${scripts.k-lock}/bin/k-lock";
        "${modifier}+d" = "exec ${pkgs.writers.writeDash "run" ''exec ${pkgs.rofi}/bin/rofi -modi run,window,ssh,filebrowser -show run''}";
        "${modifier}+Shift+d" = "exec ${
          pkgs.writers.writeDash "notemenu" ''
@@ -251,10 +252,10 @@ in {
          ''
        }";
        "${modifier}+p" = "exec --no-startup-id ${pkgs.rofi-pass}/bin/rofi-pass";
-        "${modifier}+u" = "exec ${pkgs.scripts.unicodmenu}/bin/unicodmenu";
+        "${modifier}+u" = "exec ${scripts.unicodmenu}/bin/unicodmenu";

        "${modifier}+F6" = "exec ${pkgs.xorg.xkill}/bin/xkill";
-        "${modifier}+F7" = "exec ${pkgs.scripts.showkeys-toggle}/bin/showkeys-toggle";
+        "${modifier}+F7" = "exec ${scripts.showkeys-toggle}/bin/showkeys-toggle";
        "${modifier}+F8" = "exec switch-theme toggle";
        "${modifier}+F9" = "exec ${pkgs.redshift}/bin/redshift -O 4000 -b 0.85";
        "${modifier}+F10" = "exec ${pkgs.redshift}/bin/redshift -x";
@@ -270,9 +271,9 @@ in {
        "XF86AudioNext" = "exec --no-startup-id ${pkgs.playerctl}/bin/playerctl next";
        "XF86AudioPrev" = "exec --no-startup-id ${pkgs.playerctl}/bin/playerctl previous";
        "XF86AudioStop" = "exec --no-startup-id ${pkgs.playerctl}/bin/playerctl stop";
-        "XF86ScreenSaver" = "exec ${pkgs.scripts.k-lock}/bin/k-lock";
+        "XF86ScreenSaver" = "exec ${scripts.k-lock}/bin/k-lock";

-        "XF86Display" = "exec ${pkgs.scripts.dmenurandr}/bin/dmenurandr";
+        "XF86Display" = "exec ${scripts.dmenurandr}/bin/dmenurandr";

        # key names detected with xorg.xev:
        # XF86WakeUp (fn twice)
--- a/configs/mpv.nix
+++ b/configs/mpv.nix
@@ -4,7 +4,8 @@
  config,
  ...
 }: let
-  swallow = command: "${pkgs.scripts.swallow}/bin/swallow ${command}";
+  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
+  swallow = command: "${scripts.swallow}/bin/swallow ${command}";
 in {
  environment.shellAliases.smpv = swallow "mpv";

--- a/configs/newsboat.nix
+++ b/configs/newsboat.nix
@@ -1,14 +1,17 @@
 {
  pkgs,
  config,
+  lib,
  ...
 }: let
+  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
+
  ytdl-format = "'bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best'";

  youtube-download = "${pkgs.ts}/bin/ts ${pkgs.yt-dlp}/bin/yt-dlp -f ${ytdl-format} --add-metadata";

  newsboat-home = "${config.users.users.me.home}/cloud/Seafile/Documents/newsboat";
-  linkhandler-bin = "${pkgs.scripts.linkhandler}/bin/linkhandler";
+  linkhandler-bin = "${scripts.linkhandler}/bin/linkhandler";

  newsboat-config = pkgs.writeText "config" ''
    auto-reload no
--- a/configs/packages.nix
+++ b/configs/packages.nix
@@ -8,6 +8,8 @@
  menstruation = pkgs.callPackage <menstruation-backend> {};
  pandoc-doc = pkgs.callPackage <niveum/packages/man/pandoc.nix> {};

+  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
+
  zoteroStyle = {
    name,
    sha256,
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1662759269,
-        "narHash": "sha256-lt8bAfEZudCQb+MxoNKmenhMTXhu3RCCyLYxU9t5FFk=",
+        "lastModified": 1663932797,
+        "narHash": "sha256-IH8ZBW99W2k7wKLS+Sat9HiKX1TPZjFTnsPizK5crok=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "9f7fe353b613d0e45d7a5cdbd1f13c96c15803dd",
+        "rev": "de3758e31a3a1bc79d569f5deb5dac39791bf9b6",
        "type": "github"
      },
      "original": {
@@ -110,11 +110,11 @@
    },
    "nixos-stable": {
      "locked": {
-        "lastModified": 1662739455,
-        "narHash": "sha256-nfUkPoIIhSXZFxvN2TU7LL7k5CbC1iuSaSkLGgViMvE=",
+        "lastModified": 1663855239,
+        "narHash": "sha256-A2B7rlFKmBikRwz/cmayWcTAhyIOdp2whjVCDGhg9Xw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "45b56b5321aed52d4464dc9af94dc1b20d477ac5",
+        "rev": "bcc68429a50c4ac051920c72c60e417202c19d79",
        "type": "github"
      },
      "original": {
@@ -126,11 +126,11 @@
    },
    "nixos-unstable": {
      "locked": {
-        "lastModified": 1660305968,
-        "narHash": "sha256-r0X1pZCSEA6mzt5OuTA7nHuLmvnbkwgpFAh1iLIx4GU=",
+        "lastModified": 1663850217,
+        "narHash": "sha256-tp9nXo1/IdN/xN9m06ryy0QUAEfoN6K56ObM/1QTAjc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c4a0efdd5a728e20791b8d8d2f26f90ac228ee8d",
+        "rev": "ae1dc133ea5f1538d035af41e5ddbc2ebcb67b90",
        "type": "github"
      },
      "original": {
@@ -211,11 +211,11 @@
    "stockholm": {
      "flake": false,
      "locked": {
-        "lastModified": 1661246925,
-        "narHash": "sha256-hGNCF4m3SuVogqoipmJzNIKoh03S/SMnO5oMHgfHWjA=",
+        "lastModified": 1663587256,
+        "narHash": "sha256-tOwUL8UFP8H8FosYVp8WiPr0nIPhcbN79nNJJgD0cUU=",
        "ref": "refs/heads/master",
-        "rev": "d1fa957ed5bf60767c83c96135f9142f6c96ea50",
-        "revCount": 10749,
+        "rev": "55957c6d6adb51d2079c117c1e7309c60ee0fe0f",
+        "revCount": 10779,
        "type": "git",
        "url": "https://cgit.lassul.us/stockholm"
      },
@@ -243,11 +243,11 @@
    "tinc-graph": {
      "flake": false,
      "locked": {
-        "lastModified": 1653080212,
-        "narHash": "sha256-BcfppAuVNp0hMcrMG/ZxE4juSrdQbJSUIA0eHS1/Wxo=",
+        "lastModified": 1663740920,
+        "narHash": "sha256-F04wF/6KkzZZ1d8r3xOqkXg1IlBl32LaUBnBYjWUA1A=",
        "owner": "kmein",
        "repo": "tinc-graph",
-        "rev": "ea0ef2e5542684d1d8e34a626cb9295dec33e70d",
+        "rev": "78e7ed7acae6a3a29f537fdbf5db993a63b46fff",
        "type": "github"
      },
      "original": {
@@ -290,11 +290,11 @@
    },
    "utils": {
      "locked": {
-        "lastModified": 1653893745,
-        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
        "type": "github"
      },
      "original": {
Author	SHA1	Message	Date
Kierán Meinhardt	c6a45b421b	feat: update	2022-09-23 23:31:27 +02:00
Kierán Meinhardt	b5addef848	fix: dont get scripts from overlay	2022-09-23 23:31:14 +02:00