genofire
/
nix
1
1
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

nixos: cleanup confugration.nix and rename to default.nix

This commit is contained in:
genofire 2021-10-09 01:34:51 +02:00
parent 8fd05cc56f
commit 3840010433
1 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
nixos/configuration.nix → nixos/default.nix
View File

@ -5,17 +5,6 @@
{ config, pkgs, ... }: { 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; system.autoUpgrade.enable = true;
# boot # boot
@ -25,7 +14,6 @@
boot.initrd.supportedFilesystems = ["zfs"]; # boot from zfs boot.initrd.supportedFilesystems = ["zfs"]; # boot from zfs
boot.supportedFilesystems = [ "zfs" ]; boot.supportedFilesystems = [ "zfs" ];
#boot.kernelParams = [ "nohibernate" ]; #boot.kernelParams = [ "nohibernate" ];
boot.zfs.requestEncryptionCredentials = []; # list -> default: true - always request for password
services.zfs.autoScrub.enable = true; services.zfs.autoScrub.enable = true;
networking.useNetworkd = true; networking.useNetworkd = true;
@ -33,7 +21,7 @@
services.openssh.enable = true; services.openssh.enable = true;
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
# i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_IE.UTF-8";
console = { console = {
font = "Lat2-Terminus16"; font = "Lat2-Terminus16";
keyMap = "de"; keyMap = "de";
@ -57,22 +45,7 @@
home-manager home-manager
]; ];
# zsh
# --------
# 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
users.defaultUserShell = pkgs.zsh; users.defaultUserShell = pkgs.zsh;
programs.zsh.enable = true; programs.zsh.enable = true;
programs.zsh.autosuggestions.enable = true; programs.zsh.autosuggestions.enable = true;