Compare commits

..

No commits in common. "efff74008b59e7706065450fcb6c222a4799eb29" and "a06055736004151781f009a1f7de9fe7145c1414" have entirely different histories.

5 changed files with 16 additions and 35 deletions

View file

@ -9,7 +9,7 @@
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./../../modules/core ./../../modules/core
./../../modules/home/steam.nix # ./../../modules/home/nfs.nix
./../../modules/core/virtualization.nix ./../../modules/core/virtualization.nix
./../../modules/services/tailscale.nix ./../../modules/services/tailscale.nix
./../../modules/services/mpd.nix ./../../modules/services/mpd.nix

View file

@ -3,7 +3,7 @@
imports = imports =
[ (import ./docker.nix) ] [ (import ./docker.nix) ]
++ [ (import ./hardware.nix) ] ++ [ (import ./hardware.nix) ]
# ++ [ (import ./displaylink.nix) ] ++ [ (import ./displaylink.nix) ]
# ++ [(import ./printing.nix)] # ++ [(import ./printing.nix)]
++ [ (import ./xserver.nix) ] ++ [ (import ./xserver.nix) ]
++ [ (import ./network.nix) ] ++ [ (import ./network.nix) ]

View file

@ -1,3 +0,0 @@
{
programs.steam.enable = true;
}

View file

@ -16,7 +16,6 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ cifs-utils ];
home-manager = { home-manager = {
users.${username} = { users.${username} = {
home.packages = with pkgs; [ home.packages = with pkgs; [

View file

@ -1,25 +1,13 @@
{ { lib, pkgs, config, username, home-manager, ... }:
lib,
pkgs,
config,
username,
home-manager,
...
}:
with lib; with lib;
let let
cfg = config.liv.laptop; cfg = config.liv.laptop;
in in {
{
options.liv.laptop = { options.liv.laptop = {
enable = mkEnableOption "Enable laptop"; enable = mkEnableOption "Enable laptop";
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [
cifs-utils
powertop
];
home-manager = { home-manager = {
users.${username} = { users.${username} = {
home.packages = with pkgs; [ home.packages = with pkgs; [
@ -29,21 +17,18 @@ in
}; };
}; };
# DisplayLink
services.xserver.videoDrivers = [
"displaylink"
"modesetting"
];
systemd.services.dlm.wantedBy = [ "multi-user.target" ];
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
environment.systemPackages = with pkgs; [
# powertop
];
boot = { boot = {
kernelModules = [ "acpi_call" ]; kernelModules = ["acpi_call"];
extraModulePackages = with config.boot.kernelPackages; [ extraModulePackages = with config.boot.kernelPackages;
acpi_call [
]; acpi_call
}; ];
};
services = { services = {
thermald.enable = true; thermald.enable = true;
power-profiles-daemon.enable = true; power-profiles-daemon.enable = true;
@ -56,6 +41,6 @@ in
criticalPowerAction = "Hibernate"; criticalPowerAction = "Hibernate";
}; };
}; };
powerManagement.powertop.enable = true; # powerManagement.powertop.enable = true;
}; };
} }