Compare commits

..

7 commits

Author SHA1 Message Date
cy
618a6b544f
add tor, more qt libraries for nix-ld, add qbittorrent 2025-02-07 20:32:00 -05:00
cy
ad02597200
rip titan 2025-02-05 14:44:26 -05:00
cy
776b817675
Merge branch 'update' 2025-02-05 14:44:05 -05:00
cy
947941729c
fix grafana domain 2025-02-05 14:33:40 -05:00
cy
9d71fdb81f
flake update
Signed-off-by: cy <cy@cy7.sh>
2025-02-05 14:22:11 -05:00
cy
b219d4d5de
ytnix: downgrade kernel to 6.12
https://github.com/tomaspinho/rtl8821ce/issues/356
2025-02-05 14:13:50 -05:00
cy
579a3ada77
bring cything.io to chunk 2025-02-05 14:08:14 -05:00
7 changed files with 66 additions and 44 deletions

80
flake.lock generated
View file

@ -120,11 +120,11 @@
"rocksdb": "rocksdb" "rocksdb": "rocksdb"
}, },
"locked": { "locked": {
"lastModified": 1738132650, "lastModified": 1738740720,
"narHash": "sha256-ryebu2VoopIpr5+DuHIs2/x60u+3EzRJexYRWVJn2AE=", "narHash": "sha256-rE0+UOEfFEGzjjIFdfs1Q4MR/UjVh8Dy6T137Z+ySgo=",
"owner": "girlbossceo", "owner": "girlbossceo",
"repo": "conduwuit", "repo": "conduwuit",
"rev": "eb7d893c8675f955fa770c8ae6f1c32a2394284c", "rev": "fda8b3680986dc8e038d51b93f7d36bf5c991ef6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -157,11 +157,11 @@
}, },
"crane_2": { "crane_2": {
"locked": { "locked": {
"lastModified": 1737689766, "lastModified": 1738652123,
"narHash": "sha256-ivVXYaYlShxYoKfSo5+y5930qMKKJ8CLcAoIBPQfJ6s=", "narHash": "sha256-zdZek5FXK/k95J0vnLF0AMnYuZl4AjARq83blKuJBYY=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "6fe74265bbb6d016d663b1091f015e2976c4a527", "rev": "c7e015a5fcefb070778c7d91734768680188a9cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -562,11 +562,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738448366, "lastModified": 1738753876,
"narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=", "narHash": "sha256-yXT82kERWL4R81hfun9BuT478Q6ut0dJzdQjAxjRS38=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93", "rev": "f20b7a8ab527a2482f13754dc00b2deaddc34599",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -683,11 +683,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1738446528, "lastModified": 1738690832,
"narHash": "sha256-NYL/r7EXSyYP7nXuYGvGYMI9QtztGjVaKKofBt/pCv8=", "narHash": "sha256-gHJkxfk4ePMx5lhcF12r28lX6WdaH+a4y6GZhlaRQ1I=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "a51380645f61b33d37a536b596d16c481f7b84a6", "rev": "8553adbb414167d969ba720cae02ab0694f38bd4",
"revCount": 17342, "revCount": 17359,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/lix" "url": "https://git.lix.systems/lix-project/lix"
}, },
@ -737,11 +737,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1738502867, "lastModified": 1738770770,
"narHash": "sha256-92cVHcxV7j00BquLo5I4G8EwKzrq2AlHuD3AQV9r+T8=", "narHash": "sha256-nfapp7C4BbdvHTRA1HSRVYjD5Fk2FCKoyxQLzcL5X50=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "cf0be7affb15e21727d137c029146fe7df2bc6d0", "rev": "83abbde7c8164ee4b42a8647e4e61015c3f45816",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -770,11 +770,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1738479340, "lastModified": 1738768006,
"narHash": "sha256-sutel7RKfu9eIJsjswSzptCIvKELbXQCSldt0PtwSd0=", "narHash": "sha256-56jDYr/vqX4fobMJO2nWLjih03i6UV5bKtxI0nR4ZZA=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "d5592743cb04cef3fe50c987b7ba9349c5090dbd", "rev": "690d6355057ebeba03cbd8ce4905145b834c72f8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -832,11 +832,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738277753, "lastModified": 1738743987,
"narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=", "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9", "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -890,11 +890,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737361468, "lastModified": 1738573732,
"narHash": "sha256-+CtIrQZ22MOAOHcpg1zbhX/fVkmEc8A8lYVpXAbXElQ=", "narHash": "sha256-cyUaLyn9oQp/ArxVnpyajKXFQhe+xxGCEvscAOt2Kco=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-ld", "repo": "nix-ld",
"rev": "7f15f8622b63b907fef137689f4528a9447d9377", "rev": "8fed868d17954b09421d2456afccc2e7afdee96f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1065,11 +1065,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1738487426, "lastModified": 1738758495,
"narHash": "sha256-hnB0V0R/aKASnTBeTthFvW60uydv1xswWD4weqSuSfg=", "narHash": "sha256-CZ8T4vP3ag2hwkpSZjatxJb55ouszvmnWw09qxGW9TU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8ed1fafea6a613d962f6a84c1153d34dc8b06d83", "rev": "ceaea203f3ae1787b1bd13f021f686391696fc5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1102,11 +1102,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738517265, "lastModified": 1738780056,
"narHash": "sha256-ZzulGUIHZhvcSHx+1ucCJkIcn27r9H+cSzCCpKxJcls=", "narHash": "sha256-YFzhEMT77o//oQoUivd+huCj6f2L/LmrSfV75+6CCq8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "56d0c4579e022b44a3e324f722fa23a6f4295798", "rev": "2061a9ad95ca320a2bca00de6a9e30dbc5f52d74",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1125,11 +1125,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738445998, "lastModified": 1738508923,
"narHash": "sha256-wF2ZcRKF37re161jrXtNyjGMBDsIFtPeDvmIVfp8f7w=", "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "381d84a7422a4dbfef6a9c7703dbaf42036ae1c3", "rev": "86e2038290859006e05ca7201425ea5b5de4aecb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1285,11 +1285,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738463259, "lastModified": 1738722444,
"narHash": "sha256-+5QJpiRpkh1ALvKcMEpPyGwkPZfaynsYF4SFdNW5UfQ=", "narHash": "sha256-DHVyKCiIQVDqjYoVU2j7UaLNIlOnpB9sP1cPRNRpqvY=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "e2bb8c205a069514535f083742c7da8dfb6e02b9", "rev": "347fb01821c3cd8d54e563d244a599c1e27a393d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1355,11 +1355,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738070913, "lastModified": 1738680491,
"narHash": "sha256-j6jC12vCFsTGDmY2u1H12lMr62fnclNjuCtAdF1a4Nk=", "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "bebf27d00f7d10ba75332a0541ac43676985dea3", "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -124,6 +124,8 @@
ida-free ida-free
patchelf patchelf
radare2 radare2
p7zip
qbittorrent
]; ];
programs.waybar.enable = true; programs.waybar.enable = true;

