From 7299f8b5ac29a32dab17ad71a5441eab8805913e Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Mon, 6 Jan 2025 16:11:17 +0100 Subject: [PATCH] laptop --- modules/collections/laptop.nix | 1 + modules/graphical/basics.nix | 2 +- overlays.nix | 3 +-- systems/laptop/modules/battery.nix | 3 ++- systems/portable-ssd/configuration.nix | 2 +- users/kopatz/default.nix | 1 - 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/collections/laptop.nix b/modules/collections/laptop.nix index 5eda282..4048b12 100644 --- a/modules/collections/laptop.nix +++ b/modules/collections/laptop.nix @@ -28,6 +28,7 @@ }; graphical = { audio.enable = true; + basics.enable = true; code = { enable = true; #android.enable = true; diff --git a/modules/graphical/basics.nix b/modules/graphical/basics.nix index dc591e7..98ed8ed 100644 --- a/modules/graphical/basics.nix +++ b/modules/graphical/basics.nix @@ -9,7 +9,7 @@ in { config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ keepassxc - discord + discord-canary gvfs remmina thunderbird diff --git a/overlays.nix b/overlays.nix index 23b5abc..5621c55 100644 --- a/overlays.nix +++ b/overlays.nix @@ -12,8 +12,7 @@ in { # You can change versions, add patches, set compilation flags, anything really. # https://nixos.wiki/wiki/Overlays modifications = final: prev: { - discord = prev.discord-canary.override { withVencord = true; }; - #discord = prev.vesktop; + discord-canary = prev.discord-canary.override { withVencord = true; }; tetrio-desktop = prev.tetrio-desktop.override { withTetrioPlus = true; }; #hyprland = prev.hyprland.overrideAttrs (oldAttrs: { # version = "0.45.0"; diff --git a/systems/laptop/modules/battery.nix b/systems/laptop/modules/battery.nix index f0b9fa1..52559ec 100644 --- a/systems/laptop/modules/battery.nix +++ b/systems/laptop/modules/battery.nix @@ -15,7 +15,8 @@ CPU_SCALING_GOVERNOR_ON_AC = "performance"; CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; - CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; + #CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; + CPU_ENERGY_PERF_POLICY_ON_BAT = "balance_power"; CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; CPU_MIN_PERF_ON_AC = 0; diff --git a/systems/portable-ssd/configuration.nix b/systems/portable-ssd/configuration.nix index 18ac9da..27153d6 100644 --- a/systems/portable-ssd/configuration.nix +++ b/systems/portable-ssd/configuration.nix @@ -47,7 +47,7 @@ networking.useDHCP = lib.mkDefault true; networking.networkmanager.enable = true; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "ehci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "ehci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "sd_mod" "rtsx_pci_sdmmc" "uas" "usbcore" "ehci_hcd" "uhci_hcd" "ohci_hcd" "scsi_mod" ]; fileSystems."/" = { device = "/dev/disk/by-label/nixos-ssd"; fsType = "ext4"; diff --git a/users/kopatz/default.nix b/users/kopatz/default.nix index 2b97407..81948cb 100644 --- a/users/kopatz/default.nix +++ b/users/kopatz/default.nix @@ -24,7 +24,6 @@ shell = pkgs.zsh; extraGroups = [ "networkmanager" "wheel" "docker" ]; packages = with pkgs; [ - #discord brave ]; openssh.authorizedKeys.keys = [ config.mainUser.sshKey ];