mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

enable auto scrubbing and stuff

Browse Source
This commit is contained in:
mjallen18
2024-07-09 09:46:05 -05:00
parent e91bd250a4
commit f420ad44f2
4 changed files with 55 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
flake.lock generated
View File

@@ -11,11 +11,11 @@
"yafas": "yafas" "yafas": "yafas"
}, },
"locked": { "locked": {
"lastModified": 1719992991, "lastModified": 1720452593,
"narHash": "sha256-X1WYxzXRB/KbYLML90AtMTE0mpLHtAe6avSDBh203bs=", "narHash": "sha256-lE6r0ty6o3tbwSg8HGSMc4RVhtryRP7OtcmgEAvSwUM=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "378c12fede02f2cbdb14508af603cbefa334bcac", "rev": "5cd32d60b3f8ce3b0552103bb8de0635c3c0d87d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -256,11 +256,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720045378, "lastModified": 1720470846,
"narHash": "sha256-lmE7B+QXw7lWdBu5GQlUABSpzPk3YBb9VbV+IYK5djk=", "narHash": "sha256-7ftA4Bv5KfH4QdTRxqe8/Hz2YTKo+7IQ9n7vbNWgv28=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0a30138c694ab3b048ac300794c2eb599dc40266", "rev": "2fb5c1e0a17bc6059fa09dc411a43d75f35bb192",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -381,11 +381,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1719845423, "lastModified": 1720469887,
"narHash": "sha256-ZLHDmWAsHQQKnmfyhYSHJDlt8Wfjv6SQhl2qek42O7A=", "narHash": "sha256-BwPsGQ/EMqCreUc5j9Efj+wx13AjREtuHhbyHZygcE4=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "ec12b88104d6c117871fad55e931addac4626756", "rev": "fabc653517106127e2ed435fb52e7e8854354428",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -474,11 +474,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1719895800, "lastModified": 1720515935,
"narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=", "narHash": "sha256-8b+fzR4W2hI5axwB+4nBwoA15awPKkck4ghhCt8v39M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "6e253f12b1009053eff5344be5e835f604bb64cd", "rev": "a111ce6b537df12a39874aa9672caa87f8677eda",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -490,11 +490,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1719848872, "lastModified": 1720031269,
"narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -522,11 +522,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1719956923, "lastModified": 1720386169,
"narHash": "sha256-nNJHJ9kfPdzYsCOlHOnbiiyKjZUW5sWbwx3cakg3/C4=", "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "706eef542dec88cc0ed25b9075d3037564b2d164", "rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -538,11 +538,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1719848872, "lastModified": 1720418205,
"narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "rev": "655a58a72a6601292512670343087c2d75d859c1",
"type": "github" "type": "github"
}, },
"original": { "original": {

44
hosts/desktop/configuration.nix
View File

@@ -73,7 +73,12 @@ in
# Override kernel to latest # Override kernel to latest
kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_latest;
kernelParams = [ "quiet" ]; kernelParams = [
"quiet"
# needed cause ssd powersaving is broken af I guess
"nvme_core.default_ps_max_latency_us=0"
"pcie_aspm=off"
];
consoleLogLevel = 3; consoleLogLevel = 3;
bootspec.enable = true; bootspec.enable = true;
@@ -136,12 +141,12 @@ in
}; };
}; };
rsync-home = { # rsync-home = {
path = [ pkgs.bash pkgs.rsync ]; # path = [ pkgs.bash pkgs.rsync ];
script = '' # script = ''
rsync -rtpogv --progress --ignore-existing --exclude={'/home/matt/Games/*', '/home/matt/1TB/*'} -lHzs /home/matt /media/nas/backup/desktop-nix/home # rsync -rtpogv --progress --ignore-existing --exclude={'/home/matt/Games/*', '/home/matt/1TB/*'} -lHzs /home/matt /media/nas/backup/desktop-nix/home
''; # '';
}; # };
}; };
# Networking configs # Networking configs
@@ -179,6 +184,7 @@ in
kmod kmod
lact lact
nano nano
onlyoffice-bin
os-prober os-prober
papirus-icon-theme papirus-icon-theme
pciutils pciutils
@@ -215,17 +221,19 @@ in
}; };
services = { services = {
# borgbackup.jobs.home-matt = { borgbackup.jobs.home-matt = {
# paths = "/home/matt"; encryption.mode = "repokey";
# encryption.mode = "none"; encryption.passCommand = "cat /root/borg";
# # environment.BORG_RSH = "ssh -i /home/matt/.ssh/id_ed25519"; environment.BORG_RSH = "ssh -i /home/matt/.ssh/id_ed25519";
# repo = "/media/nas/backup/desktop-nix/home"; repo = "/media/nas/backup/desktop-nix/borg/home";
# compression = "auto,zstd"; compression = "auto,zstd";
# exclude = [ inhibitsSleep = true;
# "/home/matt/Games" paths = "/home/matt";
# "/home/matt/1TB" exclude = [
# ]; "/home/matt/Games"
# }; "/home/matt/1TB"
];
};
btrfs = { btrfs = {
autoScrub.enable = true; autoScrub.enable = true;

5
hosts/desktop/hardware-configuration.nix
View File

@@ -42,6 +42,7 @@
"subvol=nix" "subvol=nix"
"compress=zstd" "compress=zstd"
"noatime" "noatime"
"autodefrag"
]; ];
}; };
@@ -52,6 +53,7 @@
"subvol=etc" "subvol=etc"
"compress=zstd" "compress=zstd"
"noatime" "noatime"
"autodefrag"
]; ];
}; };
@@ -62,6 +64,7 @@
"subvol=root" "subvol=root"
"compress=zstd" "compress=zstd"
"noatime" "noatime"
"autodefrag"
]; ];
}; };
@@ -72,6 +75,7 @@
"subvol=log" "subvol=log"
"compress=zstd" "compress=zstd"
"noatime" "noatime"
"autodefrag"
]; ];
}; };
@@ -81,6 +85,7 @@
options = [ options = [
"subvol=home" "subvol=home"
"compress=zstd" "compress=zstd"
"autodefrag"
]; ];
}; };

3
hosts/nas/configuration.nix
View File

@@ -449,6 +449,7 @@ in
ninja ninja
nodejs-18_x nodejs-18_x
nut nut
nmon
protonvpn-cli protonvpn-cli
protonmail-bridge protonmail-bridge
pass pass
@@ -463,6 +464,7 @@ in
tpm2-tools tpm2-tools
tpm2-tss tpm2-tss
cryptsetup cryptsetup
duperemove
]; ];
}; };
@@ -471,6 +473,7 @@ in
fish.enable = false; fish.enable = false;
virt-manager.enable = true; virt-manager.enable = true;
nix-ld.enable = true; nix-ld.enable = true;
screen.enable = true;
}; };
power.ups = { power.ups = {