flake: update lock file

home: avoid xresources
fixup! home/{firefox,thunderbird}: remove ifd
2024-06-29 11:18:11 +08:00 · 2024-06-29 06:45:12 +08:00 · 2024-06-28 08:52:44 +08:00 · 2024-06-28 08:52:34 +08:00 · 2024-06-24 11:40:52 +08:00 · 2024-06-23 22:56:16 +08:00
9 changed files with 77 additions and 92 deletions
--- a/flake.lock
+++ b/flake.lock
@ -10,11 +10,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718735045,
-        "narHash": "sha256-5PaPrMjQu0ojps12ecRO6qFntCU+pkUCrJIjDUFJknE=",
+        "lastModified": 1719619905,
+        "narHash": "sha256-i8Cbi+176SUig3BEHYQ38cb2c+zWSnG0Kg2G1TLosDM=",
        "owner": "ezKEa",
        "repo": "aagl-gtk-on-nix",
-        "rev": "2d4d6c0f286bd6901c8eab5e2d08593ca3394d6c",
+        "rev": "5869e0b884c95bc8791fcf30162d009a0d6267ba",
        "type": "github"
      },
      "original": {
@ -33,11 +33,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718403459,
-        "narHash": "sha256-6d+nrN/L8DUCCEioQkdXy71+lYs09sP4nExSMjEkw30=",
+        "lastModified": 1719288828,
+        "narHash": "sha256-jDKNistAmctLXTJvX8+ALJB2JgXqJHxkCoV+WkmqKhE=",
        "owner": "berberman",
        "repo": "flakes",
-        "rev": "de292d23437ff2a6c41b32f3449fae83deb88cfb",
+        "rev": "a050b5751c88e01135d20fe6c7d7ced20d623bcc",
        "type": "github"
      },
      "original": {
@ -53,11 +53,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718730147,
-        "narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=",
+        "lastModified": 1719249093,
+        "narHash": "sha256-0q1haa3sw6GbmJ+WhogMnducZGjEaCa/iR6hF2vq80I=",
        "owner": "ipetkov",
        "repo": "crane",
-        "rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c",
+        "rev": "9791c77eb7e98b8d8ac5b0305d47282f994411ca",
        "type": "github"
      },
      "original": {
@ -73,11 +73,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718846788,
-        "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=",
+        "lastModified": 1719582740,
+        "narHash": "sha256-s4WsLu2L8EzF5Hg2TkelFLVhKGL108AySnlw8voPe5U=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e",
+        "rev": "115311bc395f24c1b553338fec4b3aa28cbf5ae2",
        "type": "github"
      },
      "original": {
@ -168,11 +168,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718788307,
-        "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=",
+        "lastModified": 1719588253,
+        "narHash": "sha256-A03i8xiVgP14DCmV5P7VUv37eodCjY4e1iai0b2EuuM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca",
+        "rev": "7e68e55d2e16d3a1e92a679430728c35a30fd24e",
        "type": "github"
      },
      "original": {
@ -183,11 +183,11 @@
    },
    "impermanence": {
      "locked": {
-        "lastModified": 1717932370,
-        "narHash": "sha256-7C5lCpiWiyPoIACOcu2mukn/1JRtz6HC/1aEMhUdcw0=",
+        "lastModified": 1719091691,
+        "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=",
        "owner": "nix-community",
        "repo": "impermanence",
-        "rev": "27979f1c3a0d3b9617a3563e2839114ba7d48d3f",
+        "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a",
        "type": "github"
      },
      "original": {
@ -270,11 +270,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718662658,
-        "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=",
+        "lastModified": 1719128254,
+        "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=",
        "owner": "LnL7",
        "repo": "nix-darwin",
-        "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf",
+        "rev": "50581970f37f06a4719001735828519925ef8310",
        "type": "github"
      },
      "original": {
@ -352,11 +352,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718833139,
-        "narHash": "sha256-m+7obxxZ6Fgjz/Cs3mkax8xec+0cDwnxb4Ti6jAP/ik=",
+        "lastModified": 1719610737,
+        "narHash": "sha256-CUs7aehu5w/ikdY6L6Spyw9i6y9elELADhma9ngzBus=",
        "owner": "jacekszymanski",
        "repo": "nixcasks",
-        "rev": "592abedb3df4d8d10107065c12632ce08d972d71",
+        "rev": "1d2ef7c6c6c6c87bdd4a92d4899bc988eb6d9444",
        "type": "github"
      },
      "original": {
@ -367,11 +367,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1718806950,
-        "narHash": "sha256-E+W/kbedZAiOuPtT+KQRposLaXGDLd7lyK7oL3IH/5U=",
+        "lastModified": 1719552654,
+        "narHash": "sha256-PX3msbC5KdwCDnucGtir3qzlzv+1fuiU4tk17nljFIE=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "acb4f0e9bfa8ca2d6fca5e692307b5c994e7dbda",
+        "rev": "3980e7816c99d9e4da7a7b762e5b294055b73b2f",
        "type": "github"
      },
      "original": {
@ -397,11 +397,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1718710757,
-        "narHash": "sha256-zzHTI7iQByeuGDto16eRwPflCf3xfVOJJSB0/cnEd2s=",
+        "lastModified": 1719468428,
+        "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "56fc115880db6498245adecda277ccdb33025bc2",
+        "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d",
        "type": "github"
      },
      "original": {
@ -413,11 +413,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1718447546,
-        "narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=",
+        "lastModified": 1719234068,
+        "narHash": "sha256-1AjSIedDC/aERt24KsCUftLpVppW61S7awfjGe7bMio=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "842253bf992c3a7157b67600c2857193f126563a",
+        "rev": "90bd1b26e23760742fdcb6152369919098f05417",
        "type": "github"
      },
      "original": {
@ -468,11 +468,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1718873190,
-        "narHash": "sha256-puGZxr3LWT5DuHbpesgb8Hi2w0D07S7iJD92InUPU7c=",
+        "lastModified": 1719624082,
+        "narHash": "sha256-RpeJO2UN+XP1fiA6gPKwvW6+gw9m09lDuWdg67g+Zds=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "57f88b637d41f8f1f7c4a6d827ead6d9c4347e50",
+        "rev": "e7597af73696a7217e6fa5cacf1da240a2a42165",
        "type": "github"
      },
      "original": {
@ -523,11 +523,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718872830,
-        "narHash": "sha256-1EIYImP6ROTu2IuQtTG1aVcbXli+CgIXP7NpHqt7EXY=",
+        "lastModified": 1719259945,
+        "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=",
        "owner": "cachix",
        "repo": "pre-commit-hooks.nix",
-        "rev": "e4ea49a8c0c35b5bea2d033263c6c6b4b2a19a41",
+        "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07",
        "type": "github"
      },
      "original": {
@ -578,11 +578,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718849885,
-        "narHash": "sha256-Qfc5HKpQvGhWXox0WJVzLqrAcFm3uy6xtWRvVmrkLYc=",
+        "lastModified": 1719627476,
+        "narHash": "sha256-LBfULF+2sCaWmkjmj1LkkGrAS/E9ZdXU1A5wWKjt9p0=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "bc1a236757cd5f6622f73838e551fb2035afa44a",
+        "rev": "5be53be9e5c766fc72fc5d65ba8a566cc0c3217f",
        "type": "github"
      },
      "original": {
@ -617,11 +617,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718506969,
-        "narHash": "sha256-Pm9I/BMQHbsucdWf6y9G3xBZh3TMlThGo4KBbeoeczg=",
+        "lastModified": 1719268571,
+        "narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "797ce4c1f45a85df6dd3d9abdc53f2691bea9251",
+        "rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3",
        "type": "github"
      },
      "original": {
@ -637,11 +637,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718844164,
-        "narHash": "sha256-QUXWv6llKIQ5To2N24d9dRI78Hqfm9iFyhvmvlOICNo=",
+        "lastModified": 1719449101,
+        "narHash": "sha256-rRrz763KKi6GnSZF4WF34kpJ9eMXR3AOPOWN/7hO1Zs=",
        "owner": "nix-community",
        "repo": "srvos",
-        "rev": "557ff94aa1b48a723f8fa16eb9e7a2e6de991682",
+        "rev": "e938f07e5cd9d11576d3860b68c117932c161006",
        "type": "github"
      },
      "original": {
@ -672,11 +672,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718522839,
-        "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=",
+        "lastModified": 1719243788,
+        "narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81",
+        "rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf",
        "type": "github"
      },
      "original": {
--- a/home/applications/firefox/default.nix
+++ b/home/applications/firefox/default.nix
@ -3,13 +3,11 @@
    enable = true;
    package = pkgs.firefox.override {
      extraPrefsFiles = [
-        (pkgs.fetchurl {
-          url = "https://raw.githubusercontent.com/arkenfox/user.js/126.1/user.js";
-          hash = "sha256-XRtG0iLKh8uqbeX7Rc2H6VJwZYJoNZPBlAfZEfrSCP4=";
-        })
-        # FIXME: why I cannot use `[./user-overrides.js]`?
-        (pkgs.runCommand "userjs" {} ''
+        "${pkgs.arkenfox-userjs}/user.cfg"
+        (pkgs.runCommandLocal "userjs" {} ''
          install -Dm644 ${./user-overrides.js} $out
+          substituteInPlace $out \
+            --replace-fail "user_pref" "defaultPref"
        '')
      ];
    };
--- a/home/applications/foot/default.nix
+++ b/home/applications/foot/default.nix
@ -1,12 +1,9 @@
 {
-  pkgs,
-  lib,
-  ...
-}: {
  programs.foot = {
    enable = true;
    settings = {
      main.font = "monospace:size=10";
+      cursor.style = "beam";
    };
  };
 }
--- a/home/applications/thunderbird/default.nix
+++ b/home/applications/thunderbird/default.nix
@ -1,18 +1,15 @@
-{pkgs, ...}: {
+{
  programs.thunderbird = {
    enable = true;
-    package = pkgs.thunderbird.override {
-      extraPrefsFiles = [
-        (pkgs.fetchurl {
+    profiles.default = {
+      isDefault = true;
+      extraConfig = ''
+        ${builtins.readFile (builtins.fetchurl {
          url = "https://raw.githubusercontent.com/HorlogeSkynet/thunderbird-user.js/d6b18302e46349d9924c8a76951bae6efca51501/user.js";
-          hash = "sha256-66B1yLQkQnydAUXD7KGt32OhWSYcdWX+BUozrgW9uAg=";
-        })
-        # FIXME: why I cannot use `[./user-overrides.js]`?
-        (pkgs.runCommand "userjs" {} ''
-          install -Dm644 ${./user-overrides.js} $out
-        '')
-      ];
+          sha256 = "sha256-66B1yLQkQnydAUXD7KGt32OhWSYcdWX+BUozrgW9uAg=";
+        })}
+        ${builtins.readFile ./user-overrides.js}
+      '';
    };
-    profiles.default.isDefault = true;
  };
 }
--- a/hosts/aristotle/default.nix
+++ b/hosts/aristotle/default.nix
@ -54,6 +54,5 @@
  programs.adb.enable = true;

  # fucking hell
-  # FIXME: IFD
  programs.anime-game-launcher.enable = true;
 }
--- a/hosts/blacksteel/README.md
+++ b/hosts/blacksteel/README.md
@ -21,3 +21,4 @@ Homelab, hosting random stuff through tailscale and rathole.
  - [ ] tpm luks unlocking
 - [ ] nouveau -> nvidia
 - [x] networkmanager -> iwd
+- [ ] jellyfin hardware acceleration
--- a/hosts/lightsail-tokyo/default.nix
+++ b/hosts/lightsail-tokyo/default.nix
@ -58,15 +58,8 @@
  };

  ### Services
-  networking.firewall.allowedUDPPorts = [
-    # hysteria
-    443
-  ];
-  networking.firewall.allowedTCPPorts = [
-    # caddy
-    80
-    443
-  ];
+  networking.firewall.allowedUDPPorts = [443]; # hysteria
+  networking.firewall.allowedTCPPorts = [80 443]; # caddy

  systemd.tmpfiles.settings = {
    "10-www" = {
@ -83,12 +76,12 @@

      "element" = pkgs.element-web.override {
        element-web-unwrapped = pkgs.element-web-unwrapped.overrideAttrs (oldAttrs: {
-          version = "1.11.69";
+          version = "1.11.70-rc.0";
          src = oldAttrs.src.overrideAttrs {
-            outputHash = "sha256-oFSaKtig1z3jepLpwJW4i5VskMBhKUIbPsCfLQuCgMY=";
+            outputHash = "sha256-LnPqwXczECH7XnVvGnoUQpZct2jmGEFVpJ1nTewAHC8=";
          };
          offlineCache = oldAttrs.offlineCache.overrideAttrs {
-            outputHash = "sha256-ClpD/PIW3P1+d7KqDTl6gWNbqKaUi6JypE/yaVsB+Oc=";
+            outputHash = "sha256-yAAZXnxrBGuTWUJcL6Su0F5H2D5MNg9PUU7Uj8XT8N8=";
          };
        });

@ -176,12 +169,12 @@
  services.keycloak = {
    enable = true;
    settings = {
+      cache = "local";
+      hostname = "id.ny4.dev";
      http-host = "127.0.0.1";
      http-port = 8800;
      proxy = "edge";
-      hostname-strict-backchannel = true;
-      hostname = "id.ny4.dev";
-      cache = "local";
+      # proxy-headers = "xforwarded"; # FIXME: Key material not provided to setup HTTPS.
    };
    database.passwordFile = toString (pkgs.writeText "password" "keycloak");
  };
--- a/nixos/profiles/common/graphical/home/theme.nix
+++ b/nixos/profiles/common/graphical/home/theme.nix
@ -8,7 +8,6 @@
    name = "Adwaita";
    package = pkgs.gnome.adwaita-icon-theme;
    size = 24;
-    x11.enable = true;
    gtk.enable = true;
  };

--- a/pkgs/scripts/makeScript.nix
+++ b/pkgs/scripts/makeScript.nix
@ -1,7 +1,7 @@
 {
  lib,
  runtimeShell,
-  runCommandNoCCLocal,
+  runCommandLocal,
  makeBinaryWrapper,
 }: {
  name,
@ -9,9 +9,10 @@
  runtimeInputs ? [],
 }:
 # FIXME: incorrect argv0
-runCommandNoCCLocal name {
+runCommandLocal name {
  inherit src;
  nativeBuildInputs = [makeBinaryWrapper];
+  meta.mainProgram = name;
 } ''
  install -Dm755 $src $out/bin/.$name
  makeBinaryWrapper ${runtimeShell} $out/bin/$name \
Author	SHA1	Message	Date
Guanran Wang	c14c0b6f67	flake: update lock file	2024-06-29 11:18:11 +08:00
Guanran Wang	e905ce2b06	home: avoid xresources	2024-06-29 06:45:12 +08:00
Guanran Wang	b51d4531b0	fixup! home/{firefox,thunderbird}: remove ifd	2024-06-28 08:52:44 +08:00
Guanran Wang	fb973bc9bd	fixup! home: alacritty -> foot	2024-06-28 08:52:34 +08:00
Guanran Wang	3ed58a0463	flake: update lock file	2024-06-24 11:40:52 +08:00
Guanran Wang	356363909b	home/{firefox,thunderbird}: remove ifd	2024-06-23 22:56:16 +08:00
Guanran Wang	8cc84e0794	scripts: runCommandNoCCLocal -> runCommandLocal	2024-06-23 22:56:15 +08:00
Guanran Wang	1115737759	scripts: add meta.mainProgram	2024-06-23 22:56:15 +08:00
Guanran Wang	fa99555c12	home: alacritty -> foot	2024-06-23 22:56:15 +08:00
Guanran Wang	7b5fea2c98	overlays: drop prismlauncher offline mode	2024-06-23 22:56:15 +08:00
Guanran Wang	7b615740b6	home/gtk: fix font on gnome	2024-06-23 22:56:15 +08:00
Guanran Wang	b9d57f9d2f	nixos: frp -> cloudflared	2024-06-23 22:56:15 +08:00
Guanran Wang	abdf90a4b2	scripts: use makeScope	2024-06-23 22:56:15 +08:00
Guanran Wang	18daffc71b	home/starship: remove ifd	2024-06-23 22:56:14 +08:00
Guanran Wang	d1e28a69d7	home/mpv: revert wrapper workaround	2024-06-23 22:56:14 +08:00
Guanran Wang	97a70beb55	fixup! treewide: remove unused files	2024-06-23 22:56:14 +08:00
Guanran Wang	522b1b6728	flake: add devShells	2024-06-23 22:56:14 +08:00
Guanran Wang	bad9b9d54a	nixos: dont use keycloak master realm	2024-06-23 22:56:14 +08:00
Guanran Wang	f998c7c0d5	home: remove colorschemes	2024-06-23 22:56:14 +08:00
Guanran Wang	9f88130b47	flake: update lock file	2024-06-23 22:56:14 +08:00