Perciyte: disable lix (broken)

Vesktop -> Discord
substituteAll -> replaceVars
2025-06-22 10:23:11 -04:00 · 2025-06-20 01:13:10 -04:00 · 2025-06-20 01:12:03 -04:00 · 2025-06-20 01:05:27 -04:00
4 changed files with 51 additions and 59 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1727447169,
-        "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=",
+        "lastModified": 1749105467,
+        "narHash": "sha256-hXh76y/wDl15almBcqvjryB50B0BaiXJKk20f314RoE=",
        "owner": "serokell",
        "repo": "deploy-rs",
-        "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76",
+        "rev": "6bc76b872374845ba9d645a2f012b764fecd765f",
        "type": "github"
      },
      "original": {
@@ -23,11 +23,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
        "type": "github"
      },
      "original": {
@@ -112,11 +112,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742588233,
-        "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=",
+        "lastModified": 1750304462,
+        "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d",
+        "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c",
        "type": "github"
      },
      "original": {
@@ -190,11 +190,11 @@
        "spectrum": "spectrum"
      },
      "locked": {
-        "lastModified": 1743083165,
-        "narHash": "sha256-Fz7AiCJWtoWZ2guJwO3B1h3RuJxYWaCzFIqY0Kmkyrs=",
+        "lastModified": 1750358184,
+        "narHash": "sha256-17EYMeY5v8KRk9HW6Z4dExY8Wg4y/zM2eM2wbbx+vMs=",
        "owner": "astro",
        "repo": "microvm.nix",
-        "rev": "773d5a04e2e10ca7b412270dea11276a496e1b61",
+        "rev": "fd9f5dba1ffee5ad6f29394b2a9e4c66c1ce77dc",
        "type": "github"
      },
      "original": {
@@ -210,11 +210,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742595055,
-        "narHash": "sha256-cEetDber6LF8W4ThmRc4rwKs/o8y2GH0pUdX7e6CnAQ=",
+        "lastModified": 1750325256,
+        "narHash": "sha256-vvlxGz/waqJ3TGqM/iqXbnEc7/R1qnEXmaBiPaQ1RE0=",
        "owner": "LnL7",
        "repo": "nix-darwin",
-        "rev": "e9f41de2a81f04390afd106959adf352a207628f",
+        "rev": "0d71cbf88d63e938b37b85b3bf8b238bcf7b39b9",
        "type": "github"
      },
      "original": {
@@ -226,11 +226,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1702272962,
-        "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=",
+        "lastModified": 1743014863,
+        "narHash": "sha256-jAIUqsiN2r3hCuHji80U7NNEafpIMBXiwKlSrjWMlpg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d",
+        "rev": "bd3bac8bfb542dbde7ffffb6987a1a1f9d41699f",
        "type": "github"
      },
      "original": {
@@ -242,11 +242,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1742422364,
-        "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
+        "lastModified": 1750134718,
+        "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
+        "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c",
        "type": "github"
      },
      "original": {
@@ -258,11 +258,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1741865919,
-        "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=",
+        "lastModified": 1744868846,
+        "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a",
+        "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
        "type": "github"
      },
      "original": {
@@ -289,11 +289,11 @@
        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1742595978,
-        "narHash": "sha256-05onsoMrLyXE4XleDCeLC3bXnC4nyUbKWInGwM7v6hU=",
+        "lastModified": 1750119275,
+        "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "b7756921b002de60fb66782effad3ce8bdb5b25d",
+        "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2",
        "type": "github"
      },
      "original": {
@@ -305,11 +305,11 @@
    "spectrum": {
      "flake": false,
      "locked": {
-        "lastModified": 1733308308,
-        "narHash": "sha256-+RcbMAjSxV1wW5UpS9abIG1lFZC8bITPiFIKNnE7RLs=",
+        "lastModified": 1746869549,
+        "narHash": "sha256-BKZ/yZO/qeLKh9YqVkKB6wJiDQJAZNN5rk5NsMImsWs=",
        "ref": "refs/heads/main",
-        "rev": "80c9e9830d460c944c8f730065f18bb733bc7ee2",
-        "revCount": 792,
+        "rev": "d927e78530892ec8ed389e8fae5f38abee00ad87",
+        "revCount": 862,
        "type": "git",
        "url": "https://spectrum-os.org/git/spectrum"
      },
@@ -383,11 +383,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -63,14 +63,15 @@
            overlays.emacs
          ])
          modules.sops
-          lix-module.nixosModules.default
+          # Broken w/ this nixpkgs input
+          # lix-module.nixosModules.default
        ];
      };
      pericyte = nixosSystem' {
        modules = [
          ./machines/pericyte/configuration.nix
          modules.sops
-          lix-module.nixosModules.default
+          #lix-module.nixosModules.default
          microvm.nixosModules.host
        ];
      };
--- a/machines/universedesktop/desktop/dwm.nix
+++ b/machines/universedesktop/desktop/dwm.nix
@@ -2,11 +2,7 @@
  nixpkgs.overlays = [
    (final: prev: {
      st = prev.st.override {
-        conf = builtins.readFile (pkgs.substituteAll {
-          src = ./dwm/st-config.def.h;
-          env = {
-          };
-        });
+        conf = builtins.readFile (pkgs.replaceVars ./dwm/st-config.def.h {});
      };
    })
  ];
