Disable docker liverestore so reboot doesn't hang
This commit is contained in:
parent
2c5538ad3e
commit
138933566b
20
flake.lock
20
flake.lock
@ -404,22 +404,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1707268954,
|
||||
"narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
|
||||
"owner": "lopsided98",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "lopsided98",
|
||||
"ref": "nix-ros",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixvim": {
|
||||
"inputs": {
|
||||
"devshell": "devshell",
|
||||
@ -512,7 +496,9 @@
|
||||
"ros": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_3",
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713569614,
|
||||
|
@ -22,7 +22,12 @@
|
||||
inputs.home-manager.follows = "home-manager";
|
||||
};
|
||||
|
||||
ros.url = "github:lopsided98/nix-ros-overlay";
|
||||
|
||||
ros = {
|
||||
url = "github:lopsided98/nix-ros-overlay";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
agenix.url = "github:ryantm/agenix";
|
||||
|
||||
# Shameless plug: looking for a way to nixify your themes and make
|
||||
|
@ -117,6 +117,7 @@
|
||||
services.automatic-timezoned.enable = true;
|
||||
|
||||
virtualisation.docker.enable = true;
|
||||
virtualisation.docker.liveRestore = false;
|
||||
|
||||
#Puts fonts in /run/current-system/sw/share/X11/fonts
|
||||
fonts.fontDir.enable = true;
|
||||
|
@ -3,6 +3,7 @@
|
||||
{
|
||||
imports = [
|
||||
./misc/dslr-webcam.nix
|
||||
./misc/wifi-multiplex.nix
|
||||
];
|
||||
# Enable the KDE Desktop Environment.
|
||||
services.xserver.enable = true;
|
||||
@ -15,6 +16,15 @@
|
||||
};
|
||||
|
||||
services.flatpak.enable = true;
|
||||
|
||||
environment.etc = {
|
||||
"flatpak/remotes.d/flathub.flatpakrepo".source = pkgs.fetchurl {
|
||||
url = "https://dl.flathub.org/repo/flathub.flatpakrepo";
|
||||
hash = "sha256-M3HdJQ5h2eFjNjAHP+/aFTzUQm9y9K+gwzc64uj+oDo="
|
||||
;
|
||||
};
|
||||
};
|
||||
|
||||
services.packagekit.enable = true;
|
||||
services.fwupd.enable = true;
|
||||
|
||||
|
14
nixos/misc/wifi-multiplex.nix
Normal file
14
nixos/misc/wifi-multiplex.nix
Normal file
@ -0,0 +1,14 @@
|
||||
{ pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
wifiUdevRule = ''
|
||||
ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", !KERNEL=="phy*", RUN+="${pkgs.iw}/bin/iw dev %k info | grep -q '_ap' || ${pkgs.iw}/bin/iw dev %k interface add %k_ap type station"
|
||||
'';
|
||||
in
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
iw
|
||||
];
|
||||
|
||||
services.udev.extraRules = wifiUdevRule;
|
||||
}
|
@ -12,8 +12,11 @@
|
||||
# });
|
||||
};
|
||||
|
||||
ros = inputs.ros.overlay;
|
||||
|
||||
# When applied, the unstable nixpkgs set (declared in the flake inputs) will
|
||||
# be accessible through 'pkgs.unstable'
|
||||
|
||||
unstable-packages = final: _prev: {
|
||||
unstable = import inputs.nixpkgs-unstable {
|
||||
system = final.system;
|
||||
|
Loading…
Reference in New Issue
Block a user