Compare commits

..

No commits in common. "68d5cac1be18d8fba6de41a30bb5c1595187805e" and "469b1f78b437e41a7a94fe5737454459f013b712" have entirely different histories.

5 changed files with 49 additions and 79 deletions

View file

@ -13,12 +13,12 @@
"name": null, "name": null,
"owner": "hackthedev", "owner": "hackthedev",
"repo": "dcts-client-shipping", "repo": "dcts-client-shipping",
"rev": "v3.3", "rev": "v2.5",
"sha256": "sha256-Xq3xCeRNB5wNHz1cMxk540xl7Zz3DPdk79Yz1zHsEfU=", "sha256": "sha256-fmU/rUIyHV/+GSgDuot3mDaZrYmxfhF3RXSAwE6HqPU=",
"sparseCheckout": [], "sparseCheckout": [],
"type": "github" "type": "github"
}, },
"version": "v3.3" "version": "v2.5"
}, },
"mender-cli": { "mender-cli": {
"cargoLock": null, "cargoLock": null,
@ -231,11 +231,11 @@
"passthru": null, "passthru": null,
"pinned": false, "pinned": false,
"src": { "src": {
"sha256": "sha256-DttSpfkjiYnTlnzzd87Rc/eLTJ+MyZzFIfsnhf0UKg8=", "sha256": "sha256-6Qh5hcXM886OiOpcg73EU35kvnyvTtyJ1+7CSPzBsSA=",
"type": "tarball", "type": "tarball",
"url": "https://thunderstore.io/package/download/ValheimModding/Jotunn/2.29.0/" "url": "https://thunderstore.io/package/download/ValheimModding/Jotunn/2.28.0/"
}, },
"version": "2.29.0" "version": "2.28.0"
}, },
"valheim.jsondotnet": { "valheim.jsondotnet": {
"cargoLock": null, "cargoLock": null,
@ -315,11 +315,11 @@
"passthru": null, "passthru": null,
"pinned": false, "pinned": false,
"src": { "src": {
"sha256": "sha256-XRS4WX2B35oEt4kyg/d9ZehkVBqDCheu1ZpoCE0txrQ=", "sha256": "sha256-A7WIMjNkkZoUD9xf5gswOv00/4j/NGkE+yD4gM+bAsY=",
"type": "tarball", "type": "tarball",
"url": "https://thunderstore.io/package/download/Advize/PlantEasily/2.1.1/" "url": "https://thunderstore.io/package/download/Advize/PlantEasily/2.1.0/"
}, },
"version": "2.1.1" "version": "2.1.0"
}, },
"valheim.quickteleport": { "valheim.quickteleport": {
"cargoLock": null, "cargoLock": null,

View file

@ -8,13 +8,13 @@
{ {
dcts-client-shipping = { dcts-client-shipping = {
pname = "dcts-client-shipping"; pname = "dcts-client-shipping";
version = "v3.3"; version = "v2.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hackthedev"; owner = "hackthedev";
repo = "dcts-client-shipping"; repo = "dcts-client-shipping";
rev = "v3.3"; rev = "v2.5";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-Xq3xCeRNB5wNHz1cMxk540xl7Zz3DPdk79Yz1zHsEfU="; sha256 = "sha256-fmU/rUIyHV/+GSgDuot3mDaZrYmxfhF3RXSAwE6HqPU=";
}; };
}; };
mender-cli = { mender-cli = {
@ -135,10 +135,10 @@
}; };
"valheim.jotunn" = { "valheim.jotunn" = {
pname = "valheim.jotunn"; pname = "valheim.jotunn";
version = "2.29.0"; version = "2.28.0";
src = fetchTarball { src = fetchTarball {
url = "https://thunderstore.io/package/download/ValheimModding/Jotunn/2.29.0/"; url = "https://thunderstore.io/package/download/ValheimModding/Jotunn/2.28.0/";
sha256 = "sha256-DttSpfkjiYnTlnzzd87Rc/eLTJ+MyZzFIfsnhf0UKg8="; sha256 = "sha256-6Qh5hcXM886OiOpcg73EU35kvnyvTtyJ1+7CSPzBsSA=";
}; };
}; };
"valheim.jsondotnet" = { "valheim.jsondotnet" = {
@ -183,10 +183,10 @@
}; };
"valheim.planteasily" = { "valheim.planteasily" = {
pname = "valheim.planteasily"; pname = "valheim.planteasily";
version = "2.1.1"; version = "2.1.0";
src = fetchTarball { src = fetchTarball {
url = "https://thunderstore.io/package/download/Advize/PlantEasily/2.1.1/"; url = "https://thunderstore.io/package/download/Advize/PlantEasily/2.1.0/";
sha256 = "sha256-XRS4WX2B35oEt4kyg/d9ZehkVBqDCheu1ZpoCE0txrQ="; sha256 = "sha256-A7WIMjNkkZoUD9xf5gswOv00/4j/NGkE+yD4gM+bAsY=";
}; };
}; };
"valheim.quickteleport" = { "valheim.quickteleport" = {

54
flake.lock generated
View file

@ -231,11 +231,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776661682, "lastModified": 1776046499,
"narHash": "sha256-X32LTSDqUdVqMy85WYdRgyt0I75wc4Lhi9j+lrCDR8w=", "narHash": "sha256-Wzc4nn07/0RL21ypPHRzNDQZcjhIC8LaYo7QJQjM5T4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4bfce11ea820df0359f73736fd59c7e8f53641a6", "rev": "287f84846c1eb3b72c986f5f6bebcff0bd67440d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -273,11 +273,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776184304, "lastModified": 1774991950,
"narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=", "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3c7524c68348ef79ce48308e0978611a050089b2", "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -353,11 +353,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776242217, "lastModified": 1774613805,
"narHash": "sha256-TRts0fKUPFcf1i6rZHFGUDTfti/x3oKEg/CqsPRpSgs=", "narHash": "sha256-SP8U4AhZbNaoQtZGAzVIkw56pOObacxcArqPNjc3FQc=",
"owner": "thiagokokada", "owner": "thiagokokada",
"repo": "nix-alien", "repo": "nix-alien",
"rev": "4c5e52dda0d6ab3de814e364046769321d3e1021", "rev": "406827a0064e940578c18be868198aa06f443792",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -390,11 +390,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775970782, "lastModified": 1773550613,
"narHash": "sha256-7jt9Vpm48Yy5yAWigYpde+HxtYEpEuyzIQJF4VYehhk=", "narHash": "sha256-G0xzE48epaG6qOiByH+gV4rFcpbnnTbOHgUFITK0oX8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "bedba5989b04614fc598af9633033b95a937933f", "rev": "7cd5322ed4a2bf68f9111b27b89249501a62854c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -427,11 +427,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1776169885, "lastModified": 1775710090,
"narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -478,11 +478,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1776630589, "lastModified": 1775892726,
"narHash": "sha256-Ty/cyZ8tnxYliznpVG1ntziWaTfUAROHkHFR8k+p5j4=", "narHash": "sha256-1TK1pe33cEHNvGW41TP5xAzrbG1Gp7LfyFL6c3+xf+I=",
"owner": "NotAShelf", "owner": "NotAShelf",
"repo": "nvf", "repo": "nvf",
"rev": "cd9c79b8cd012beaba818df713a0e0ea632b74a3", "rev": "5ab359ee7dfd3fa09a5c6f863efaf810bb9a9436",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -513,11 +513,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776119890, "lastModified": 1775971308,
"narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=", "narHash": "sha256-VKp9bhVSm0bT6JWctFy06ocqxGGnWHi1NfoE90IgIcY=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd", "rev": "31ac5fe5d015f76b54058c69fcaebb66a55871a4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -567,11 +567,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1776170745, "lastModified": 1775936757,
"narHash": "sha256-Tl1aZVP5EIlT+k0+iAKH018GLHJpLz3hhJ0LNQOWxCc=", "narHash": "sha256-KJO/7qoxJ+hlsb3WlFSl6IGrExBIf1GvKdrhOlnGdKY=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "e3861617645a43c9bbefde1aa6ac54dd0a44bfa9", "rev": "d3e447786b74d62c75f665e17cb3e681c66e90c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -718,11 +718,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776663782, "lastModified": 1775961625,
"narHash": "sha256-qzBBuxZbn7vPD9ZDl3xmCBGa6qEc8Q//76Cbx4W0tE4=", "narHash": "sha256-8SjilptVv9dSTvn0Z5j65vHHu+flmPXeyrGaSyRJm7U=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "b93be06dc91630bf0ced69c54d0e1e05e56ae460", "rev": "0eaab249f5ca1c55921e99cfe07187410758c9fa",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -33,37 +33,12 @@
"permission" = { "permission" = {
"bash" = { "bash" = {
"*" = "ask"; "*" = "ask";
"*>*" = "ask";
"rm *" = "deny"; "rm *" = "deny";
"rmdir *" = "deny"; "rmdir *" = "deny";
"unlink *" = "deny"; "unlink *" = "deny";
"*rm *" = "ask"; "*rm *" = "ask";
"*rmdir *" = "ask"; "*rmdir *" = "ask";
"*unlink *" = "ask"; "*unlink *" = "ask";
"awk *>*" = "ask";
"*-exec*" = "ask";
"git status" = "allow";
"git log" = "allow";
"git diff" = "allow";
"git show" = "allow";
"ls *" = "allow";
"head *" = "allow";
"tail *" = "allow";
"sort *" = "allow";
"uniq *" = "allow";
"grep *" = "allow";
"find *" = "allow";
"rg *" = "allow";
"fd *" = "allow";
"cat *" = "allow";
"wc *" = "allow";
"jq *" = "allow";
"file *" = "allow";
"diff *" = "allow";
"awk *" = "allow";
"pwd *" = "allow";
"cut *" = "allow";
"tr *" = "allow";
}; };
}; };
}; };

View file

@ -13,14 +13,10 @@ with lib; {
files = ["/var/lib/sops-nix/key.txt" "/etc/machine-id"]; files = ["/var/lib/sops-nix/key.txt" "/etc/machine-id"];
}; };
boot.initrd.systemd.services.rollback = { boot.initrd.postResumeCommands =
description = "Roll back root btrfs subvolume"; lib.mkAfter # sh
wantedBy = ["initrd.target"];
after = ["cryptsetup.target"]; ''
before = ["sysroot.mount"];
unitConfig.DefaultDependencies = "no";
serviceConfig.Type = "oneshot";
script = ''
mkdir /btrfs_tmp mkdir /btrfs_tmp
mount /dev/mapper/crypted /btrfs_tmp mount /dev/mapper/crypted /btrfs_tmp
if [[ -e /btrfs_tmp/root ]]; then if [[ -e /btrfs_tmp/root ]]; then
@ -45,5 +41,4 @@ with lib; {
umount /btrfs_tmp umount /btrfs_tmp
''; '';
}; };
};
} }