diff --git a/flake.lock b/flake.lock index cbe0b51..2d3ad50 100644 --- a/flake.lock +++ b/flake.lock @@ -115,11 +115,11 @@ }, "master": { "locked": { - "lastModified": 1677105795, - "narHash": "sha256-YA4uTUU0Dle90ecS7rDGHSeYiEyiUuyshm4Q+wku7b4=", + "lastModified": 1677197206, + "narHash": "sha256-genGpC2jF/va2iHZ7i4pVODvOd+823i4LPeuNpwCJdM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7cec24480ea3f10690f752775fa52d693eb5ad6f", + "rev": "f9afd57302f342f7e72048ea77ed57aef61ffe48", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1677084200, - "narHash": "sha256-zDDFwMQktp1tjUHksSW7jB/4uLEmv7dl3/CDtq9kjMg=", + "lastModified": 1677172394, + "narHash": "sha256-SfiNwZ2nvCEpbH3fneFIZWp9lH3XFx4z+EjJ3rrxeJA=", "owner": "NixOS", "repo": "nix", - "rev": "4a921ba43b8ea9a37763cd4bd4bc491928cc55c2", + "rev": "b5bbf14b872c0accfae2373076fd1a25fae511ce", "type": "github" }, "original": { @@ -335,11 +335,11 @@ }, "stable": { "locked": { - "lastModified": 1676998680, - "narHash": "sha256-61gxdL3bqHWnRSiYq+sKWbSX6tuwaRnYfPvhpRK011s=", + "lastModified": 1677075010, + "narHash": "sha256-X+UmR1AkdR//lPVcShmLy8p1n857IGf7y+cyCArp8bU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3d745e701c337e65ef467d5a9400d9336a303a1", + "rev": "c95bf18beba4290af25c60cbaaceea1110d0f727", "type": "github" }, "original": { diff --git a/systems/game-laptop/default.nix b/systems/game-laptop/default.nix index ee38c63..2344531 100644 --- a/systems/game-laptop/default.nix +++ b/systems/game-laptop/default.nix @@ -39,10 +39,20 @@ inputs: { networkmanager.enable = true; }; users = { - users."${settings.username}" = { - uid = 1000; - isNormalUser = true; - extraGroups = ["audio" "networkmanager"]; + mutableUsers = false; + users = { + "${settings.username}" = { + useDefaultShell = true; + uid = 1000; + isNormalUser = true; + extraGroups = ["networkmanager" "audio"]; + initialHashedPassword = ""; + }; + "root" = { + uid = 0; + home = "/root"; + initialHashedPassword = "$6$KV00qSRKyx1hpZjX$kwzWN4UuQxHSFwA4vYtRTcYecQyR.Qelvvcr90ZfZ4y.LISUcx2PDHH9/7REwsoAHD./KlAnwlsm1hxeLoGpl/"; + }; }; }; hardware.bluetooth.enable = true; diff --git a/systems/gerg-desktop/default.nix b/systems/gerg-desktop/default.nix index a8a6f99..6a5c850 100644 --- a/systems/gerg-desktop/default.nix +++ b/systems/gerg-desktop/default.nix @@ -73,10 +73,22 @@ inputs: { bridges."bridge0".interfaces = ["eth0"]; }; #user managment - users.users."${settings.username}" = { - uid = 1000; - isNormalUser = true; - extraGroups = ["wheel" "audio"]; + users = { + mutableUsers = false; + users = { + "${settings.username}" = { + useDefaultShell = true; + uid = 1000; + isNormalUser = true; + extraGroups = ["wheel" "audio"]; + initialHashedPassword = "$6$hgiDFHEMVEA39Snj$Huxf2a/yd/gSO2ZwntxI5Z65c1kCf35lvbkA61knP5i5NLPuIy4cybBBv9lnd24LVR9sfi9Tss96VQdsGCQhq1"; + }; + "root" = { + uid = 0; + home = "/root"; + initialHashedPassword = "$6$KV00qSRKyx1hpZjX$kwzWN4UuQxHSFwA4vYtRTcYecQyR.Qelvvcr90ZfZ4y.LISUcx2PDHH9/7REwsoAHD./KlAnwlsm1hxeLoGpl/"; + }; + }; }; boot = { initrd = { diff --git a/systems/mom-laptop/default.nix b/systems/mom-laptop/default.nix index c82a6a1..48b72cf 100644 --- a/systems/mom-laptop/default.nix +++ b/systems/mom-laptop/default.nix @@ -34,10 +34,22 @@ inputs: { networkmanager.enable = true; }; boot.kernelPackages = pkgs.linuxPackages_latest; - users.users."${settings.username}" = { - uid = 1000; - isNormalUser = true; - extraGroups = ["audio" "networkmanager"]; + users = { + mutableUsers = false; + users = { + "${settings.username}" = { + useDefaultShell = true; + uid = 1000; + isNormalUser = true; + extraGroups = ["networkmanager" "audio"]; + initialHashedPassword = ""; + }; + "root" = { + uid = 0; + home = "/root"; + initialHashedPassword = "$6$KV00qSRKyx1hpZjX$kwzWN4UuQxHSFwA4vYtRTcYecQyR.Qelvvcr90ZfZ4y.LISUcx2PDHH9/7REwsoAHD./KlAnwlsm1hxeLoGpl/"; + }; + }; }; boot = { initrd.availableKernelModules = ["xhci-pci" "ehci-pci" "ahci" "usbhid" "sd_mod" "sr_mod" "rtsx_usb_sdmmc"];