Compare commits

..

13 commits

9 changed files with 92 additions and 77 deletions

View file

@ -10,11 +10,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719619905, "lastModified": 1718735045,
"narHash": "sha256-i8Cbi+176SUig3BEHYQ38cb2c+zWSnG0Kg2G1TLosDM=", "narHash": "sha256-5PaPrMjQu0ojps12ecRO6qFntCU+pkUCrJIjDUFJknE=",
"owner": "ezKEa", "owner": "ezKEa",
"repo": "aagl-gtk-on-nix", "repo": "aagl-gtk-on-nix",
"rev": "5869e0b884c95bc8791fcf30162d009a0d6267ba", "rev": "2d4d6c0f286bd6901c8eab5e2d08593ca3394d6c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -33,11 +33,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719288828, "lastModified": 1718403459,
"narHash": "sha256-jDKNistAmctLXTJvX8+ALJB2JgXqJHxkCoV+WkmqKhE=", "narHash": "sha256-6d+nrN/L8DUCCEioQkdXy71+lYs09sP4nExSMjEkw30=",
"owner": "berberman", "owner": "berberman",
"repo": "flakes", "repo": "flakes",
"rev": "a050b5751c88e01135d20fe6c7d7ced20d623bcc", "rev": "de292d23437ff2a6c41b32f3449fae83deb88cfb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -53,11 +53,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719249093, "lastModified": 1718730147,
"narHash": "sha256-0q1haa3sw6GbmJ+WhogMnducZGjEaCa/iR6hF2vq80I=", "narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "9791c77eb7e98b8d8ac5b0305d47282f994411ca", "rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -73,11 +73,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719582740, "lastModified": 1718846788,
"narHash": "sha256-s4WsLu2L8EzF5Hg2TkelFLVhKGL108AySnlw8voPe5U=", "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "115311bc395f24c1b553338fec4b3aa28cbf5ae2", "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -168,11 +168,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719588253, "lastModified": 1718788307,
"narHash": "sha256-A03i8xiVgP14DCmV5P7VUv37eodCjY4e1iai0b2EuuM=", "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7e68e55d2e16d3a1e92a679430728c35a30fd24e", "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -183,11 +183,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1719091691, "lastModified": 1717932370,
"narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=", "narHash": "sha256-7C5lCpiWiyPoIACOcu2mukn/1JRtz6HC/1aEMhUdcw0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a", "rev": "27979f1c3a0d3b9617a3563e2839114ba7d48d3f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -270,11 +270,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719128254, "lastModified": 1718662658,
"narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=", "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "50581970f37f06a4719001735828519925ef8310", "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -352,11 +352,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719610737, "lastModified": 1718833139,
"narHash": "sha256-CUs7aehu5w/ikdY6L6Spyw9i6y9elELADhma9ngzBus=", "narHash": "sha256-m+7obxxZ6Fgjz/Cs3mkax8xec+0cDwnxb4Ti6jAP/ik=",
"owner": "jacekszymanski", "owner": "jacekszymanski",
"repo": "nixcasks", "repo": "nixcasks",
"rev": "1d2ef7c6c6c6c87bdd4a92d4899bc988eb6d9444", "rev": "592abedb3df4d8d10107065c12632ce08d972d71",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -367,11 +367,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1719552654, "lastModified": 1718806950,
"narHash": "sha256-PX3msbC5KdwCDnucGtir3qzlzv+1fuiU4tk17nljFIE=", "narHash": "sha256-E+W/kbedZAiOuPtT+KQRposLaXGDLd7lyK7oL3IH/5U=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "3980e7816c99d9e4da7a7b762e5b294055b73b2f", "rev": "acb4f0e9bfa8ca2d6fca5e692307b5c994e7dbda",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -397,11 +397,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1719468428, "lastModified": 1718710757,
"narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=", "narHash": "sha256-zzHTI7iQByeuGDto16eRwPflCf3xfVOJJSB0/cnEd2s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d", "rev": "56fc115880db6498245adecda277ccdb33025bc2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -413,11 +413,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1719234068, "lastModified": 1718447546,
"narHash": "sha256-1AjSIedDC/aERt24KsCUftLpVppW61S7awfjGe7bMio=", "narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "90bd1b26e23760742fdcb6152369919098f05417", "rev": "842253bf992c3a7157b67600c2857193f126563a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -468,11 +468,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1719624082, "lastModified": 1718873190,
"narHash": "sha256-RpeJO2UN+XP1fiA6gPKwvW6+gw9m09lDuWdg67g+Zds=", "narHash": "sha256-puGZxr3LWT5DuHbpesgb8Hi2w0D07S7iJD92InUPU7c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "e7597af73696a7217e6fa5cacf1da240a2a42165", "rev": "57f88b637d41f8f1f7c4a6d827ead6d9c4347e50",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -523,11 +523,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719259945, "lastModified": 1718872830,
"narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", "narHash": "sha256-1EIYImP6ROTu2IuQtTG1aVcbXli+CgIXP7NpHqt7EXY=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", "rev": "e4ea49a8c0c35b5bea2d033263c6c6b4b2a19a41",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -578,11 +578,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719627476, "lastModified": 1718849885,
"narHash": "sha256-LBfULF+2sCaWmkjmj1LkkGrAS/E9ZdXU1A5wWKjt9p0=", "narHash": "sha256-Qfc5HKpQvGhWXox0WJVzLqrAcFm3uy6xtWRvVmrkLYc=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "5be53be9e5c766fc72fc5d65ba8a566cc0c3217f", "rev": "bc1a236757cd5f6622f73838e551fb2035afa44a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -617,11 +617,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719268571, "lastModified": 1718506969,
"narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=", "narHash": "sha256-Pm9I/BMQHbsucdWf6y9G3xBZh3TMlThGo4KBbeoeczg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3", "rev": "797ce4c1f45a85df6dd3d9abdc53f2691bea9251",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -637,11 +637,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719449101, "lastModified": 1718844164,
"narHash": "sha256-rRrz763KKi6GnSZF4WF34kpJ9eMXR3AOPOWN/7hO1Zs=", "narHash": "sha256-QUXWv6llKIQ5To2N24d9dRI78Hqfm9iFyhvmvlOICNo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "srvos", "repo": "srvos",
"rev": "e938f07e5cd9d11576d3860b68c117932c161006", "rev": "557ff94aa1b48a723f8fa16eb9e7a2e6de991682",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -672,11 +672,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719243788, "lastModified": 1718522839,
"narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=", "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf", "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -3,11 +3,13 @@
enable = true; enable = true;
package = pkgs.firefox.override { package = pkgs.firefox.override {
extraPrefsFiles = [ extraPrefsFiles = [
"${pkgs.arkenfox-userjs}/user.cfg" (pkgs.fetchurl {
(pkgs.runCommandLocal "userjs" {} '' 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" {} ''
install -Dm644 ${./user-overrides.js} $out install -Dm644 ${./user-overrides.js} $out
substituteInPlace $out \
--replace-fail "user_pref" "defaultPref"
'') '')
]; ];
}; };

View file

@ -1,9 +1,12 @@
{ {
pkgs,
lib,
...
}: {
programs.foot = { programs.foot = {
enable = true; enable = true;
settings = { settings = {
main.font = "monospace:size=10"; main.font = "monospace:size=10";
cursor.style = "beam";
}; };
}; };
} }

View file

@ -1,15 +1,18 @@
{ {pkgs, ...}: {
programs.thunderbird = { programs.thunderbird = {
enable = true; enable = true;
profiles.default = { package = pkgs.thunderbird.override {
isDefault = true; extraPrefsFiles = [
extraConfig = '' (pkgs.fetchurl {
${builtins.readFile (builtins.fetchurl {
url = "https://raw.githubusercontent.com/HorlogeSkynet/thunderbird-user.js/d6b18302e46349d9924c8a76951bae6efca51501/user.js"; url = "https://raw.githubusercontent.com/HorlogeSkynet/thunderbird-user.js/d6b18302e46349d9924c8a76951bae6efca51501/user.js";
sha256 = "sha256-66B1yLQkQnydAUXD7KGt32OhWSYcdWX+BUozrgW9uAg="; hash = "sha256-66B1yLQkQnydAUXD7KGt32OhWSYcdWX+BUozrgW9uAg=";
})} })
${builtins.readFile ./user-overrides.js} # FIXME: why I cannot use `[./user-overrides.js]`?
''; (pkgs.runCommand "userjs" {} ''
install -Dm644 ${./user-overrides.js} $out
'')
];
}; };
profiles.default.isDefault = true;
}; };
} }

View file

@ -54,5 +54,6 @@
programs.adb.enable = true; programs.adb.enable = true;
# fucking hell # fucking hell
# FIXME: IFD
programs.anime-game-launcher.enable = true; programs.anime-game-launcher.enable = true;
} }

