Updating
This commit is contained in:
Generated
+8
-8
@@ -185,16 +185,16 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779506708,
|
"lastModified": 1782704057,
|
||||||
"narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=",
|
"narHash": "sha256-G1I1gd32F7mp9LAe1DaZ4ZL7NX5gyiKwdCMwro1Vrck=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f",
|
"rev": "868d0a692de703c2de98fab61968e4e310b7c28e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-25.11",
|
"ref": "release-26.05",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -372,16 +372,16 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1782847189,
|
"lastModified": 1782847225,
|
||||||
"narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=",
|
"narHash": "sha256-JC9PjqKYG9ve5U8aDOLQipp3+KLANBHUvGdLZlxzdKI=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b6018f87da91d19d0ab4cf979885689b469cdd41",
|
"rev": "95ca1e203c0750115fd4a6f17d5a245dfe6b1edd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-25.11",
|
"ref": "nixos-26.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|||||||
+34
-24
@@ -6,35 +6,45 @@ bootDisk = "/dev/disk/by-partlabel/disk-${hostname}-ESP";
|
|||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
boot.initrd.postDeviceCommands = lib.mkAfter ''
|
boot.initrd.supportedFilesystems = [ "btrfs" ];
|
||||||
mkdir /btrfs_tmp
|
|
||||||
mount ${rootDisk} /btrfs_tmp
|
|
||||||
|
|
||||||
# Ensure the old_roots directory exists
|
boot.initrd.systemd.services.rollback-root = {
|
||||||
mkdir -p /btrfs_tmp/old_roots
|
description = "Rollback btrfs root subvolume";
|
||||||
|
wantedBy = [ "initrd.target" ];
|
||||||
|
after = [ "systemd-cryptsetup@.service" ];
|
||||||
|
before = [ "sysroot.mount" ];
|
||||||
|
unitConfig.DefaultDependencies = "no";
|
||||||
|
serviceConfig.Type = "oneshot";
|
||||||
|
script = ''
|
||||||
|
mkdir -p /btrfs_tmp
|
||||||
|
mount ${rootDisk} /btrfs_tmp
|
||||||
|
|
||||||
if [[ -e /btrfs_tmp/root ]]; then
|
# Ensure the old_roots directory exists
|
||||||
timestamp=$(date +%Y-%m-%d_%H-%M-%S)
|
mkdir -p /btrfs_tmp/old_roots
|
||||||
mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp"
|
|
||||||
fi
|
|
||||||
|
|
||||||
delete_subvolume_recursively() {
|
if [[ -e /btrfs_tmp/root ]]; then
|
||||||
IFS=$'\n'
|
timestamp=$(date +%Y-%m-%d_%H-%M-%S)
|
||||||
for i in $(btrfs subvolume list -o "$1" | cut -f 9 -d ' '); do
|
mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp"
|
||||||
delete_subvolume_recursively "/btrfs_tmp/$i"
|
fi
|
||||||
|
|
||||||
|
delete_subvolume_recursively() {
|
||||||
|
IFS=$'\n'
|
||||||
|
for i in $(btrfs subvolume list -o "$1" | cut -f 9 -d ' '); do
|
||||||
|
delete_subvolume_recursively "/btrfs_tmp/$i"
|
||||||
|
done
|
||||||
|
btrfs subvolume delete "$1"
|
||||||
|
}
|
||||||
|
|
||||||
|
for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +7); do
|
||||||
|
# Don't delete the old_roots directory itself
|
||||||
|
if [[ "$i" == "/btrfs_tmp/old_roots/" ]]; then continue; fi
|
||||||
|
delete_subvolume_recursively "$i"
|
||||||
done
|
done
|
||||||
btrfs subvolume delete "$1"
|
|
||||||
}
|
|
||||||
|
|
||||||
for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +7); do
|
btrfs subvolume create /btrfs_tmp/root
|
||||||
# Don't delete the old_roots directory itself
|
umount /btrfs_tmp
|
||||||
if [[ "$i" == "/btrfs_tmp/old_roots/" ]]; then continue; fi
|
'';
|
||||||
delete_subvolume_recursively "$i"
|
};
|
||||||
done
|
|
||||||
|
|
||||||
btrfs subvolume create /btrfs_tmp/root
|
|
||||||
umount /btrfs_tmp
|
|
||||||
'';
|
|
||||||
|
|
||||||
# fileSystems."/" = {
|
# fileSystems."/" = {
|
||||||
# device = rootDisk;
|
# device = rootDisk;
|
||||||
|
|||||||
+1
-1
@@ -107,6 +107,7 @@
|
|||||||
name = "default";
|
name = "default";
|
||||||
isDefault = true;
|
isDefault = true;
|
||||||
search = {
|
search = {
|
||||||
|
force = true;
|
||||||
default = "holocron";
|
default = "holocron";
|
||||||
order = [ "holocron" "google" ];
|
order = [ "holocron" "google" ];
|
||||||
engines= {
|
engines= {
|
||||||
@@ -132,5 +133,4 @@
|
|||||||
};
|
};
|
||||||
xdg.configFile."voxtype/config.toml".enable = false;
|
xdg.configFile."voxtype/config.toml".enable = false;
|
||||||
home.file.".icons/default".source = "${pkgs.vimix-cursors}/share/icons/Vimix-white-cursors";
|
home.file.".icons/default".source = "${pkgs.vimix-cursors}/share/icons/Vimix-white-cursors";
|
||||||
home.file.".mozilla/firefox/default/search.json.mozlz4".force = lib.mkForce true;
|
|
||||||
}
|
}
|
||||||
|
|||||||
+15
-5
@@ -4,11 +4,21 @@
|
|||||||
networking = {
|
networking = {
|
||||||
hostName = hostname;
|
hostName = hostname;
|
||||||
networkmanager.enable = true;
|
networkmanager.enable = true;
|
||||||
wireless = {
|
networkmanager.wifi.backend = "iwd";
|
||||||
iwd.enable = true;
|
networkmanager.ensureProfiles.profiles = {
|
||||||
networks = {
|
"Outskirt Stable" = {
|
||||||
ssid = "Outskirt Stable";
|
connection = {
|
||||||
psk = "SidonPhlegm";
|
id = "Outskirt Stable";
|
||||||
|
type = "wifi";
|
||||||
|
};
|
||||||
|
wifi = {
|
||||||
|
ssid = "Outskirt Stable";
|
||||||
|
mode = "infrastructure";
|
||||||
|
};
|
||||||
|
wifi-security = {
|
||||||
|
key-mgmt = "wpa-psk";
|
||||||
|
psk = "SidonPhlegm";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
firewall = {
|
firewall = {
|
||||||
|
|||||||
+1
-1
@@ -36,7 +36,7 @@
|
|||||||
mako # Notification daemon
|
mako # Notification daemon
|
||||||
pkgs-unstable.neovim # Editor
|
pkgs-unstable.neovim # Editor
|
||||||
nix-gaming.mo2installer
|
nix-gaming.mo2installer
|
||||||
nodePackages.pnpm # JavaScript package manager (used by Neovim plugins)
|
pnpm # JavaScript package manager (used by Neovim plugins)
|
||||||
tree-sitter # Incremental parsing tool for editors
|
tree-sitter # Incremental parsing tool for editors
|
||||||
nodejs_24 # JavaScript runtime
|
nodejs_24 # JavaScript runtime
|
||||||
openssl # SSL/TLS toolkit
|
openssl # SSL/TLS toolkit
|
||||||
|
|||||||
Reference in New Issue
Block a user