From a613b0eda599bc16c93a8fc2fc674beb180b5cb6 Mon Sep 17 00:00:00 2001 From: Gustav Bruhn Date: Mon, 21 Apr 2025 18:23:16 +0200 Subject: [PATCH] 8 current 2025-04-21 18:23:12 25.05.20250417.b024ced 6.12.23 * --- flake.lock | 6 ++-- hosts/desktop/configuration.nix | 5 ++- hosts/desktop/hardware-configuration.nix | 42 +++++++++++++----------- 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 840f7e7..2e48887 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1745205007, - "narHash": "sha256-k67bEcLkSo13TIBfs0CGYkJjG12aaikabMtxWbSeqr0=", + "lastModified": 1745252367, + "narHash": "sha256-xmQJPtCzKCQ911kFu5cwhWi8uqY1i57kHxsuB9mmRL8=", "owner": "nix-community", "repo": "home-manager", - "rev": "3fbe9a2b76ff5c4dcb2a2a2027dac31cfc993c8c", + "rev": "ddda2b1f20ffc92b803fc5c8c0d80bbfb54cd478", "type": "github" }, "original": { diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 85e8b88..40cb7fe 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -8,8 +8,8 @@ # Include the results of the hardware scan. ./hardware-configuration.nix inputs.home-manager.nixosModules.default - ../../modules/nixos/cosmic.nix - # ../../modules/nixos/niri.nix + # ../../modules/nixos/cosmic.nix + ../../modules/nixos/niri.nix ]; # Bootloader. boot.loader.systemd-boot.enable = true; @@ -91,7 +91,6 @@ fastfetch nmap spotify - ]; programs.steam.enable = true; diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix index fbd88b6..f318207 100644 --- a/hosts/desktop/hardware-configuration.nix +++ b/hosts/desktop/hardware-configuration.nix @@ -1,30 +1,34 @@ # 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, pkgs, modulesPath, ... }: - { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/f30c7188-4875-42c0-abfd-78f9653437de"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/f30c7188-4875-42c0-abfd-78f9653437de"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/50EC-BA3D"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/50EC-BA3D"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; - swapDevices = [ ]; + 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