From c52e62582e01caa7f7d8a10f2d54c290731d3dcc Mon Sep 17 00:00:00 2001 From: Miran Bastaja Date: Fri, 17 Jan 2025 13:57:21 +0100 Subject: underworld renistall --- hosts/underworld/default.nix | 88 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 70 insertions(+), 18 deletions(-) (limited to 'hosts/underworld/default.nix') diff --git a/hosts/underworld/default.nix b/hosts/underworld/default.nix index cf21e1d..a2060a5 100644 --- a/hosts/underworld/default.nix +++ b/hosts/underworld/default.nix @@ -9,7 +9,6 @@ imports = [ # Include the results of the hardware scan. ./hardware.nix - ./disko.nix ./home.nix (flakeRoot + /share/system/client-common.nix) @@ -23,32 +22,74 @@ programs.fish.enable = true; users.defaultUserShell = pkgs.fish; - # Using grub because the disko docs tell me to use it - boot = { - loader.grub = { - enable = true; - efiSupport = true; - efiInstallAsRemovable = true; - }; - }; - + boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.graceful = true; + boot.loader.efi.canTouchEfiVariables = true; networking.hostName = "underworld"; time.timeZone = "Europe/Zagreb"; + i18n.defaultLocale = "en_US.UTF-8"; + i18n.extraLocaleSettings = { + LC_ADDRESS = "hr_HR.UTF-8"; + LC_IDENTIFICATION = "hr_HR.UTF-8"; + LC_MEASUREMENT = "hr_HR.UTF-8"; + LC_MONETARY = "hr_HR.UTF-8"; + LC_NAME = "hr_HR.UTF-8"; + LC_NUMERIC = "hr_HR.UTF-8"; + LC_PAPER = "hr_HR.UTF-8"; + LC_TELEPHONE = "hr_HR.UTF-8"; + LC_TIME = "hr_HR.UTF-8"; + }; + + # Enable the X11 windowing system. + # You can disable this if you're only using the Wayland session. + # services.xserver.enable = true; + + # Enable the KDE Plasma Desktop Environment. + services.displayManager.sddm.enable = true; + services.desktopManager.plasma6.enable = true; + + # Configure keymap in X11 + services.xserver.xkb = { + layout = "us"; + variant = ""; + }; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound with pipewire. + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; + + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.enable = true; + }; users.users = { osiris = { isNormalUser = true; + description = "Miran Bastaja"; extraGroups = [ "wheel" "video" "network" "podman" ]; - uid = 1001; + uid = 1000; }; }; nix.settings.trusted-users = [ "osiris" ]; + services.xserver.displayManager.autoLogin.enable = true; + services.xserver.displayManager.autoLogin.user = "osiris"; fileSystems."/mnt/drive2" = { # No clue how that counts as an UUID, but blkid says so @@ -66,11 +107,22 @@ ]; }; - # 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 - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.11"; # Did you read the comment? + # This option defines the first version of NixOS you have installed on this particular machine, + # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. + # + # Most users should NEVER change this value after the initial install, for any reason, + # even if you've upgraded your system to a new NixOS release. + # + # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, + # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how + # to actually do that. + # + # This value being lower than the current NixOS release does NOT mean your system is + # out of date, out of support, or vulnerable. + # + # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, + # and migrated your data accordingly. + # + # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . + system.stateVersion = "24.11"; # Did you read the comment? } -- cgit v1.3.1