From 8910e4b8a2e9d821f741d0f6e7304a0407f7f6bd Mon Sep 17 00:00:00 2001 From: Daniel Date: Sat, 18 Dec 2021 22:24:22 +0100 Subject: [PATCH] Make jokum use base.nix --- base.nix | 1 + hosts/jokum/configuration.nix | 34 +--------------------------------- 2 files changed, 2 insertions(+), 33 deletions(-) diff --git a/base.nix b/base.nix index 4dbc7c8..69356bd 100644 --- a/base.nix +++ b/base.nix @@ -6,6 +6,7 @@ ]; networking.domain = "pvv.ntnu.no"; + networking.useDHCP = false; time.timeZone = "Europe/Oslo"; diff --git a/hosts/jokum/configuration.nix b/hosts/jokum/configuration.nix index 2e0a0c2..c6b7aa5 100644 --- a/hosts/jokum/configuration.nix +++ b/hosts/jokum/configuration.nix @@ -7,8 +7,8 @@ in # Include the results of the hardware scan. ../../hardware-configuration.nix + ../../base.nix # Users can just import any configuration they want even for non-user things. Improve the users/default.nix to just load some specific attributes if this isn't wanted - ../../users ../../modules/rust-motd.nix @@ -29,15 +29,7 @@ in boot.loader.grub.devices = [ "/dev/sda" ]; networking.hostName = "jokum"; # Define your hostname. - networking.domain = "pvv.ntnu.no"; - # Set your time zone. - time.timeZone = "Europe/Oslo"; - - # The global useDHCP flag is deprecated, therefore explicitly set to false here. - # Per-interface useDHCP will be mandatory in the future, so this generated config - # replicates the default behaviour. - networking.useDHCP = false; networking.interfaces.ens18.useDHCP = false; networking.defaultGateway = "129.241.210.129"; @@ -59,36 +51,12 @@ in }; networking.nameservers = [ "129.241.0.200" "129.241.0.201" ]; - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - console = { - font = "Lat2-Terminus16"; - keyMap = "no"; - }; - - - # Define a user account. Don't forget to set a password with ‘passwd’. - # users.users.jane = { - # isNormalUser = true; - # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. - # }; - # List packages installed in system profile environment.systemPackages = with pkgs; [ - git - vim - nano - wget - tmux - kitty.terminfo ]; # List services that you want to enable: - # Enable the OpenSSH daemon. - services.openssh.enable = true; - services.openssh.permitRootLogin = "yes"; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave