From 9d0cacfb4b159a7ac47fbfc475e48f1d0f17db34 Mon Sep 17 00:00:00 2001 From: mrfluffy-dev Date: Tue, 17 Jun 2025 23:34:24 +0100 Subject: [PATCH] ly instead of lightdm coz laptop no like lightdm --- configuration.nix | 34 +++++++++++++++++++++++----------- hardware-configuration.nix | 23 +++++++++-------------- 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/configuration.nix b/configuration.nix index 0e87b95..69a77f0 100755 --- a/configuration.nix +++ b/configuration.nix @@ -68,17 +68,29 @@ in variant = ""; }; enable = true; - displayManager.lightdm = { - enable = true; - greeters.gtk = { - enable = true; - theme.package = pkgs.amarena-theme; - theme.name = "amarena"; - cursorTheme.package = oreo.override { colors = [ "oreo_spark_pink_cursors" ]; }; - cursorTheme.name = "oreo_spark_pink_cursors"; - extraConfig = "background=${./assets/Wallpapers/138.png}"; - }; - }; + #displayManager.lightdm = { + # enable = true; + # greeters.gtk = { + # enable = true; + # theme.package = pkgs.amarena-theme; + # theme.name = "amarena"; + # cursorTheme.package = oreo.override { colors = [ "oreo_spark_pink_cursors" ]; }; + # cursorTheme.name = "oreo_spark_pink_cursors"; + # extraConfig = "background=${./assets/Wallpapers/138.png}"; + # }; + #}; + }; + + services.displayManager.ly = { + enable = true; + #greeters.gtk = { + # enable = true; + # theme.package = pkgs.amarena-theme; + # theme.name = "amarena"; + # cursorTheme.package = oreo.override { colors = [ "oreo_spark_pink_cursors" ]; }; + # cursorTheme.name = "oreo_spark_pink_cursors"; + # extraConfig = "background=${./assets/Wallpapers/138.png}"; + #}; }; security.rtkit.enable = true; diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 5aced16..3563a70 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -8,28 +8,24 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; + boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/fdcbb840-4b35-4023-a048-599b0c5161d6"; - fsType = "btrfs"; + { device = "/dev/disk/by-uuid/6aa7c67d-a0a5-4928-b16b-9c7991fee7ab"; + fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/E1B6-9089"; + { device = "/dev/disk/by-uuid/A4F3-8038"; fsType = "vfat"; - }; - - fileSystems."/home" = - { device = "/dev/disk/by-uuid/d226a8ed-10eb-452e-9284-1ff994a7f179"; - fsType = "btrfs"; + options = [ "fmask=0077" "dmask=0077" ]; }; swapDevices = - [ { device = "/dev/disk/by-uuid/ccf41b96-c45f-47e0-8541-cd865f5d2ec6"; } + [ { device = "/dev/disk/by-uuid/b416c3bd-861b-4b0c-aa84-6962b2e6a47d"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -37,9 +33,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.enp6s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp4s0f0u8.useDHCP = lib.mkDefault true; + # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }