diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index 4f82c58..a2bb4e4 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -41,7 +41,6 @@ in { }; grub = { efiSupport = true; - #efiInstallAsRemovable = true; # in case canTouchEfiVariables doesn't work on this system device = "nodev"; useOSProber = false; }; @@ -50,15 +49,13 @@ in { enable = true; theme = "whitesur"; # stylish, vimix, or whitesur footer = true; - customResolution = "1920x1080"; # Optional: Set a custom resolution + customResolution = "1920x1080"; }; }; - # Set your time zone. time.timeZone = "Australia/Brisbane"; + i18n.defaultLocale = "en_US.UTF-8"; # internationalisation - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; # Enable initrd hook for virtual console customisation # aka cool colours when bootting yay!! console = { @@ -87,7 +84,7 @@ in { ]; }; - # ----- NETWORKING SECTION ----- + # ----- NETWORKING ----- networking = { hostName = "lolcathost"; networkmanager.enable = true; diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 1c94b9c..29ec932 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -1,8 +1,8 @@ { + lib, pkgs, inputs, - lib, - wishlist, + config, ... }: let home-manager = builtins.fetchTarball { @@ -15,20 +15,35 @@ in { (import "${home-manager}/nixos") ../modules/steam.nix + ../modules/obsidian.nix + + ../modules/flipperzero.nix + ../modules/chameleonultragui.nix ]; - boot.loader.systemd-boot.enable = false; + nixpkgs.config.allowUnfreePredicate = let + whitelist = map lib.getName [ + pkgs.obsidian + pkgs.gitkraken + pkgs.steam + pkgs.steamcmd + pkgs.steam-unwrapped + pkgs.dwarf-fortress + ]; + in + pkg: builtins.elem (lib.getName pkg) whitelist; + boot.loader = { efi = { canTouchEfiVariables = true; - efiSysMountPoint = "/boot/efi"; #/boot/efi + efiSysMountPoint = "/boot/efi"; }; grub = { efiSupport = true; - #efiInstallAsRemovable = true; # in case canTouchEfiVariables doesn't work on this system device = "nodev"; - #useOSProber = true; + # useOSProber = true; }; + # GitHub: vinceliuice/grub2-themes grub2-theme = { enable = true; theme = "whitesur"; # stylish, vimix, or whitesur @@ -37,11 +52,9 @@ in { }; }; - # Set your time zone. time.timeZone = "Australia/Brisbane"; + i18n.defaultLocale = "en_US.UTF-8"; # internationalisation - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; # Enable initrd hook for virtual console customisation # aka cool colours when bootting yay!! console = { @@ -70,7 +83,7 @@ in { ]; }; - # ----- NETWORKING SECTION ----- + # ----- NETWORKING ----- networking = { hostName = "myputer"; networkmanager.enable = true;