Skip to content

Commit a3990fe

Browse files
committed
feat: disabled checksPhase via overlays + update lockfile + config attrs
1 parent eea72cb commit a3990fe

8 files changed

Lines changed: 333 additions & 155 deletions

File tree

PATCH

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ index 7ad39a58935c..edefdaa5f75c 100644
88
windows,
99
+ GLOBAL_RUSTFLAGS ? "",
1010
}:
11-
11+
1212
let
1313
@@ -79,6 +80,7 @@ lib.extendMkDerivation {
1414
# case for `rustfmt`/etc from the `rust-sources).
@@ -17,7 +17,7 @@ index 7ad39a58935c..edefdaa5f75c 100644
1717
+ RUSTFLAGS ? "",
1818
...
1919
}@args:
20-
20+
2121
@@ -93,11 +95,10 @@ lib.extendMkDerivation {
2222
PKG_CONFIG_ALLOW_CROSS = if stdenv.buildPlatform != stdenv.hostPlatform then 1 else 0;
2323
RUST_LOG = logLevel;
@@ -32,7 +32,7 @@ index 7ad39a58935c..edefdaa5f75c 100644
3232
+ + interpolateString (args.RUSTFLAGS or GLOBAL_RUSTFLAGS);
3333
}
3434
// args.env or { };
35-
35+
3636
diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix
3737
index 1f69bb92e213..0bf0bf9cdcce 100644
3838
--- a/pkgs/development/compilers/rust/make-rust-platform.nix
@@ -43,7 +43,7 @@ index 1f69bb92e213..0bf0bf9cdcce 100644
4343
makeScopeWithSplicing',
4444
+ GLOBAL_RUSTFLAGS ? "",
4545
}@prev:
46-
46+
4747
{
4848
@@ -36,6 +37,7 @@
4949
rustc
@@ -52,4 +52,4 @@ index 1f69bb92e213..0bf0bf9cdcce 100644
5252
+ GLOBAL_RUSTFLAGS
5353
;
5454
};
55-
55+

custom_modules/jellyfin.nix

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ in
4444
services.navidrome.package = nixpkgs-master.legacyPackages.${system}.navidrome;
4545
systemd.services.navidrome.serviceConfig.BindReadOnlyPaths = [ "/var/lib/musiclibrary" ];
4646

47-
services.jellyfin.enable = true;
47+
services.jellyfin.enable = false;
48+
users.groups.jellyfin = { };
4849
# services.jellyfin.user = "jrestivo";
4950
# per https://jellyfin.org/docs/general/networking/index.html
5051

@@ -377,6 +378,7 @@ in
377378
# }
378379
};
379380
};
381+
# TODO fix
380382
environment.etc."grafana-dashboards/nut/mynutdashboard.json" = {
381383
text =
382384
let
@@ -391,7 +393,18 @@ in
391393
group = "grafana";
392394
mode = "0644";
393395
};
394-
# TODO fix
396+
397+
systemd.services.upsmon.serviceConfig.LogNamespace = "power";
398+
systemd.services.upsd.serviceConfig.LogNamespace = "power";
399+
# The "@" targets the template, covering nut-driver@eaton5sc and any others
400+
systemd.services."nut-driver@".serviceConfig.LogNamespace = "power";
401+
402+
environment.etc."systemd/journald@power.conf".text = ''
403+
[Journal]
404+
MaxRetentionSec=infinity
405+
SystemMaxUse=500G
406+
Storage=persistent
407+
'';
395408

396409
# users = {
397410
# jrestivo = {

custom_modules/workstation_services.nix

Lines changed: 40 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ let
4242
goose-cli
4343
bingrep
4444
qwen-code
45-
aider-chat-full
45+
# aider-chat-full
4646
streamrip
4747
# libsForQt5.qt5.qtgui
4848
# libsForQt5.qt5.qtgamepad
@@ -200,7 +200,11 @@ in
200200
};
201201

202202
config = lib.mkIf cfg.enable {
203-
environment.plasma6.excludePackages = [ pkgs.kdePackages.baloo ];
203+
environment.plasma6.excludePackages = [
204+
pkgs.kdePackages.baloo
205+
pkgs.kdePackages.spectacle
206+
pkgs.kdePackages.kate
207+
];
204208
services.desktopManager.plasma6.enable = true;
205209
services.libinput.enable = true;
206210
services.displayManager.sddm.enable = true;
@@ -284,11 +288,11 @@ in
284288
fonts.packages = with pkgs; [
285289
d2coding
286290
# iosevka
287-
aileron
291+
# aileron
288292
nerd-fonts.fira-code
289293
fira-code
290294
fira-code-symbols
291-
fira-mono
295+
# fira-mono
292296
];
293297

294298
services.picom.enable = true;
@@ -382,30 +386,31 @@ in
382386
# # ];
383387
# };
384388

385-
services.ollama = {
386-
# package = tmpnixpkgs.ollama;
387-
#package = (import nixpkgs-stable { system = "x86_64-linux"; config.allowUnfree = true; }).ollama;
388-
loadModels = [
389-
"deepseek-r1:32b"
390-
"deepseek-r1:14b"
391-
"SIGJNF/deepseek-r1-671b-1.58bit"
392-
];
393-
enable = true;
394-
acceleration = "cuda";
395-
host = "0.0.0.0";
396-
# environmentVariables = {"OLLAMA_KV_CACHE_TYPE" = "q4_0"; };
397-
};
398-
services.open-webui = {
399-
# package = tmpnixpkgs.open-webui;
400-
openFirewall = true;
401-
enable = true;
402-
host = "0.0.0.0";
403-
environment = {
404-
OLLAMA_API_BASE_URL = "http://127.0.0.1:11434";
405-
# Disable authentication
406-
WEBUI_AUTH = "False";
407-
};
408-
};
389+
# services.ollama = {
390+
# # package = tmpnixpkgs.ollama;
391+
# #package = (import nixpkgs-stable { system = "x86_64-linux"; config.allowUnfree = true; }).ollama;
392+
# loadModels = [
393+
# "deepseek-r1:32b"
394+
# "deepseek-r1:14b"
395+
# "SIGJNF/deepseek-r1-671b-1.58bit"
396+
# ];
397+
# enable = true;
398+
# package = pkgs.ollama-cuda;
399+
# # acceleration = "cuda";
400+
# host = "0.0.0.0";
401+
# # environmentVariables = {"OLLAMA_KV_CACHE_TYPE" = "q4_0"; };
402+
# };
403+
# services.open-webui = {
404+
# # package = tmpnixpkgs.open-webui;
405+
# openFirewall = true;
406+
# enable = true;
407+
# host = "0.0.0.0";
408+
# environment = {
409+
# OLLAMA_API_BASE_URL = "http://127.0.0.1:11434";
410+
# # Disable authentication
411+
# WEBUI_AUTH = "False";
412+
# };
413+
# };
409414

410415
# programs.kdeconnect.enable = true;
411416

@@ -466,6 +471,13 @@ in
466471

467472
};
468473

474+
# retain a significant amount of logs
475+
services.journald.extraConfig = ''
476+
SystemMaxUse=500G
477+
MaxRetentionSec=6month
478+
MaxFileSec=1week
479+
'';
480+
469481
};
470482

471483
}

flake.lock

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)