From 3fca95cdabdbfdfac04aeee3c80ca15fbe1096f6 Mon Sep 17 00:00:00 2001 From: DerGrumpf Date: Fri, 4 Apr 2025 11:11:18 +0200 Subject: [PATCH] Changed: Qemu conf --- flake.nix | 2 +- hosts/qemu/default.nix | 125 ++++++++++++++++---------- hosts/qemu/hardware-configuration.nix | 12 +-- 3 files changed, 82 insertions(+), 57 deletions(-) diff --git a/flake.nix b/flake.nix index 3511df5..ae00cf4 100644 --- a/flake.nix +++ b/flake.nix @@ -94,7 +94,7 @@ system = "x86_64-linux"; modules = [ - ./hosts/m920q + ./hosts/qemu ./users/${username}/nixos.nix home-manager.nixosModules.home-manager diff --git a/hosts/qemu/default.nix b/hosts/qemu/default.nix index 4a9da96..df9ca4c 100644 --- a/hosts/qemu/default.nix +++ b/hosts/qemu/default.nix @@ -6,41 +6,22 @@ { imports = - [ - ../../modules/system.nix - ../../modules/nix-settings.nix - ../../modules/vpn.nix - ../../modules/fonts.nix - ../../modules/firewall.nix - ../../modules/localisation.nix - ../../modules/openssh.nix - ../../modules/pipewire.nix - ../../modules/podman.nix - ../../modules/services.nix - ../../modules/regreet/regreet.nix - ../../modules/plymouth.nix - ../../modules/file_managers/spacefm.nix + [ # Include the results of the hardware scan. + ../../modules/system.nix + ../../modules/nix-settings.nix + ../../modules/openssh.nix + ../../modules/services.nix + ../../modules/plymouth.nix -# Include the results of the hardware scan. - ./hardware-configuration.nix + ./hardware-configuration.nix ]; # Bootloader. - boot.loader = { - grub = { - enable = true; - device = "nodev"; - useOSProber = true; - efiSupport = true; - }; - efi = { - canTouchEfiVariables = true; - efiSysMountPoint = "/boot/efi"; # ← use the same mount point here. - }; - systemd-boot.enable = true; - }; + boot.loader.grub.enable = true; + boot.loader.grub.device = "/dev/sda"; + boot.loader.grub.useOSProber = true; - networking.hostName = "nix-virtual"; # Define your hostname. + networking.hostName = "nixos"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # Configure network proxy if necessary @@ -49,23 +30,73 @@ # Enable networking networking.networkmanager.enable = true; - networking.defaultGateway = "192.168.2.1"; - networking.useDHCP = false; - networking.dhcpcd.enable = false; - networking.nameservers = [ - "1.1.1.1" - "1.0.0.1" - "8.8.8.8" - "8.8.4.4" + + # Set your time zone. + time.timeZone = "Europe/Berlin"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "de_DE.UTF-8"; + LC_IDENTIFICATION = "de_DE.UTF-8"; + LC_MEASUREMENT = "de_DE.UTF-8"; + LC_MONETARY = "de_DE.UTF-8"; + LC_NAME = "de_DE.UTF-8"; + LC_NUMERIC = "de_DE.UTF-8"; + LC_PAPER = "de_DE.UTF-8"; + LC_TELEPHONE = "de_DE.UTF-8"; + LC_TIME = "de_DE.UTF-8"; + }; + + # Configure keymap in X11 + services.xserver.xkb = { + layout = "de"; + variant = ""; + }; + + # Configure console keymap + console.keyMap = "de"; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.phil = { + isNormalUser = true; + description = "phil"; + extraGroups = [ "networkmanager" "wheel" ]; + packages = with pkgs; []; + }; + + # Enable automatic login for the user. + services.getty.autologinUser = "phil"; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + # wget ]; - # for Nvidia GPU - #services.xserver.videoDrivers = ["nvidia"]; - hardware.opengl.enable = true; - #hardware.nvidia = { - # package = config.boot.kernelPackages.nvidiaPackages.stable; - # modesetting.enable = true; - #}; + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions @@ -73,8 +104,6 @@ # 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 = "25.05"; # Did you read the comment? + system.stateVersion = "24.11"; # Did you read the comment? } - - diff --git a/hosts/qemu/hardware-configuration.nix b/hosts/qemu/hardware-configuration.nix index 2222882..acd9748 100644 --- a/hosts/qemu/hardware-configuration.nix +++ b/hosts/qemu/hardware-configuration.nix @@ -14,17 +14,13 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-label/NIXROOT"; + { device = "/dev/disk/by-uuid/8ace4659-e212-489e-8577-c71eb54ebf57"; fsType = "ext4"; }; - fileSystems."/boot" = - { device = "/dev/disk/by-label/NIXBOOT"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; - - swapDevices = [ ]; + swapDevices = + [ { device = "/dev/disk/by-uuid/7bd0e706-f339-485b-95b8-a1bfbfb6a756"; } + ]; # 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