diff --git a/modules/host/laptop/configuration.nix b/modules/host/laptop/configuration.nix index 317f6e9..d983aea 100644 --- a/modules/host/laptop/configuration.nix +++ b/modules/host/laptop/configuration.nix @@ -9,63 +9,18 @@ self.nixosModules.developmentProfile ]; - nix.settings.experimental-features = [ "nix-command" "flakes" ]; - - fonts.packages = with pkgs; [ - nerd-fonts.bitstream-vera-sans-mono - montserrat - ]; - - # BIOS - services.fwupd.enable = true; - - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - # Use latest kernel. - boot.kernelPackages = pkgs.linuxPackages_latest; - networking.hostName = "laptop"; # Define your hostname. - networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - powerManagement.enable = true; - services.power-profiles-daemon.enable = true; - services.upower.enable = true; - #services.tlp.enable = true; # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - # Enable networking - networking.networkmanager.enable = true; - - # Set your time zone. - time.timeZone = "Europe/Copenhagen"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_DK.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "da_DK.UTF-8"; - LC_IDENTIFICATION = "da_DK.UTF-8"; - LC_MEASUREMENT = "da_DK.UTF-8"; - LC_MONETARY = "da_DK.UTF-8"; - LC_NAME = "da_DK.UTF-8"; - LC_NUMERIC = "da_DK.UTF-8"; - LC_PAPER = "da_DK.UTF-8"; - LC_TELEPHONE = "da_DK.UTF-8"; - LC_TIME = "da_DK.UTF-8"; - }; - # Configure keymap in X11 services.xserver.xkb = { layout = "us"; variant = ""; }; - # Define a user account. Don't forget to set a password with ‘passwd’. users.users.${config.preferences.user.name} = { isNormalUser = true; @@ -75,13 +30,9 @@ shell = pkgs.zsh; }; - # Allow unfree packages + # Unfree packages nixpkgs.config.allowUnfree = true; - programs.git.enable = true; - - # List packages installed in system profile. To search, run: - # $ nix search wget environment.systemPackages = with pkgs; [ faugus-launcher ]; diff --git a/modules/profiles/profiles.nix b/modules/profiles/profiles.nix index 844b733..908a096 100644 --- a/modules/profiles/profiles.nix +++ b/modules/profiles/profiles.nix @@ -15,6 +15,48 @@ self.nixosModules.hjem self.nixosModules.nh ]; + + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + + fonts.packages = with pkgs; [ + nerd-fonts.bitstream-vera-sans-mono + montserrat + ]; + + # BIOS + services.fwupd.enable = true; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + # Use latest kernel. + boot.kernelPackages = pkgs.linuxPackages_latest; + + # Networking + networking.networkmanager.enable = true; + networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Power Management + powerManagement.enable = true; + services.power-profiles-daemon.enable = true; + services.upower.enable = true; + + # Locales + time.timeZone = "Europe/Copenhagen"; + i18n.defaultLocale = "en_DK.UTF-8"; + i18n.extraLocaleSettings = { + LC_ADDRESS = "da_DK.UTF-8"; + LC_IDENTIFICATION = "da_DK.UTF-8"; + LC_MEASUREMENT = "da_DK.UTF-8"; + LC_MONETARY = "da_DK.UTF-8"; + LC_NAME = "da_DK.UTF-8"; + LC_NUMERIC = "da_DK.UTF-8"; + LC_PAPER = "da_DK.UTF-8"; + LC_TELEPHONE = "da_DK.UTF-8"; + LC_TIME = "da_DK.UTF-8"; + }; + }; flake.nixosModules.visualProfile = { pkgs, ... }: {