Compare commits

..

No commits in common. "3c8024045e46a53374aacc1c312d3f48a29629a6" and "925fd85c2855d7899cd49ad32e21e841c870332d" have entirely different histories.

4 changed files with 33 additions and 36 deletions

56
flake.lock generated
View file

@ -332,11 +332,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776200608, "lastModified": 1769799857,
"narHash": "sha256-broZ6RFQr4Fv0wT73gGmzNX14A43TmTFF8g4wDKlNss=", "narHash": "sha256-88IFXZ7Sa1vxbz5pty0Io5qEaMQMMUPMonLa3Ls/ss4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "naersk", "repo": "naersk",
"rev": "8b23250ab45c2a38cd91031aee26478ca4d0a28e", "rev": "9d4ed44d8b8cecdceb1d6fd76e74123d90ae6339",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -359,11 +359,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1776363101, "lastModified": 1775710668,
"narHash": "sha256-PIsrdhbaD+aqB473D3IjVjRdO5uQJ6etnm5b7nvdnmU=", "narHash": "sha256-pi2TWoWZR22vzr5RBAgIdl1LDwgLX+fh+Hqngt/Kkt8=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "f273e1406713b729e02e419d31c48200a285fac1", "rev": "bef414577a6a745543989716df478afec96486bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -392,11 +392,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1776358048, "lastModified": 1775561155,
"narHash": "sha256-0OpEyuTrEVVkQXFJ5iSmjFXqSEsTNje0ldmiTNgEkOQ=", "narHash": "sha256-TK2IrqQivRcwqJa0suZMbcsN17CtA8Uu0v7CDnLATb0=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "a1b0bd6d1cbbc695188f53839e42def4c5d38f43", "rev": "599db847f857b8a7ff78ce02f15acab5d5d9fee1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -427,11 +427,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776310443, "lastModified": 1775703285,
"narHash": "sha256-XQo/vlS6xak3iT3xS2Q3TUMbreeeqe+PR99feUoV0UQ=", "narHash": "sha256-Dck/lX920n3ClC6U2m3fWaXgoGrtJpnqfGCdiOb8Gf4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "3a6d0ea13d092493b285b9093b5ce81e79df5cee", "rev": "c2281bf25d05ecb8155319456340afd34bea28ec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -478,11 +478,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1776067740, "lastModified": 1775595990,
"narHash": "sha256-B35lpsqnSZwn1Lmz06BpwF7atPgFmUgw1l8KAV3zpVQ=", "narHash": "sha256-OEf7YqhF9IjJFYZJyuhAypgU+VsRB5lD4DuiMws5Ltc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7e495b747b51f95ae15e74377c5ce1fe69c1765f", "rev": "4e92bbcdb030f3b4782be4751dc08e6b6cb6ccf2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -509,11 +509,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1776255774, "lastModified": 1775701739,
"narHash": "sha256-psVTpH6PK3q1htMJpmdz1hLF5pQgEshu7gQWgKO6t6Y=", "narHash": "sha256-2FWWY1rr/+pGUJK1npcVcsWNEblzmKs6VxD3VEvwJSs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "566acc07c54dc807f91625bb286cb9b321b5f42a", "rev": "0f7663154ff2fec150f9dbf5f81ec2785dc1e0db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -548,11 +548,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1776366610, "lastModified": 1776022066,
"narHash": "sha256-7HXk7GwK7fCiIQ3ep8SsKUkfWhOOWxARuBKRPqWy0fc=", "narHash": "sha256-EVl6pS3C8qogiqMNGBLibPsnK8saURb5Ayf9pxzcFjA=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "434f8f8ffd3801cfeac82f6caaf1b58ef25e9c11", "rev": "d33b47139a431ebc6aef9926f1f80bb2420ac596",
"revCount": 344, "revCount": 152,
"type": "git", "type": "git",
"url": "https://git.berlin.ccc.de/vinzenz/nova-shell" "url": "https://git.berlin.ccc.de/vinzenz/nova-shell"
}, },
@ -571,11 +571,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776364314, "lastModified": 1775746236,
"narHash": "sha256-xH/BIk0BBiZRhcJrurLBzpe0tAdmpeE3FAExIPnb3/w=", "narHash": "sha256-wCMkv45LNU6gjWbl53WE4LAHU3Q3dNFU4dRWdlGW1PE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "528ff912ac19b61c3be7d29e3976e7f2186c2101", "rev": "1088e4c4f5f40c9ce5e5181ae501576f72f1bce8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -791,11 +791,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1775935110, "lastModified": 1775509805,
"narHash": "sha256-twTHKUFXjNNsaAvX0KoaIClt+923jXDRbfCd9PC/f0o=", "narHash": "sha256-CxmSn6FihFw7RvqLGGAdQUhbdBfdok946bg8ubvTfa4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "stylix", "repo": "stylix",
"rev": "14f248ad1a7668e7858c6d9163608c208b7daf02", "rev": "83e8a81710ddd56fb5112da54e0395de51bbcd3a",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -175,8 +175,7 @@
overlays = { overlays = {
unstable-packages = final: prev: { unstable-packages = final: prev: {
unstable = import nixpkgs-unstable { unstable = import nixpkgs-unstable {
localSystem = prev.stdenv.hostPlatform; inherit (prev) system config;
inherit (prev) config;
}; };
}; };
}; };
@ -223,7 +222,7 @@
}; };
in in
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
inherit specialArgs; inherit system specialArgs;
modules = [ modules = [
{ {
imports = [ imports = [
@ -235,6 +234,7 @@
]); ]);
nixpkgs = { nixpkgs = {
inherit system;
hostPlatform = lib.mkDefault system; hostPlatform = lib.mkDefault system;
}; };
} }

View file

@ -13,7 +13,7 @@
./ssh.nix ./ssh.nix
./starship.nix ./starship.nix
./swaylock.nix ./swaylock.nix
#./swaync.nix ./swaync.nix
./vscode.nix ./vscode.nix
# ./waybar.nix # ./waybar.nix
# ./wlogout.nix # ./wlogout.nix
@ -59,6 +59,7 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
# keep-sorted start # keep-sorted start
arduino arduino
arduino-cli arduino-cli
arduino-ide arduino-ide

View file

@ -67,10 +67,6 @@
path = self.nixosConfigurations.damocles.config.system.build.toplevel; path = self.nixosConfigurations.damocles.config.system.build.toplevel;
}; };
# Global DefaultTimeoutStopSec is 10s (modern-desktop.nix), which kills systemd-nspawn
# before it finishes halting, leaving cgroups busy and breaking restarts.
systemd.services."container@damocles".serviceConfig.TimeoutStopSec = "60s";
boot.enableContainers = true; boot.enableContainers = true;
virtualisation.containers.enable = true; virtualisation.containers.enable = true;
}; };