From 9ad09197c875c2ef1e57a130997dfda508e02f48 Mon Sep 17 00:00:00 2001 From: Alexander Szczepanski Date: Sun, 6 Oct 2024 15:09:42 +0200 Subject: [PATCH] desktop-2024-10-06-15-09-42 --- README.md | 2 + backup/pantheon.nix | 6 +- configs/common.nix | 8 +-- configs/plasma-wayland.nix | 11 ++- configs/user.nix | 13 ++-- flake.lock | 109 ++++++++++++++++++++++-------- flake.nix | 16 +++-- machine/desktop/configuration.nix | 21 ++++-- 8 files changed, 131 insertions(+), 55 deletions(-) diff --git a/README.md b/README.md index c72609d..a47b543 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,8 @@ it's important to add the ssh host key to known hosts ``` nix flake update . +sudo mergerfs -o cache.files=partial,dropcacheonclose=true,category.create=mfs /run/media/alex/disk1:/run/media/alex/disk2:/run/media/alex/disk3 /home/alex/shared/raid + sudo nix-collect-garbage -d sudo nix-env -p /nix/var/nix/profiles/system --list-generations diff --git a/backup/pantheon.nix b/backup/pantheon.nix index f3eb769..b6a349b 100755 --- a/backup/pantheon.nix +++ b/backup/pantheon.nix @@ -1,8 +1,10 @@ { config, pkgs, lib, ... }: { - programs.pantheon-tweaks.enable = true; - programs.evolution.enable = true; + programs = { + pantheon-tweaks.enable = true; + evolution.enable = true; + }; services = { xserver = { diff --git a/configs/common.nix b/configs/common.nix index ebf4800..ff7b940 100755 --- a/configs/common.nix +++ b/configs/common.nix @@ -33,10 +33,8 @@ du-dust ncdu - duf - dfc - - eza + duf # dfc alternative + lsd # eza alternative # age key encryption ssh-to-age @@ -50,6 +48,7 @@ nethogs iotop nmap + nmon gnupg gocryptfs @@ -57,7 +56,6 @@ hdparm inxi lm_sensors - lsd lsof man-pages man-pages-posix diff --git a/configs/plasma-wayland.nix b/configs/plasma-wayland.nix index 9f126f4..c6a9dde 100755 --- a/configs/plasma-wayland.nix +++ b/configs/plasma-wayland.nix @@ -2,9 +2,14 @@ programs = { dconf.enable = true; kdeconnect.enable = true; + evolution.enable = true; partition-manager.enable = true; - # package = pkgs.kdePackages.partitionmanager; - # }; + kde-pim = { + enable = true; + kontact = true; + kmail = true; + merkuro = true; + }; }; environment = { @@ -23,7 +28,7 @@ kdePackages.ksshaskpass kdePackages.kde-gtk-config kdePackages.breeze-gtk - # kdePackages.partitionmanager + # kdePackages.kmail kdePackages.filelight kdePackages.plasma-disks kdePackages.kalk diff --git a/configs/user.nix b/configs/user.nix index d82f172..0086eea 100755 --- a/configs/user.nix +++ b/configs/user.nix @@ -150,16 +150,17 @@ shellAliases = { active-services = "systemctl --no-page --no-legend --plain -t service --state=running"; - autofanspeed = "echo level auto | sudo tee /proc/acpi/ibm/fan"; - maxfanspeed = "echo level full-speed | sudo tee /proc/acpi/ibm/fan"; db = "sudo updatedb"; "-g C" = "| wc -l"; "-g G" = "| grep --ignore-case"; - bat = "upower -i /org/freedesktop/UPower/devices/battery_BAT0"; ff = "find . -type f -iname"; - l = "eza --group-directories-first -l -g"; - ll = "eza --group-directories-first -l -g"; - la = "eza --group-directories-first -l -g -a"; + l = "lsd -lh --group-directories-first"; + ll = "lsd -lh --group-directories-first"; + la = "lsd -lah --group-directories-first"; + + # bat = "upower -i /org/freedesktop/UPower/devices/battery_BAT0"; + # autofanspeed = "echo level auto | sudo tee /proc/acpi/ibm/fan"; + # maxfanspeed = "echo level full-speed | sudo tee /proc/acpi/ibm/fan"; }; }; diff --git a/flake.lock b/flake.lock index dd96aad..a954078 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1727734424, - "narHash": "sha256-COHPdJb8goIemave9L8kBKkQKEPHuilXZqR3nIBcQsM=", + "lastModified": 1728001451, + "narHash": "sha256-Ost5YHSZZE4ZIKBcWsXC1c7g7n3kIqaNNjs5ula/lAI=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "fed2d39a7c4614311e25a4281d056a7a2d36a6c8", + "rev": "25f420d9cf70929455ba14642b92ae715ae8d792", "type": "github" }, "original": { @@ -32,11 +32,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1727591515, - "narHash": "sha256-ar9oGR8kT3S5K3b0EJrcZp1LjfYQdzWl/bBLCp2o50Y=", + "lastModified": 1727937235, + "narHash": "sha256-Ih4RD65WZZDgtla9Uh8zm6gQJ1zgkXkiU4HKtEwQjvI=", "owner": "nix-community", "repo": "fenix", - "rev": "c31647aab5e8a16087da6283ef9b2e6a9aae6772", + "rev": "381781f96b880c2ced9019a9e2406b31ccea82b4", "type": "github" }, "original": { @@ -105,11 +105,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": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1727817100, - "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", + "lastModified": 1728041527, + "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", "owner": "nix-community", "repo": "home-manager", - "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", + "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", "type": "github" }, "original": { @@ -148,11 +148,11 @@ ] }, "locked": { - "lastModified": 1727453186, - "narHash": "sha256-nZRCfVEZ9osWXsCD0xCpU66M8JkabMTukBzPRrD/CTA=", + "lastModified": 1727865565, + "narHash": "sha256-SBcqfosxb0XlKdIz6QGXCnK4W/TEVHLDZHkRHZ8Me60=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "3390ff2632d0d8a14c92473db60fa52bf881f979", + "rev": "703c0ac8432f3758987e0788248ddc1a8e0bf412", "type": "github" }, "original": { @@ -161,6 +161,27 @@ "type": "github" } }, + "kwin-effects-forceblur": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils" + }, + "locked": { + "lastModified": 1727168404, + "narHash": "sha256-4fnKw1n9lwes6QGQY8QU1NVXaOFvR1UH+G1T114WURo=", + "owner": "taj-ny", + "repo": "kwin-effects-forceblur", + "rev": "4ca19d2e60cf69c3a876c7c378aeda25bbeb134c", + "type": "github" + }, + "original": { + "owner": "taj-ny", + "repo": "kwin-effects-forceblur", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -186,11 +207,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727665282, - "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=", + "lastModified": 1728056216, + "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5", + "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28", "type": "github" }, "original": { @@ -202,11 +223,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727634051, - "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { @@ -234,11 +255,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1727634051, - "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -253,6 +274,7 @@ "chaotic": "chaotic", "fw-fanctrl": "fw-fanctrl", "home-manager": "home-manager_2", + "kwin-effects-forceblur": "kwin-effects-forceblur", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "sops-nix": "sops-nix" @@ -261,11 +283,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1727465975, - "narHash": "sha256-jrr8r2CT9jsi6XDTTX+E39/CakTcQ9RYRp6rWGzLkk0=", + "lastModified": 1727778987, + "narHash": "sha256-OTI1eKQ3WIkj6q8PROpPY1vhaxYRdiS1btSfBowQPps=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "546339a7be357b3e95fc4b79a8816dce540d477b", + "rev": "e1a76671af2fbc74c84c18ba18fcda5e653d7531", "type": "github" }, "original": { @@ -295,6 +317,39 @@ "repo": "sops-nix", "type": "github" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 62bd5ac..62b205b 100644 --- a/flake.nix +++ b/flake.nix @@ -6,11 +6,15 @@ nixos-hardware.url = "github:nixos/nixos-hardware/master"; chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; - sops-nix = - { - url = "github:mic92/sops-nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + sops-nix = { + url = "github:mic92/sops-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + kwin-effects-forceblur = { + url = "github:taj-ny/kwin-effects-forceblur"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Home manager home-manager = { @@ -31,7 +35,7 @@ , home-manager , nixos-hardware , nixpkgs - # , nixpkgs-unstable + # , nixpkgs-unstable , sops-nix , ... } @ inputs: diff --git a/machine/desktop/configuration.nix b/machine/desktop/configuration.nix index 6578c5f..d9fe4c2 100755 --- a/machine/desktop/configuration.nix +++ b/machine/desktop/configuration.nix @@ -67,8 +67,9 @@ in }; kernelPackages = pkgs.linuxPackages_cachyos; -# extraModulePackages = with pkgs.linuxPackages_cachyos; [ it87 ]; + # extraModulePackages = with pkgs.linuxPackages_cachyos; [ it87 ]; kernelModules = [ "nct6775" ]; + # kernelParams = [ "clearcpuid=514" ]; # kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" ]; }; @@ -89,6 +90,7 @@ in time.timeZone = "Europe/Berlin"; environment.systemPackages = with pkgs; [ + inputs.kwin-effects-forceblur.packages.${pkgs.system}.default lact amdgpu_top @@ -102,9 +104,18 @@ in clinfo -# fan2go + gparted -# unigine-superposition + mission-center + resources + + # monitorets + + stressapptest + + qdiskinfo + # fan2go + # unigine-superposition ]; hardware = { @@ -142,19 +153,17 @@ in coolercontrol.enable = true; corectrl = { enable = true; - # gpuOverclock.ppfeaturemask gpuOverclock.enable = true; }; }; - services = { power-profiles-daemon.enable = true; netdata.enable = true; printing.enable = true; fwupd.enable = true; - xserver.videoDrivers = [ "amdgpu" ]; + # xserver.videoDrivers = [ "amdgpu" ]; pipewire = { enable = true;