some changes reverted

This commit is contained in:
2026-06-10 00:26:43 -05:00
parent 1384fccf88
commit 5f3e317cde
3 changed files with 51 additions and 32 deletions
+6 -3
View File
@@ -64,7 +64,7 @@
useDHCP = true; useDHCP = true;
networkmanager.enable = false; networkmanager.enable = false;
wireless = { wireless = {
userControlled.enable = true; userControlled = true;
enable = true; enable = true;
secretsFile = config.sops.secrets."networkPasswords".path; secretsFile = config.sops.secrets."networkPasswords".path;
networks = { networks = {
@@ -125,7 +125,9 @@
shell = pkgs.fish; shell = pkgs.fish;
}; };
# Delete root on reboot boot.zfs.forceImportRoot = false;
/*
# Delete root on reboot disable for now while broken
boot.initrd.systemd.services = { boot.initrd.systemd.services = {
rollback = { rollback = {
description = "Rollback root zfs dataset to blank snapshot"; description = "Rollback root zfs dataset to blank snapshot";
@@ -145,6 +147,7 @@
}; };
}; };
*/
nix = { nix = {
settings.experimental-features = [ settings.experimental-features = [
@@ -156,7 +159,7 @@
automatic = true; automatic = true;
persistent = true; persistent = true;
dates = [ "daily" ]; dates = [ "daily" ];
options = "--delete-older-than 7d"; options = "--delete-older-than 30d";
}; };
}; };
Generated
+20 -6
View File
@@ -28,11 +28,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1780977789, "lastModified": 1781064146,
"narHash": "sha256-UFJfQlvInbsVaTK5XC2lafdqWlwiNP5LuQFYfDKq6Dc=", "narHash": "sha256-HjjvV8nCE6/sTgghlTW1ht8Rs3VZB55tV8wWces8DwY=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "0b627f105ea3baa2fa10308a6a67a8f8cbbb3e2a", "rev": "5213e7922ccfed3b070bf125c103504bc37852eb",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@@ -156,12 +156,26 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": {
"locked": {
"lastModified": 1780453794,
"narHash": "sha256-bXMRa9VTsHSPXL4Cw8R6JJLQeY3Y/IP4+YJCYVmQ7FY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6b316287bae2ee04c9b93c8c858d930fd07d7338",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-26.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": [ "nixpkgs": "nixpkgs_3",
"nixpkgs"
],
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
+4 -2
View File
@@ -44,9 +44,8 @@
settings = { settings = {
user.name = "Roy Dumblauskas"; user.name = "Roy Dumblauskas";
user.email = "roydumblauskas@gmail.com"; user.email = "roydumblauskas@gmail.com";
};
aliases = { alias = {
gp = "push"; gp = "push";
gc = "commit -am"; gc = "commit -am";
ga = "git add ."; ga = "git add .";
@@ -54,6 +53,8 @@
}; };
}; };
};
# user program config files # user program config files
home.file = { home.file = {
".config/hypr".source = ./roy-config/hypr; ".config/hypr".source = ./roy-config/hypr;
@@ -94,6 +95,7 @@
# Configure firefox to be resilient against reboot # Configure firefox to be resilient against reboot
# Source = https://github.com/johnmpost/nixos-config # Source = https://github.com/johnmpost/nixos-config
programs.firefox = { programs.firefox = {
configPath = ".mozilla/firefox";
enable = true; enable = true;
profiles.roy = { profiles.roy = {