Compare commits

..

No commits in common. "e0010827abb948142b3e45a0422a37d904c5c272" and "9d71fdb81f15f10846c6f7dfe65e21c4d43ddee4" have entirely different histories.

6 changed files with 31 additions and 34 deletions

56
flake.lock generated
View file

@ -120,11 +120,11 @@
"rocksdb": "rocksdb"
},
"locked": {
"lastModified": 1738969258,
"narHash": "sha256-LM2ZVeuqOH0YtIExyOCnwGLPQJhQqiuovBmjiMuvMUo=",
"lastModified": 1738740720,
"narHash": "sha256-rE0+UOEfFEGzjjIFdfs1Q4MR/UjVh8Dy6T137Z+ySgo=",
"owner": "girlbossceo",
"repo": "conduwuit",
"rev": "cfcd6eb1a6a117db94e6f9e631a0d881a62d3299",
"rev": "fda8b3680986dc8e038d51b93f7d36bf5c991ef6",
"type": "github"
},
"original": {
@ -562,11 +562,11 @@
]
},
"locked": {
"lastModified": 1738878603,
"narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=",
"lastModified": 1738753876,
"narHash": "sha256-yXT82kERWL4R81hfun9BuT478Q6ut0dJzdQjAxjRS38=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "433799271274c9f2ab520a49527ebfe2992dcfbd",
"rev": "f20b7a8ab527a2482f13754dc00b2deaddc34599",
"type": "github"
},
"original": {
@ -683,11 +683,11 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1738941053,
"narHash": "sha256-9xhDUs6BKrVAgR0FZtoOQRLW6rJI2djoCKODO8lvJ+M=",
"lastModified": 1738690832,
"narHash": "sha256-gHJkxfk4ePMx5lhcF12r28lX6WdaH+a4y6GZhlaRQ1I=",
"ref": "refs/heads/main",
"rev": "00a1afe022a0e4eee38759ccfba945c3eb74472e",
"revCount": 17368,
"rev": "8553adbb414167d969ba720cae02ab0694f38bd4",
"revCount": 17359,
"type": "git",
"url": "https://git.lix.systems/lix-project/lix"
},
@ -737,11 +737,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1738958180,
"narHash": "sha256-I1BUQ6qbXg0vZMffrdD/dV/1R+YMBVySgSk3fA9snf8=",
"lastModified": 1738770770,
"narHash": "sha256-nfapp7C4BbdvHTRA1HSRVYjD5Fk2FCKoyxQLzcL5X50=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "eaf57f2dbdd448d541bda6049ce99aab070f0db1",
"rev": "83abbde7c8164ee4b42a8647e4e61015c3f45816",
"type": "github"
},
"original": {
@ -770,11 +770,11 @@
"niri-unstable": {
"flake": false,
"locked": {
"lastModified": 1738911818,
"narHash": "sha256-7bhr9ldHrNP71qOmKI1Hu80uclx+Tco0RNmO+GKtC1Y=",
"lastModified": 1738768006,
"narHash": "sha256-56jDYr/vqX4fobMJO2nWLjih03i6UV5bKtxI0nR4ZZA=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "397e704d644d1bfe7736f2fdacbfe5742c7b2f9f",
"rev": "690d6355057ebeba03cbd8ce4905145b834c72f8",
"type": "github"
},
"original": {
@ -1065,11 +1065,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1738923654,
"narHash": "sha256-ozZdT3iS0GKhvwJtoPxvCKmMHKFkAf7clkGlDn9WbQ0=",
"lastModified": 1738758495,
"narHash": "sha256-CZ8T4vP3ag2hwkpSZjatxJb55ouszvmnWw09qxGW9TU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f59e5367f7449f906bdd01b3286750ce00fef306",
"rev": "ceaea203f3ae1787b1bd13f021f686391696fc5b",
"type": "github"
},
"original": {
@ -1102,11 +1102,11 @@
]
},
"locked": {
"lastModified": 1738966895,
"narHash": "sha256-OXOh35rTEnFSO4vj/SDMIlDvFPGW0ba1XhZkfx+AlL0=",
"lastModified": 1738780056,
"narHash": "sha256-YFzhEMT77o//oQoUivd+huCj6f2L/LmrSfV75+6CCq8=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "e7f20a602f6e08a70045f36c531bc44ba1baed07",
"rev": "2061a9ad95ca320a2bca00de6a9e30dbc5f52d74",
"type": "github"
},
"original": {
@ -1285,11 +1285,11 @@
]
},
"locked": {
"lastModified": 1738895285,
"narHash": "sha256-4Ukr4reJfQ67c6QqIxbX47wnPIGxE8BXCAEPu1C3MFM=",
"lastModified": 1738722444,
"narHash": "sha256-DHVyKCiIQVDqjYoVU2j7UaLNIlOnpB9sP1cPRNRpqvY=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "85f3aed5f4b8eb312c6e8fe8c476bac248aed75f",
"rev": "347fb01821c3cd8d54e563d244a599c1e27a393d",
"type": "github"
},
"original": {
@ -1355,11 +1355,11 @@
]
},
"locked": {
"lastModified": 1738953846,
"narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=",
"lastModified": 1738680491,
"narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "4f09b473c936d41582dd744e19f34ec27592c5fd",
"rev": "64dbb922d51a42c0ced6a7668ca008dded61c483",
"type": "github"
},
"original": {

View file

@ -125,7 +125,6 @@
patchelf
radare2
p7zip
qbittorrent
];
programs.waybar.enable = true;

View file

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

View file

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

View file

@ -306,10 +306,8 @@
libplist
p11-kit
kdePackages.qtwayland
qt6.full
qt6.qtwayland
qt5.full
qt5.qtwayland
libsForQt5.qt5.qtwayland
xorg.libX11
xorg.libxcb
xorg.xcbutilwm

View file

@ -11,6 +11,7 @@ upgrade:
git switch update
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 .#titan --target-host root@www.cything.io --use-substitutes
home-manager -L switch --flake .
git switch main
git merge update