From ebf19204d31c7861d9f4e74ad22ab6f3dcdc96d6 Mon Sep 17 00:00:00 2001 From: Alexander Szczepanski Date: Wed, 2 Oct 2024 10:24:49 +0200 Subject: [PATCH] desktop-2024-10-02-10-24-49 --- README.md | 2 ++ configs/borg-exclude.nix | 6 ++-- configs/common.nix | 1 + configs/user-gui.nix | 2 +- flake.lock | 30 ++++++++-------- machine/desktop/configuration.nix | 40 +++++++++++++--------- machine/desktop/hardware-configuration.nix | 19 +++++----- 7 files changed, 56 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index d4a4a84..c72609d 100644 --- a/README.md +++ b/README.md @@ -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-env -p /nix/var/nix/profiles/system --list-generations diff --git a/configs/borg-exclude.nix b/configs/borg-exclude.nix index efecbea..ed53e75 100755 --- a/configs/borg-exclude.nix +++ b/configs/borg-exclude.nix @@ -1,12 +1,14 @@ { borg-exclude = [ ".cache" + ".local/share/libvirt/images" ".local/share/Steam" ".local/share/Trash" - "Games/guild-wars/drive_c/Program Files/Guild Wars/Gw.dat" - "Games/guild-wars-second/drive_c/Program Files/Guild Wars/Gw.dat" + "Downloads" + "Games" + # "Games/guild-wars/drive_c/Program Files/Guild Wars/Gw.dat" "Nextcloud" "VirtualBox VMs" diff --git a/configs/common.nix b/configs/common.nix index 3b0db70..ebf4800 100755 --- a/configs/common.nix +++ b/configs/common.nix @@ -61,6 +61,7 @@ lsof man-pages man-pages-posix + kitty.terminfo nil nix-du diff --git a/configs/user-gui.nix b/configs/user-gui.nix index 00e05cf..c4b8ae2 100755 --- a/configs/user-gui.nix +++ b/configs/user-gui.nix @@ -56,7 +56,7 @@ keepassxc nextcloud-client pinta - rustdesk + rustdesk-flutter simple-scan telegram-desktop diff --git a/flake.lock b/flake.lock index 0342a5b..dd96aad 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1727620986, - "narHash": "sha256-4RlJt1MJmZcuP3ROlrb2YvG8WfH0BM/nGqDgNT/DAwE=", + "lastModified": 1727734424, + "narHash": "sha256-COHPdJb8goIemave9L8kBKkQKEPHuilXZqR3nIBcQsM=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "0eee1b2134e9aa3427081715ada883f3523a9608", + "rev": "fed2d39a7c4614311e25a4281d056a7a2d36a6c8", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1727383923, - "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "lastModified": 1727817100, + "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", "type": "github" }, "original": { @@ -202,11 +202,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "type": "github" }, "original": { @@ -234,11 +234,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "type": "github" }, "original": { @@ -283,11 +283,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1727423009, - "narHash": "sha256-+4B/dQm2EnORIk0k2wV3aHGaE0WXTBjColXjj7qWh10=", + "lastModified": 1727734513, + "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=", "owner": "mic92", "repo": "sops-nix", - "rev": "127a96f49ddc377be6ba76964411bab11ae27803", + "rev": "3198a242e547939c5e659353551b0668ec150268", "type": "github" }, "original": { diff --git a/machine/desktop/configuration.nix b/machine/desktop/configuration.nix index 562453a..6578c5f 100755 --- a/machine/desktop/configuration.nix +++ b/machine/desktop/configuration.nix @@ -28,7 +28,7 @@ in ../../configs/user.nix ]; - chaotic.mesa-git.enable = true; + # chaotic.mesa-git.enable = true; sops = { defaultSopsFile = ../../secrets.yaml; @@ -67,21 +67,19 @@ 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" ]; +# extraModulePackages = with pkgs.linuxPackages_cachyos; [ it87 ]; + kernelModules = [ "nct6775" ]; + # kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" ]; }; - systemd.services = { - monitor = { - description = "AMDGPU Control Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "multi-user.target" ]; - serviceConfig = { ExecStart = "${pkgs.lact}/bin/lact daemon"; }; - }; - }; + # systemd.services = { + # monitor = { + # description = "AMDGPU Control Daemon"; + # wantedBy = [ "multi-user.target" ]; + # after = [ "multi-user.target" ]; + # serviceConfig = { ExecStart = "${pkgs.lact}/bin/lact daemon"; }; + # }; + # }; networking = { hostName = "desktop"; @@ -104,9 +102,9 @@ in clinfo - fan2go +# fan2go - unigine-superposition +# unigine-superposition ]; hardware = { @@ -140,7 +138,15 @@ in pulseaudio.enable = false; }; - programs.coolercontrol.enable = true; + programs = { + coolercontrol.enable = true; + corectrl = { + enable = true; + # gpuOverclock.ppfeaturemask + gpuOverclock.enable = true; + }; + }; + services = { power-profiles-daemon.enable = true; diff --git a/machine/desktop/hardware-configuration.nix b/machine/desktop/hardware-configuration.nix index ac291f4..b81a9c4 100644 --- a/machine/desktop/hardware-configuration.nix +++ b/machine/desktop/hardware-configuration.nix @@ -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, ... }: + { imports = [ @@ -11,29 +15,26 @@ boot.extraModulePackages = [ ]; fileSystems."/" = { - device = "/dev/disk/by-uuid/d43faf8e-ec90-4735-a1a4-aff6897604b2"; + device = "/dev/disk/by-uuid/593a3e75-5479-4ee4-9797-d453c8841f8e"; options = [ "discard" ]; fsType = "ext4"; }; - fileSystems."/mnt/data" = { - device = "/dev/disk/by-uuid/441a7d92-c3eb-4867-81c7-4e1dc3a1c54d"; - fsType = "ext4"; - }; - - boot.initrd.luks.devices."luks-ba8eb308-e85f-4cee-9993-88c5ba0966ea" = { - device = "/dev/disk/by-uuid/ba8eb308-e85f-4cee-9993-88c5ba0966ea"; + boot.initrd.luks.devices."nixos" = { + device = "/dev/disk/by-uuid/56c16ba5-1a5f-4364-a663-6d924810f7e9"; allowDiscards = true; }; fileSystems."/boot" = { - device = "/dev/disk/by-uuid/1838-7DA8"; + device = "/dev/disk/by-uuid/28F0-919C"; fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; }; swapDevices = [ ]; networking.useDHCP = lib.mkDefault true; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }