From 95eaa7840f60f029f9013f3657787f00b7395d7b Mon Sep 17 00:00:00 2001 From: Alexander Szczepanski Date: Mon, 16 Sep 2024 22:47:01 +0200 Subject: [PATCH] desktop-2024-09-16-22-47-01 --- configs/browser.nix | 12 +- configs/games.nix | 18 +-- configs/libvirt.nix | 2 +- configs/plasma-wayland.nix | 5 +- flake.lock | 137 ++++++--------------- machine/desktop/configuration.nix | 2 + machine/desktop/hardware-configuration.nix | 40 +++--- machine/framework/configuration.nix | 1 + machine/homeserver.nix | 24 ++-- 9 files changed, 96 insertions(+), 145 deletions(-) diff --git a/configs/browser.nix b/configs/browser.nix index 0b0c6f2..37cac21 100755 --- a/configs/browser.nix +++ b/configs/browser.nix @@ -1,10 +1,10 @@ { config, pkgs, lib, ... }: { - environment.systemPackages = with pkgs.unstable; [ - brave - chromium - firefox - librewolf - tor-browser-bundle-bin + environment.systemPackages = [ + pkgs.brave + # pkgs.unstable.chromium + pkgs.unstable.firefox + pkgs.unstable.librewolf + pkgs.unstable.tor-browser-bundle-bin ]; } diff --git a/configs/games.nix b/configs/games.nix index 263f8b6..b26d027 100755 --- a/configs/games.nix +++ b/configs/games.nix @@ -5,8 +5,8 @@ programs = { gamescope = { enable = true; - capSysNice = true; - package = pkgs.unstable.gamescope; + capSysNice = false; + package = pkgs.gamescope; }; gamemode = { @@ -16,15 +16,17 @@ steam = { enable = true; - package = pkgs.unstable.steam; + # package = pkgs.unstable.steam; extraPackages = with pkgs; [ - unstable.gamescope - unstable.mangohud + gamescope + mangohud + libkrb5 + keyutils ]; - extraCompatPackages = with pkgs; [ - proton-ge-custom - ]; + # extraCompatPackages = with pkgs; [ + # proton-ge-custom + # ]; }; }; diff --git a/configs/libvirt.nix b/configs/libvirt.nix index d876c29..c036a1f 100755 --- a/configs/libvirt.nix +++ b/configs/libvirt.nix @@ -5,7 +5,7 @@ virtualisation = { virtualbox.host ={ enable = true; - enableExtensionPack = true; + # enableExtensionPack = true; }; libvirtd = { diff --git a/configs/plasma-wayland.nix b/configs/plasma-wayland.nix index 5c97a57..18f1e7a 100755 --- a/configs/plasma-wayland.nix +++ b/configs/plasma-wayland.nix @@ -2,6 +2,9 @@ programs = { dconf.enable = true; kdeconnect.enable = true; + partition-manager.enable = true; + # package = pkgs.kdePackages.partitionmanager; + # }; }; environment = { @@ -17,7 +20,7 @@ kdePackages.ksshaskpass kdePackages.kde-gtk-config kdePackages.breeze-gtk - kdePackages.partitionmanager + # kdePackages.partitionmanager kdePackages.filelight kdePackages.plasma-disks kdePackages.kalk diff --git a/flake.lock b/flake.lock index 7228dff..b6fe1b9 100644 --- a/flake.lock +++ b/flake.lock @@ -2,21 +2,18 @@ "nodes": { "chaotic": { "inputs": { - "compare-to": "compare-to", "fenix": "fenix", "flake-schemas": "flake-schemas", "home-manager": "home-manager", "jovian": "jovian", - "nixpkgs": "nixpkgs", - "systems": "systems", - "yafas": "yafas" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1725738693, - "narHash": "sha256-nqsRStEB29KcTsMC52NdKFzd0PSudQHY6w6oRrNyLCM=", + "lastModified": 1726434563, + "narHash": "sha256-RtcOyhSkgGnrPQ/0xCcsbpgo+AZR81fjtR1wj5qXqYU=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "38451822a144faa53a7ee96d4f0478d94945b67a", + "rev": "93e6cdc6335d9c7652e89466b5e05a3cce836906", "type": "github" }, "original": { @@ -26,20 +23,6 @@ "type": "github" } }, - "compare-to": { - "locked": { - "lastModified": 1695341185, - "narHash": "sha256-htO6DSbWyCgaDkxi7foPjXwJFPzGjVt3RRUbPSpNtZY=", - "rev": "98b8e330823a3570d328720f87a1153f8a7f2224", - "revCount": 2, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nix-empty-flake/0.1.2%2Brev-98b8e330823a3570d328720f87a1153f8a7f2224/018aba35-d228-7fa9-b205-7616c89ef4e0/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz" - } - }, "fenix": { "inputs": { "nixpkgs": [ @@ -49,11 +32,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1725690497, - "narHash": "sha256-5fT+96rV7Hx29HG+4/oBbr3V+yExKuLN2vcBcPbVBlU=", + "lastModified": 1726230467, + "narHash": "sha256-YyMNF7IFyysZ2KeqEO6AmV3nQeaDSxyNXLdHp1ghO60=", "owner": "nix-community", "repo": "fenix", - "rev": "4b8d964df93d1f918ee6c4f003b3548c432cc866", + "rev": "43efa7a3a97f290441bd75b18defcd4f7b8df220", "type": "github" }, "original": { @@ -80,16 +63,16 @@ }, "flake-schemas": { "locked": { - "lastModified": 1693491534, - "narHash": "sha256-ifw8Td8kD08J8DxFbYjeIx5naHcDLz7s2IFP3X42I/U=", - "rev": "c702cbb663d6d70bbb716584a2ee3aeb35017279", - "revCount": 21, + "lastModified": 1721999734, + "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=", + "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982", + "revCount": 75, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.1/018a4c59-80e1-708a-bb4d-854930c20f72/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.1.tar.gz" + "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" } }, "fw-fanctrl": { @@ -122,11 +105,11 @@ ] }, "locked": { - "lastModified": 1725694918, - "narHash": "sha256-+HsjshXpqNiJHLaJaK0JnIicJ/a1NquKcfn4YZ3ILgg=", + "lastModified": 1726222338, + "narHash": "sha256-KuA8ciNR8qCF3dQaCaeh0JWyQUgEwkwDHr/f49Q5/e8=", "owner": "nix-community", "repo": "home-manager", - "rev": "aaebdea769a5c10f1c6e50ebdf5924c1a13f0cda", + "rev": "503af483e1b328691ea3a434d331995595fb2e3d", "type": "github" }, "original": { @@ -165,11 +148,11 @@ ] }, "locked": { - "lastModified": 1725600800, - "narHash": "sha256-wst7p3RZ9kZUNzN22d27wU8YSBB7Grlx6Q03A7boRaU=", + "lastModified": 1726115155, + "narHash": "sha256-VDylz5VX4JD4/TZv6xUJDwuvNdgLRGoOpue1dlZGdIQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "2d050e65a71e02a1f19d1a35c086bd2e3dfb2cdb", + "rev": "02cf60ce20b6034fc0459e5116cec7016aaff6e4", "type": "github" }, "original": { @@ -203,11 +186,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1725716377, - "narHash": "sha256-7NzW9O/cAw7iWzRfh7Oo/SuSudL4a1YTKS6yoh3tMck=", + "lastModified": 1726489388, + "narHash": "sha256-JBHtN+n1HzKawpnOQAz6jdgvrtYV9c/kyzgoIdguQGo=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "04a1cda0c1725094a4db703cccbb956b7558f5a6", + "rev": "dc8b0296f68f72f3fe77469c549a6f098555c2e9", "type": "github" }, "original": { @@ -219,11 +202,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "lastModified": 1726243404, + "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "type": "github" }, "original": { @@ -235,11 +218,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1721524707, - "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", + "lastModified": 1725762081, + "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171", + "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", "type": "github" }, "original": { @@ -251,11 +234,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "lastModified": 1726243404, + "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "type": "github" }, "original": { @@ -267,11 +250,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1725407940, - "narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=", + "lastModified": 1726320982, + "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3", + "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", "type": "github" }, "original": { @@ -295,11 +278,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1725630423, - "narHash": "sha256-gNCLk3Zg7JlAwmWbVHTH6f3+iqdeQ4fheOotCZy8x5M=", + "lastModified": 1725985110, + "narHash": "sha256-0HKj+JI6rtxaE6Kzcd6HyFNbEFJRsLy5DoNgVF1pyRM=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "08c7bbc2dbe4dcc8968484f1a0e1e6fe7a1d4f6d", + "rev": "bcc708992104c2059f310fbc3ac00bfc377f9ea8", "type": "github" }, "original": { @@ -317,11 +300,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1725540166, - "narHash": "sha256-htc9rsTMSAY5ek+DB3tpntdD/es0eam2hJgO92bWSys=", + "lastModified": 1726218807, + "narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=", "owner": "mic92", "repo": "sops-nix", - "rev": "d9d781523a1463965cd1e1333a306e70d9feff07", + "rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e", "type": "github" }, "original": { @@ -329,46 +312,6 @@ "repo": "sops-nix", "type": "github" } - }, - "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "yafas": { - "inputs": { - "flake-schemas": [ - "chaotic", - "flake-schemas" - ], - "systems": [ - "chaotic", - "systems" - ] - }, - "locked": { - "lastModified": 1695926485, - "narHash": "sha256-wNFFnItckgSs8XeYhhv8vlJs2WF09fSQaWgw4xkDqHQ=", - "owner": "UbiqueLambda", - "repo": "yafas", - "rev": "7772afd6686458ca0ddbc599a52cf5d337367653", - "type": "github" - }, - "original": { - "owner": "UbiqueLambda", - "repo": "yafas", - "type": "github" - } } }, "root": "root", diff --git a/machine/desktop/configuration.nix b/machine/desktop/configuration.nix index deea1a2..9cef86e 100755 --- a/machine/desktop/configuration.nix +++ b/machine/desktop/configuration.nix @@ -101,6 +101,8 @@ in snapraid mergerfs + + gimp ]; hardware = { diff --git a/machine/desktop/hardware-configuration.nix b/machine/desktop/hardware-configuration.nix index d29e4b5..ac291f4 100644 --- a/machine/desktop/hardware-configuration.nix +++ b/machine/desktop/hardware-configuration.nix @@ -1,11 +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 = - [ (modulesPath + "/installer/scan/not-detected.nix") + [ + (modulesPath + "/installer/scan/not-detected.nix") ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; @@ -13,27 +10,30 @@ boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/d43faf8e-ec90-4735-a1a4-aff6897604b2"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/d43faf8e-ec90-4735-a1a4-aff6897604b2"; + options = [ "discard" ]; + fsType = "ext4"; + }; - boot.initrd.luks.devices."luks-ba8eb308-e85f-4cee-9993-88c5ba0966ea".device = "/dev/disk/by-uuid/ba8eb308-e85f-4cee-9993-88c5ba0966ea"; + fileSystems."/mnt/data" = { + device = "/dev/disk/by-uuid/441a7d92-c3eb-4867-81c7-4e1dc3a1c54d"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/1838-7DA8"; - fsType = "vfat"; - }; + boot.initrd.luks.devices."luks-ba8eb308-e85f-4cee-9993-88c5ba0966ea" = { + device = "/dev/disk/by-uuid/ba8eb308-e85f-4cee-9993-88c5ba0966ea"; + allowDiscards = true; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/1838-7DA8"; + fsType = "vfat"; + }; swapDevices = [ ]; - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp8s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/machine/framework/configuration.nix b/machine/framework/configuration.nix index 002e648..1ad408b 100755 --- a/machine/framework/configuration.nix +++ b/machine/framework/configuration.nix @@ -112,6 +112,7 @@ in opengl = { enable = true; + driSupport = true; driSupport32Bit = true; extraPackages = with pkgs; [ intel-media-driver intel-vaapi-driver ]; }; diff --git a/machine/homeserver.nix b/machine/homeserver.nix index ac6cafe..05847c0 100755 --- a/machine/homeserver.nix +++ b/machine/homeserver.nix @@ -109,19 +109,19 @@ in { ''; }; - nixpkgs.config.packageOverrides = pkgs: { - vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; - }; + # nixpkgs.config.packageOverrides = pkgs: { + # vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; + # }; - hardware.opengl = { - enable = true; - # extraPackages = with pkgs; [ - # #intel-media-driver # LIBVA_DRIVER_NAME=iHD - # vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) - # vaapiVdpau - # libvdpau-va-gl - # ]; - }; + # hardware.opengl = { + # enable = true; + # # extraPackages = with pkgs; [ + # # #intel-media-driver # LIBVA_DRIVER_NAME=iHD + # # vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) + # # vaapiVdpau + # # libvdpau-va-gl + # # ]; + # }; services = { jellyfin = {