liv/nixos-config
1
0
Fork 0
mirror of https://github.com/Ahwxorg/nixos-config.git synced 2025-12-04 15:00:13 +01:00
Code Issues 1 Projects Releases Packages Wiki Activity Actions

Compare commits

base: liv:a06055736004151781f009a1f7de9fe7145c1414
Branches Tags
liv:master
...
compare: liv:efff74008b59e7706065450fcb6c222a4799eb29
Branches Tags
liv:master

7 commits
a060557360 ... efff74008b

Author SHA1 Message Date
Ahwx
efff74008b fix: move displaylink stuff to be inside cfg argument, of course that doesn't work otherwise 2025-09-25 20:49:27 +02:00
Ahwx
53c085fa03 chore: merge branch 'master' of ssh://ssh.github.com:443/ahwxorg/nixos-config 2025-09-25 20:45:24 +02:00
Ahwx
25d6d805e1 chore: simple steam module 2025-09-25 20:44:58 +02:00
Ahwx
1e9ad6c6b3 chore: adds steam to iris 2025-09-25 20:44:46 +02:00
Ahwx
6b0bf699b7 chore: adds displaylink to laptop role; adds cifs-utils to laptop role too 2025-09-25 20:44:23 +02:00
Ahwx
341a99b1fb chore: adds cifs-utils to desktops 2025-09-25 20:43:55 +02:00
Ahwx
a711bf5dd6 chore: remove displaylink from all hosts to re-add to laptops, as it is not required for desktops or servers 2025-09-25 20:43:34 +02:00
5 changed files with 35 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosts/iris/default.nix
View file

@ -9,7 +9,7 @@
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./../../modules/core ./../../modules/core
# ./../../modules/home/nfs.nix ./../../modules/home/steam.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

2
modules/core/default.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) ]

3
modules/home/steam.nix Normal file
View file

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

1
roles/desktop.nix
View file

@ -16,6 +16,7 @@ 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; [

31
roles/laptop.nix
View file

@ -1,13 +1,25 @@
{ 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; [
@ -17,15 +29,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
]; ];
}; };
@ -41,6 +56,6 @@ in {
criticalPowerAction = "Hibernate"; criticalPowerAction = "Hibernate";
}; };
}; };
# powerManagement.powertop.enable = true; powerManagement.powertop.enable = true;
}; };
} }