View file

@ -15,4 +15,21 @@
import common import common
reverse_proxy localhost:8448 reverse_proxy localhost:8448
''; '';
services.caddy.virtualHosts."cything.io" = {
serverAliases = [ "www.cything.io" ];
extraConfig = ''
import common
header /.well-known/matrix/* Content-Type application/json
header /.well-known/matrix/* Access-Control-Allow-Origin *
header /.well-known/matrix/* Access-Control-Allow-Methods GET,POST,PUT,DELETE,OPTIONS,PATCH,HEAD
header /.well-known/matrix/* Access-Control-Allow-Headers X-Requested-With,Content-Type,Authorization,Origin,Accept
route {
respond /.well-known/matrix/server {"m.server":"chat.cything.io:443"}
respond /.well-known/matrix/client {"m.server":{"base_url":"https://chat.cything.io"},"m.homeserver":{"base_url":"https://chat.cything.io"},"org.matrix.msc3575.proxy":{"url":"https://chat.cything.io"}}
redir https://cy7.sh/posts{uri} permanent
}
'';
};
} }

View file

@ -25,6 +25,7 @@
./forgejo.nix ./forgejo.nix
./garage.nix ./garage.nix
./tailscale.nix ./tailscale.nix
./tor.nix
]; ];
sops.age.keyFile = "/root/.config/sops/age/keys.txt"; sops.age.keyFile = "/root/.config/sops/age/keys.txt";

View file

@ -7,7 +7,7 @@
http_port = 8088; http_port = 8088;
enforce_domain = true; enforce_domain = true;
enable_gzip = true; enable_gzip = true;
domain = "grafana.cything.io"; domain = "grafana.cy7.sh";
}; };
settings.analytics.reporting_enabled = false; settings.analytics.reporting_enabled = false;
}; };

View file

@ -53,7 +53,8 @@
efi.canTouchEfiVariables = false; # toggle when installing efi.canTouchEfiVariables = false; # toggle when installing
}; };
tmp.cleanOnBoot = true; tmp.cleanOnBoot = true;
kernelPackages = pkgs.linuxKernel.packages.linux_zen; # upgrade after https://github.com/tomaspinho/rtl8821ce/issues/356 is fixed
kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
extraModulePackages = with config.boot.kernelPackages; [ extraModulePackages = with config.boot.kernelPackages; [
rtl8821ce rtl8821ce
]; ];
@ -305,8 +306,10 @@
libplist libplist
p11-kit p11-kit
kdePackages.qtwayland kdePackages.qtwayland
qt6.full
qt6.qtwayland qt6.qtwayland
libsForQt5.qt5.qtwayland qt5.full
qt5.qtwayland
xorg.libX11 xorg.libX11
xorg.libxcb xorg.libxcb
xorg.xcbutilwm xorg.xcbutilwm

View file

@ -11,7 +11,6 @@ upgrade:
git switch update git switch update
sudo nixos-rebuild switch -L --flake . --use-substitutes sudo nixos-rebuild switch -L --flake . --use-substitutes
nixos-rebuild switch -L --flake .#chunk --target-host root@2a0f:85c1:840:2bfb::1 --use-substitutes nixos-rebuild switch -L --flake .#chunk --target-host root@2a0f:85c1:840:2bfb::1 --use-substitutes
nixos-rebuild switch -L --flake .#titan --target-host root@www.cything.io --use-substitutes
home-manager -L switch --flake . home-manager -L switch --flake .
git switch main git switch main
git merge update git merge update