diff --git a/nixos/configuration.nix b/nixos/default.nix similarity index 64% rename from nixos/configuration.nix rename to nixos/default.nix index 21f0e75..0b6a932 100644 --- a/nixos/configuration.nix +++ b/nixos/default.nix @@ -5,17 +5,6 @@ { config, pkgs, ... }: { - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ./desktop.nix - ./genofire.nix - ]; - - # -------- - # always: - # -------- - system.stateVersion = "21.05"; system.autoUpgrade.enable = true; # boot @@ -25,7 +14,6 @@ boot.initrd.supportedFilesystems = ["zfs"]; # boot from zfs boot.supportedFilesystems = [ "zfs" ]; #boot.kernelParams = [ "nohibernate" ]; - boot.zfs.requestEncryptionCredentials = []; # list -> default: true - always request for password services.zfs.autoScrub.enable = true; networking.useNetworkd = true; @@ -33,7 +21,7 @@ services.openssh.enable = true; time.timeZone = "Europe/Berlin"; - # i18n.defaultLocale = "en_US.UTF-8"; + i18n.defaultLocale = "en_IE.UTF-8"; console = { font = "Lat2-Terminus16"; keyMap = "de"; @@ -57,22 +45,7 @@ home-manager ]; - - # -------- - # specifical this maschine: - # -------- - - networking.hostId = "6a465f93"; # zfs needed - networking.hostName = "fireEmerald"; # Define your hostname. - # cryptsetup - # boot.initrd.luks.enable = true; - boot.initrd.luks.devices = { - "croot" = { - device = "/dev/disk/by-uuid/e75385e9-b733-49d4-91fd-6ac2fa821195" ; - }; - }; - - # my + # zsh users.defaultUserShell = pkgs.zsh; programs.zsh.enable = true; programs.zsh.autosuggestions.enable = true;