aboutsummaryrefslogtreecommitdiff
path: root/hosts/underworld
diff options
context:
space:
mode:
Diffstat (limited to 'hosts/underworld')
-rw-r--r--hosts/underworld/default.nix88
-rw-r--r--hosts/underworld/disko.nix45
-rw-r--r--hosts/underworld/hardware.nix34
-rw-r--r--hosts/underworld/home.nix31
4 files changed, 120 insertions, 78 deletions
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?
}
diff --git a/hosts/underworld/disko.nix b/hosts/underworld/disko.nix
deleted file mode 100644
index e713323..0000000
--- a/hosts/underworld/disko.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- disko.devices = {
- disk = {
- main = {
- type = "disk";
- device = "/dev/disk/by-id/ata-WDC_WDS240G2G0B-00EPW0_194176803299";
- content = {
- type = "gpt";
- partitions = {
- boot = {
- size = "1M";
- type = "EF02"; # for grub MBR
- };
- ESP = {
- size = "512M";
- type = "EF00";
- content = {
- type = "filesystem";
- format = "vfat";
- mountpoint = "/boot";
- };
- };
- root = {
- name = "root";
- end = "-20G";
- content = {
- type = "filesystem";
- format = "bcachefs";
- mountpoint = "/";
- };
- };
- encryptedSwap = {
- size = "100%";
- content = {
- type = "swap";
- randomEncryption = true;
- resumeDevice = true; # resume from hibernation from this device
- };
- };
- };
- };
- };
- };
- };
-}
diff --git a/hosts/underworld/hardware.nix b/hosts/underworld/hardware.nix
index b66b797..553036a 100644
--- a/hosts/underworld/hardware.nix
+++ b/hosts/underworld/hardware.nix
@@ -1,33 +1,37 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
-{
- config,
- lib,
- modulesPath,
- ...
-}:
+{ config, lib, pkgs, modulesPath, ... }:
{
- imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+ imports =
+ [ (modulesPath + "/installer/scan/not-detected.nix")
+ ];
- boot.initrd.availableKernelModules = [
- "xhci_pci"
- "ahci"
- "usbhid"
- "usb_storage"
- "sd_mod"
- ];
+ boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "uas" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
+ fileSystems."/" =
+ { device = "/dev/disk/by-uuid/172392de-fbd1-4710-a994-341aab3dec7c";
+ fsType = "ext4";
+ };
+
+ fileSystems."/boot" =
+ { device = "/dev/disk/by-uuid/5BC6-0D93";
+ fsType = "vfat";
+ options = [ "fmask=0077" "dmask=0077" ];
+ };
+
+ swapDevices = [ ];
+
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
- # networking.interfaces.enp9s0.useDHCP = lib.mkDefault true;
+ # networking.interfaces.enp10s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
diff --git a/hosts/underworld/home.nix b/hosts/underworld/home.nix
index d240194..bb8c57d 100644
--- a/hosts/underworld/home.nix
+++ b/hosts/underworld/home.nix
@@ -1,6 +1,7 @@
{
flakeRoot,
inputs,
+ pkgs,
...
}:
{
@@ -25,6 +26,36 @@
enableGitAnnex = true;
};
+ xdg = {
+ systemDirs.data =
+ let
+ gds = pkgs.gsettings-desktop-schemas;
+ gtk3 = pkgs.gtk3;
+ in
+ [
+ "${gds}/share/gsettings-schemas/${gds.name}"
+ "${gtk3}/share/gsettings-schemas/${gtk3.name}"
+ ];
+ userDirs =
+ let
+ annex = "/mnt/drive2/Annex";
+ in
+ {
+ enable = true;
+ createDirectories = true;
+
+ # Disable dirs that I don't use
+ desktop = null;
+ publicShare = null;
+ templates = null;
+ pictures = "${annex}/Pictures";
+ music = "${annex}/Music";
+ documents = "${annex}/Documents";
+ download = "${annex}/Downloads";
+ };
+ portal.xdgOpenUsePortal = true;
+ };
+
home.stateVersion = "23.11";
};
generated by cgit v1.3.1 (git 2.54.0) at 2026-10-27 11:00:52 +0000