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

desktop-2024-10-02-10-24-49

Browse Source
This commit is contained in:
Alexander Szczepanski
2024-10-02 10:24:49 +02:00
parent 819e3d6fae
commit ebf19204d3
7 changed files with 56 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -12,6 +12,8 @@ it's important to add the ssh host key to known hosts
``` ```
nix flake update .
sudo nix-collect-garbage -d sudo nix-collect-garbage -d
sudo nix-env -p /nix/var/nix/profiles/system --list-generations sudo nix-env -p /nix/var/nix/profiles/system --list-generations

6
configs/borg-exclude.nix
View File

@ -1,12 +1,14 @@
{ {
borg-exclude = [ borg-exclude = [
".cache" ".cache"
".local/share/libvirt/images" ".local/share/libvirt/images"
".local/share/Steam" ".local/share/Steam"
".local/share/Trash" ".local/share/Trash"
"Games/guild-wars/drive_c/Program Files/Guild Wars/Gw.dat" "Downloads"
"Games/guild-wars-second/drive_c/Program Files/Guild Wars/Gw.dat" "Games"
# "Games/guild-wars/drive_c/Program Files/Guild Wars/Gw.dat"
"Nextcloud" "Nextcloud"
"VirtualBox VMs" "VirtualBox VMs"

1
configs/common.nix
View File

@ -61,6 +61,7 @@
lsof lsof
man-pages man-pages
man-pages-posix man-pages-posix
kitty.terminfo
nil nil
nix-du nix-du

2
configs/user-gui.nix
View File

@ -56,7 +56,7 @@
keepassxc keepassxc
nextcloud-client nextcloud-client
pinta pinta
rustdesk rustdesk-flutter
simple-scan simple-scan
telegram-desktop telegram-desktop

30
flake.lock generated
View File

@ -9,11 +9,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1727620986, "lastModified": 1727734424,
"narHash": "sha256-4RlJt1MJmZcuP3ROlrb2YvG8WfH0BM/nGqDgNT/DAwE=", "narHash": "sha256-COHPdJb8goIemave9L8kBKkQKEPHuilXZqR3nIBcQsM=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "0eee1b2134e9aa3427081715ada883f3523a9608", "rev": "fed2d39a7c4614311e25a4281d056a7a2d36a6c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -125,11 +125,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727383923, "lastModified": 1727817100,
"narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ffe2d07e771580a005e675108212597e5b367d2d", "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -202,11 +202,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1727348695, "lastModified": 1727634051,
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -234,11 +234,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1727348695, "lastModified": 1727634051,
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -283,11 +283,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1727423009, "lastModified": 1727734513,
"narHash": "sha256-+4B/dQm2EnORIk0k2wV3aHGaE0WXTBjColXjj7qWh10=", "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "127a96f49ddc377be6ba76964411bab11ae27803", "rev": "3198a242e547939c5e659353551b0668ec150268",
"type": "github" "type": "github"
}, },
"original": { "original": {

40
machine/desktop/configuration.nix
View File

@ -28,7 +28,7 @@ in
../../configs/user.nix ../../configs/user.nix
]; ];
chaotic.mesa-git.enable = true; # chaotic.mesa-git.enable = true;
sops = { sops = {
defaultSopsFile = ../../secrets.yaml; defaultSopsFile = ../../secrets.yaml;
@ -67,21 +67,19 @@ in
}; };
kernelPackages = pkgs.linuxPackages_cachyos; kernelPackages = pkgs.linuxPackages_cachyos;
extraModulePackages = with pkgs.linuxPackages_cachyos; [ it87 ]; # extraModulePackages = with pkgs.linuxPackages_cachyos; [ it87 ];
# kernelPackages = pkgs.linuxPackages_6_9; kernelModules = [ "nct6775" ];
# extraModulePackages = with pkgs.linuxPackages_6_9; [ it87 ]; # kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" ];
kernelModules = [ "it87" ];
kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" ];
}; };
systemd.services = { # systemd.services = {
monitor = { # monitor = {
description = "AMDGPU Control Daemon"; # description = "AMDGPU Control Daemon";
wantedBy = [ "multi-user.target" ]; # wantedBy = [ "multi-user.target" ];
after = [ "multi-user.target" ]; # after = [ "multi-user.target" ];
serviceConfig = { ExecStart = "${pkgs.lact}/bin/lact daemon"; }; # serviceConfig = { ExecStart = "${pkgs.lact}/bin/lact daemon"; };
}; # };
}; # };
networking = { networking = {
hostName = "desktop"; hostName = "desktop";
@ -104,9 +102,9 @@ in
clinfo clinfo
fan2go # fan2go
unigine-superposition # unigine-superposition
]; ];
hardware = { hardware = {
@ -140,7 +138,15 @@ in
pulseaudio.enable = false; pulseaudio.enable = false;
}; };
programs.coolercontrol.enable = true; programs = {
coolercontrol.enable = true;
corectrl = {
enable = true;
# gpuOverclock.ppfeaturemask
gpuOverclock.enable = true;
};
};
services = { services = {
power-profiles-daemon.enable = true; power-profiles-daemon.enable = true;

19
machine/desktop/hardware-configuration.nix
View File

@ -1,4 +1,8 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
{ {
imports = imports =
[ [
@ -11,29 +15,26 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/d43faf8e-ec90-4735-a1a4-aff6897604b2"; device = "/dev/disk/by-uuid/593a3e75-5479-4ee4-9797-d453c8841f8e";
options = [ "discard" ]; options = [ "discard" ];
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/mnt/data" = { boot.initrd.luks.devices."nixos" = {
device = "/dev/disk/by-uuid/441a7d92-c3eb-4867-81c7-4e1dc3a1c54d"; device = "/dev/disk/by-uuid/56c16ba5-1a5f-4364-a663-6d924810f7e9";
fsType = "ext4";
};
boot.initrd.luks.devices."luks-ba8eb308-e85f-4cee-9993-88c5ba0966ea" = {
device = "/dev/disk/by-uuid/ba8eb308-e85f-4cee-9993-88c5ba0966ea";
allowDiscards = true; allowDiscards = true;
}; };
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/1838-7DA8"; device = "/dev/disk/by-uuid/28F0-919C";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
}; };
swapDevices = [ ]; swapDevices = [ ];
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }