BeiNacht/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

desktop-2024-09-29-12-25-24

Browse Source
This commit is contained in:
Alexander Szczepanski
2024-09-29 12:25:24 +02:00
parent a77483b5e5
commit 5cc84aea2f
8 changed files with 112 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
machine/desktop/configuration.nix
View File

@ -4,21 +4,7 @@ let
in
{
nixpkgs = {
overlays = [
(self: super: {
linuxPackages_cachyos = super.linuxPackages_cachyos.extend (lpself: lpsuper: {
xone = super.linuxPackages_cachyos.xone.overrideAttrs (oldAttrs: rec {
version = "0-unstable-latest";
src = pkgs.fetchFromGitHub {
owner = "tskaar";
repo = "xone";
rev = "28df566c38e0ee500fd5f74643fc35f21a4ff696";
hash = "sha256-++ScZiHnf8v7TjNBTQm7qGm3FALGp440avuQUuA86O4=";
};
});
});
})
];
overlays = [ ];
config = {
allowUnfree = true;
};
@ -42,6 +28,8 @@ in
../../configs/user.nix
];
chaotic.mesa-git.enable = true;
sops = {
defaultSopsFile = ../../secrets.yaml;
validateSopsFiles = true;
@ -80,6 +68,8 @@ in
kernelPackages = pkgs.linuxPackages_cachyos;
extraModulePackages = with pkgs.linuxPackages_cachyos; [ it87 ];
# kernelPackages = pkgs.linuxPackages_6_9;
# extraModulePackages = with pkgs.linuxPackages_6_9; [ it87 ];
kernelModules = [ "it87" ];
kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" ];
};
@ -130,22 +120,22 @@ in
enable32Bit = true;
};
fancontrol = {
enable = true;
config = ''
INTERVAL=10
DEVPATH=hwmon3=devices/platform/it87.656
DEVNAME=hwmon3=it8665
FCTEMPS=hwmon3/pwm1=hwmon6/temp1_input hwmon3/pwm2=hwmon6/temp3_input hwmon3/pwm3=hwmon6/temp3_input
FCFANS=hwmon3/pwm1=hwmon3/fan1_input hwmon3/pwm2=hwmon3/fan2_input hwmon3/pwm3=hwmon3/fan3_input
MINTEMP=hwmon3/pwm1=60 hwmon3/pwm2=60 hwmon3/pwm3=60
MAXTEMP=hwmon3/pwm1=80 hwmon3/pwm2=80 hwmon3/pwm3=80
MINSTART=hwmon3/pwm1=51 hwmon3/pwm2=102 hwmon3/pwm3=102
MINSTOP=hwmon3/pwm1=51 hwmon3/pwm2=102 hwmon3/pwm3=102
MINPWM=hwmon3/pwm1=51 hwmon3/pwm2=102 hwmon3/pwm3=102
MAXPWM=hwmon3/pwm1=127 hwmon3/pwm2=127 hwmon3/pwm3=127
'';
};
# fancontrol = {
# enable = true;
# config = ''
# INTERVAL=10
# DEVPATH=hwmon3=devices/platform/it87.656
# DEVNAME=hwmon3=it8665
# FCTEMPS=hwmon3/pwm1=hwmon6/temp1_input hwmon3/pwm2=hwmon6/temp3_input hwmon3/pwm3=hwmon6/temp3_input
# FCFANS=hwmon3/pwm1=hwmon3/fan1_input hwmon3/pwm2=hwmon3/fan2_input hwmon3/pwm3=hwmon3/fan3_input
# MINTEMP=hwmon3/pwm1=60 hwmon3/pwm2=60 hwmon3/pwm3=60
# MAXTEMP=hwmon3/pwm1=80 hwmon3/pwm2=80 hwmon3/pwm3=80
# MINSTART=hwmon3/pwm1=51 hwmon3/pwm2=102 hwmon3/pwm3=102
# MINSTOP=hwmon3/pwm1=51 hwmon3/pwm2=102 hwmon3/pwm3=102
# MINPWM=hwmon3/pwm1=51 hwmon3/pwm2=102 hwmon3/pwm3=102
# MAXPWM=hwmon3/pwm1=127 hwmon3/pwm2=127 hwmon3/pwm3=127
# '';
# };
pulseaudio.enable = false;
};
@ -167,30 +157,34 @@ in
pulse.enable = true;
};
# samba = {
# enable = true;
# securityType = "user";
# extraConfig = ''
# workgroup = WORKGROUP
# server string = server
# netbios name = server
# security = user
# guest account = nobody
# map to guest = bad user
# logging = systemd
# max log size = 50
# '';
# shares = {
# storage = {
# path = "/home/alex/shared/storage";
# browseable = "yes";
# "read only" = "no";
# "guest ok" = "no";
# "create mask" = "0644";
# "directory mask" = "0755";
# };
# };
# };
samba = {
enable = true;
settings = {
global = {
workgroup = "WORKGROUP";
"server string" = "server";
"netbios name" = "server";
security = "user";
"guest account" = "nobody";
"map to guest" = "bad user";
logging = "systemd";
"max log size" = 50;
"invalid users" = [
"root"
];
"passwd program" = "/run/wrappers/bin/passwd %u";
};
shares = {
browseable = "yes";
"guest ok" = "no";
path = "/home/alex/shared/storage";
"read only" = "no";
"create mask" = "0644";
"directory mask" = "0755";
};
};
};
tailscale.enable = true;
@ -216,5 +210,10 @@ in
};
};
swapDevices = [{
device = "/swapfile";
size = 32 * 1024;
}];
system.stateVersion = "24.11";
}