View file

@ -21,4 +21,3 @@ Homelab, hosting random stuff through tailscale and rathole.
- [ ] tpm luks unlocking - [ ] tpm luks unlocking
- [ ] nouveau -> nvidia - [ ] nouveau -> nvidia
- [x] networkmanager -> iwd - [x] networkmanager -> iwd
- [ ] jellyfin hardware acceleration

View file

@ -58,8 +58,15 @@
}; };
### Services ### Services
networking.firewall.allowedUDPPorts = [443]; # hysteria networking.firewall.allowedUDPPorts = [
networking.firewall.allowedTCPPorts = [80 443]; # caddy # hysteria
443
];
networking.firewall.allowedTCPPorts = [
# caddy
80
443
];
systemd.tmpfiles.settings = { systemd.tmpfiles.settings = {
"10-www" = { "10-www" = {
@ -76,12 +83,12 @@
"element" = pkgs.element-web.override { "element" = pkgs.element-web.override {
element-web-unwrapped = pkgs.element-web-unwrapped.overrideAttrs (oldAttrs: { element-web-unwrapped = pkgs.element-web-unwrapped.overrideAttrs (oldAttrs: {
version = "1.11.70-rc.0"; version = "1.11.69";
src = oldAttrs.src.overrideAttrs { src = oldAttrs.src.overrideAttrs {
outputHash = "sha256-LnPqwXczECH7XnVvGnoUQpZct2jmGEFVpJ1nTewAHC8="; outputHash = "sha256-oFSaKtig1z3jepLpwJW4i5VskMBhKUIbPsCfLQuCgMY=";
}; };
offlineCache = oldAttrs.offlineCache.overrideAttrs { offlineCache = oldAttrs.offlineCache.overrideAttrs {
outputHash = "sha256-yAAZXnxrBGuTWUJcL6Su0F5H2D5MNg9PUU7Uj8XT8N8="; outputHash = "sha256-ClpD/PIW3P1+d7KqDTl6gWNbqKaUi6JypE/yaVsB+Oc=";
}; };
}); });
@ -169,12 +176,12 @@
services.keycloak = { services.keycloak = {
enable = true; enable = true;
settings = { settings = {
cache = "local";
hostname = "id.ny4.dev";
http-host = "127.0.0.1"; http-host = "127.0.0.1";
http-port = 8800; http-port = 8800;
proxy = "edge"; proxy = "edge";
# proxy-headers = "xforwarded"; # FIXME: Key material not provided to setup HTTPS. hostname-strict-backchannel = true;
hostname = "id.ny4.dev";
cache = "local";
}; };
database.passwordFile = toString (pkgs.writeText "password" "keycloak"); database.passwordFile = toString (pkgs.writeText "password" "keycloak");
}; };

View file

@ -8,6 +8,7 @@
name = "Adwaita"; name = "Adwaita";
package = pkgs.gnome.adwaita-icon-theme; package = pkgs.gnome.adwaita-icon-theme;
size = 24; size = 24;
x11.enable = true;
gtk.enable = true; gtk.enable = true;
}; };

View file

@ -1,7 +1,7 @@
{ {
lib, lib,
runtimeShell, runtimeShell,
runCommandLocal, runCommandNoCCLocal,
makeBinaryWrapper, makeBinaryWrapper,
}: { }: {
name, name,
@ -9,10 +9,9 @@
runtimeInputs ? [], runtimeInputs ? [],
}: }:
# FIXME: incorrect argv0 # FIXME: incorrect argv0
runCommandLocal name { runCommandNoCCLocal name {
inherit src; inherit src;
nativeBuildInputs = [makeBinaryWrapper]; nativeBuildInputs = [makeBinaryWrapper];
meta.mainProgram = name;
} '' } ''
install -Dm755 $src $out/bin/.$name install -Dm755 $src $out/bin/.$name
makeBinaryWrapper ${runtimeShell} $out/bin/$name \ makeBinaryWrapper ${runtimeShell} $out/bin/$name \