From 521120022afcd8cd59e2d61c545f235e595bcdd6 Mon Sep 17 00:00:00 2001 From: DerGrumpf Date: Mon, 7 Apr 2025 18:19:32 +0200 Subject: [PATCH] Changed: Pipewire --- hosts/m920q/configuration.nix | 128 +++++++++++++++++++++++++ hosts/m920q/default.nix | 12 +-- hosts/m920q/hardware-configuration.nix | 7 +- modules/pipewire.nix | 10 +- 4 files changed, 141 insertions(+), 16 deletions(-) create mode 100644 hosts/m920q/configuration.nix diff --git a/hosts/m920q/configuration.nix b/hosts/m920q/configuration.nix new file mode 100644 index 0000000..7583a3d --- /dev/null +++ b/hosts/m920q/configuration.nix @@ -0,0 +1,128 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page, on +# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). + +{ config, lib, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + # networking.hostName = "nixos"; # Define your hostname. + # Pick only one of the below networking options. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + + # Set your time zone. + time.timeZone = "Europe/Berlin"; + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Select internationalisation properties. + # i18n.defaultLocale = "en_US.UTF-8"; + # console = { + # font = "Lat2-Terminus16"; + # keyMap = "us"; + # useXkbConfig = true; # use xkb.options in tty. + # }; + + # Enable the X11 windowing system. + # services.xserver.enable = true; + + + + + # Configure keymap in X11 + services.xserver.xkb.layout = "de"; + # services.xserver.xkb.options = "eurosign:e,caps:escape"; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + # Enable sound. + # hardware.pulseaudio.enable = true; + # OR + # services.pipewire = { + # enable = true; + # pulse.enable = true; + # }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.phil = { + initialPassword = "!P2h3i4lon"; + isNormalUser = true; + extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + packages = with pkgs; [ + tree + neovim + git + wget + curl + ]; + }; + + # programs.firefox.enable = 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 + # ]; + + # 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; + + # Copy the NixOS configuration file and link it from the resulting system + # (/run/current-system/configuration.nix). This is useful in case you + # accidentally delete configuration.nix. + system.copySystemConfiguration = true; + + # 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/m920q/default.nix b/hosts/m920q/default.nix index 4baf734..1be54cd 100644 --- a/hosts/m920q/default.nix +++ b/hosts/m920q/default.nix @@ -27,15 +27,11 @@ # Bootloader. boot.loader = { - grub = { - enable = true; - device = "/dev/sda"; - }; - #efi = { - # canTouchEfiVariables = true; + efi = { + canTouchEfiVariables = true; # efiSysMountPoint = "/boot/efi"; # ← use the same mount point here. - #}; - #systemd-boot.enable = true; + }; + systemd-boot.enable = true; }; networking.hostName = "nix-desktop"; # Define your hostname. diff --git a/hosts/m920q/hardware-configuration.nix b/hosts/m920q/hardware-configuration.nix index 2222882..6d7c2bb 100644 --- a/hosts/m920q/hardware-configuration.nix +++ b/hosts/m920q/hardware-configuration.nix @@ -5,10 +5,10 @@ { imports = - [ (modulesPath + "/profiles/qemu-guest.nix") + [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "ata_piix" "floppy" "sd_mod" "sr_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; @@ -31,7 +31,8 @@ # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.ens3.useDHCP = lib.mkDefault true; + # networking.interfaces.eno1.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/modules/pipewire.nix b/modules/pipewire.nix index 98fb869..1a99d91 100644 --- a/modules/pipewire.nix +++ b/modules/pipewire.nix @@ -3,14 +3,14 @@ # Enable sound with pipewire. #sound.enable = true; hardware.pulseaudio.enable = false; - enviroment.systemPackages = with pkgs; [ pamixer ]; + environment.systemPackages = with pkgs; [ pamixer ]; services.pipewire = { enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; + #alsa.enable = true; + #alsa.support32Bit = true; + #pulse.enable = true; # If you want to use JACK applications, uncomment this - jack.enable = true; + #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)