@@ -18,21 +14,18 @@
        emacsclient --create-frame --alternate-editor=""
      '';
    in pkgs.dwm.override {
-      conf = pkgs.substituteAll {
-        src = ./dwm/config.h;
-        env = {
-          dmenucmd="${pkgs.dmenu}/bin/dmenu_run";
-          termcmd="${pkgs.st}/bin/st";
-          editcmd="${launch_emacs}";
-          playcmd=pkgs.writeScript "playerctl-play-pause" ''
-            #!${pkgs.bash}/bin/bash
-            ${pkgs.playerctl}/bin/playerctl play-pause
-          '';
-          scrncmd=pkgs.writeScript "screenshot-region" ''
-            #!${pkgs.bash}/bin/bash
-            ${pkgs.maim}/bin/maim -o -s | ${pkgs.xclip}/bin/xclip -sel clip -t image/png
-          '';
-        };
+      conf = pkgs.replaceVars ./dwm/config.h {
+        dmenucmd="${pkgs.dmenu}/bin/dmenu_run";
+        termcmd="${pkgs.st}/bin/st";
+        editcmd="${launch_emacs}";
+        playcmd=pkgs.writeScript "playerctl-play-pause" ''
+          #!${pkgs.bash}/bin/bash
+          ${pkgs.playerctl}/bin/playerctl play-pause
+        '';
+        scrncmd=pkgs.writeScript "screenshot-region" ''
+          #!${pkgs.bash}/bin/bash
+          ${pkgs.maim}/bin/maim -o -s | ${pkgs.xclip}/bin/xclip -sel clip -t image/png
+        '';
      };
      patches = [
        ./dwm/fullscreen.patch
--- a/machines/universedesktop/programs/desktop.nix
+++ b/machines/universedesktop/programs/desktop.nix
@@ -24,9 +24,7 @@
      nextcloud-client
      libsForQt5.kdeconnect-kde

-      vesktop
-      slack
-      signal-desktop
+      discord
      zoom-us

      anki
Author	SHA1	Message	Date
David Crompton	8d71ea5657	Perciyte: disable lix (broken)	2025-06-22 10:23:11 -04:00
David Crompton	cde630dc74	Vesktop -> Discord	2025-06-20 01:13:10 -04:00
David Crompton	dfe853ec96	substituteAll -> replaceVars	2025-06-20 01:12:03 -04:00
David Crompton	84ee16c98a	flake.lock: Update Flake lock file updates: • Updated input 'deploy-rs': 'github:serokell/deploy-rs/aa07eb05537d4cd025e2310397a6adcedfe72c76' (2024-09-27) → 'github:serokell/deploy-rs/6bc76b872374845ba9d645a2f012b764fecd765f' (2025-06-05) • Updated input 'deploy-rs/flake-compat': 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04) → 'github:edolstra/flake-compat/ff81ac966bb2cae68946d5ed5fc4994f96d0ffec' (2024-12-04) • Updated input 'deploy-rs/nixpkgs': 'github:NixOS/nixpkgs/e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d' (2023-12-11) → 'github:NixOS/nixpkgs/bd3bac8bfb542dbde7ffffb6987a1a1f9d41699f' (2025-03-26) • Updated input 'deploy-rs/utils': 'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04) → 'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b' (2024-11-13) • Updated input 'home-manager': 'github:nix-community/home-manager/296ddc64627f4a6a4eb447852d7346b9dd16197d' (2025-03-21) → 'github:nix-community/home-manager/863842639722dd12ae9e37ca83bcb61a63b36f6c' (2025-06-19) • Updated input 'microvm': 'github:astro/microvm.nix/773d5a04e2e10ca7b412270dea11276a496e1b61' (2025-03-27) → 'github:astro/microvm.nix/fd9f5dba1ffee5ad6f29394b2a9e4c66c1ce77dc' (2025-06-19) • Updated input 'microvm/spectrum': 'git+https://spectrum-os.org/git/spectrum?ref=refs/heads/main&rev=80c9e9830d460c944c8f730065f18bb733bc7ee2' (2024-12-04) → 'git+https://spectrum-os.org/git/spectrum?ref=refs/heads/main&rev=d927e78530892ec8ed389e8fae5f38abee00ad87' (2025-05-10) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/e9f41de2a81f04390afd106959adf352a207628f' (2025-03-21) → 'github:LnL7/nix-darwin/0d71cbf88d63e938b37b85b3bf8b238bcf7b39b9' (2025-06-19) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/a84ebe20c6bc2ecbcfb000a50776219f48d134cc' (2025-03-19) → 'github:NixOS/nixpkgs/9e83b64f727c88a7711a2c463a7b16eedb69a84c' (2025-06-17) • Updated input 'sops-nix': 'github:Mic92/sops-nix/b7756921b002de60fb66782effad3ce8bdb5b25d' (2025-03-21) → 'github:Mic92/sops-nix/77c423a03b9b2b79709ea2cb63336312e78b72e2' (2025-06-17) • Updated input 'sops-nix/nixpkgs': 'github:NixOS/nixpkgs/573c650e8a14b2faa0041645ab18aed7e60f0c9a' (2025-03-13) → 'github:NixOS/nixpkgs/ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c' (2025-04-17)	2025-06-20 01:05:27 -04:00