From d712da441575dee6d07d2404b23f8860430a1542 Mon Sep 17 00:00:00 2001 From: kiana-S Date: Mon, 17 Jan 2022 04:05:12 +0000 Subject: [PATCH] Fix laptop firmware issues --- common/config/config.nix | 7 +------ desktop/config/default.nix | 7 ++++++- laptop/config/default.nix | 10 +++++++++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/common/config/config.nix b/common/config/config.nix index 2d445f8..0691da9 100644 --- a/common/config/config.nix +++ b/common/config/config.nix @@ -1,8 +1,7 @@ { config, pkgs, nur, nixpkgs, # The flake's input version of nixpkgs ... }: -let hashedPassword = "$6$lokU/kizIJ/HwEI8$N6c80K0.VHkFBaOMcS8Bc1Fz5bx8qqTRH8brf0.duTOkf4Mja90bLwki8IVCBVpHnj7WqEkF4.CtZA6WczeqQ1"; -in { +{ nix.package = pkgs.nixFlakes; nix.extraOptions = '' experimental-features = nix-command flakes @@ -41,10 +40,6 @@ in { description = "Kiana Sheibani"; extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. shell = pkgs.fish; - inherit hashedPassword; - }; - users.users.root = { - inherit hashedPassword; }; diff --git a/desktop/config/default.nix b/desktop/config/default.nix index 3a95fdf..b15a584 100644 --- a/desktop/config/default.nix +++ b/desktop/config/default.nix @@ -1,8 +1,13 @@ { config, pkgs, ... }: -{ +let hashedPassword = "$6$HYibiGhDN.JgLtw6$cecU7NjfumTUJSkFNFQG4uVgdd3tTPLGxK0zHAwYn3un/V43IUlyVBNKoRMLCQk65RckbD/.AjsLFVFKUUHVA/"; +in { imports = [ ./hardware-configuration.nix ]; networking.hostName = "kiana-desktop"; + + # Passwords + users.users.kiana = { inherit hashedPassword; }; + users.users.root = { inherit hashedPassword; }; } diff --git a/laptop/config/default.nix b/laptop/config/default.nix index 63ddc21..a51447b 100644 --- a/laptop/config/default.nix +++ b/laptop/config/default.nix @@ -1,8 +1,16 @@ { ... }: -{ +let hashedPassword = "$6$y3eb1phxFWnParRT$w1LNfxJ2ByHoiBa5ywh4STGuIK/r4Tnyxx2Xe/nlovrE6LuuLAVdKRFAroUTtUI/d2BNGI9ErjZ2z2Dl7w/t00"; +in { imports = [ ./hardware-configuration.nix ]; networking.hostName = "kiana-laptop"; + + boot.loader.grub.useOSProber = true; + hardware.enableRedistributableFirmware = true; + + # Passwords + users.users.kiana = { inherit hashedPassword; }; + users.users.root = { inherit hashedPassword; }; }