From 7de1caa0e79fdddadaf3cfab3bc3297081329433 Mon Sep 17 00:00:00 2001 From: Chris Thompson Date: Wed, 22 Jan 2025 11:43:21 -0500 Subject: [PATCH 1/8] Flake update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index d49fafe..329231f 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1736089250, - "narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", + "lastModified": 1736785676, + "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", "owner": "nix-community", "repo": "home-manager", - "rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", + "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1736798957, + "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", "type": "github" }, "original": { From 3a7cc6fff74703b7742ad4396e7cc37f0dcbbe93 Mon Sep 17 00:00:00 2001 From: Chris Thompson Date: Wed, 22 Jan 2025 11:43:48 -0500 Subject: [PATCH 2/8] Add bluetooth --- hosts/default/configuration.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 3a7a6f2..13495f5 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -109,6 +109,10 @@ # variant = ""; #}; + # Enable bluetooth + hardware.bluetooth.enable = true; # enables support for Bluetooth + #hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot + # Enable CUPS to print documents. # ...no. Recent security issues, prefer disabled # apps like e.g. LibreOffice can still generate pdf's (e.g. to stand in [generally] for Print to pdf) From 7bdc9150f56c673a507fde8034f6a333c3e0050a Mon Sep 17 00:00:00 2001 From: Chris Thompson Date: Wed, 22 Jan 2025 11:44:18 -0500 Subject: [PATCH 3/8] Add mpv and protonup-qt --- hosts/default/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 13495f5..3567698 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -221,7 +221,9 @@ rpi-imager # rasbperry pi os burner util screenkey # broadcast key presses superfile # cli file manager + mpv # movie player #obs-studio # open broadcast studio + protonup-qt # proton version installer ]; programs.zsh.enable = true; programs.git = { From bd6b2e282b3fefc650218ad402301fc6d577b76a Mon Sep 17 00:00:00 2001 From: Chris Thompson Date: Wed, 22 Jan 2025 11:53:40 -0500 Subject: [PATCH 4/8] Update flake --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 329231f..d55cf14 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1736785676, - "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", + "lastModified": 1737480538, + "narHash": "sha256-rk/cmrvq3In0TegW9qaAxw+5YpJhRWt2p74/6JStrw0=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", + "rev": "4481a16d1ac5bff4a77c608cefe08c9b9efe840d", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736798957, - "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", + "lastModified": 1737469691, + "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", + "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", "type": "github" }, "original": { From e5cb49c43fa803069163663a7b648e29f88d318f Mon Sep 17 00:00:00 2001 From: Chris Thompson Date: Wed, 22 Jan 2025 11:53:51 -0500 Subject: [PATCH 5/8] Change target ISA for ollama --- hosts/default/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 3567698..e048d6f 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -306,7 +306,7 @@ environmentVariables = { HCC_AMDGPU_TARGET = "gfx1031"; # used to be necessary, but doesn't seem to anymore }; - rocmOverrideGfx = "10.3.1"; + rocmOverrideGfx = "10.3.0"; }; system.activationScripts = { script.text = '' From 12f52dab74dfcd95c93834ad4e3ab6e8f9074e14 Mon Sep 17 00:00:00 2001 From: Chris Thompson Date: Thu, 23 Jan 2025 11:26:21 -0500 Subject: [PATCH 6/8] Current working config - w/firewall back open for debugging and some CL/video changes --- flake.lock | 12 ++++++------ hosts/default/configuration.nix | 26 +++++++++++++++++++++++--- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index d55cf14..d49fafe 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1737480538, - "narHash": "sha256-rk/cmrvq3In0TegW9qaAxw+5YpJhRWt2p74/6JStrw0=", + "lastModified": 1736089250, + "narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", "owner": "nix-community", "repo": "home-manager", - "rev": "4481a16d1ac5bff4a77c608cefe08c9b9efe840d", + "rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737469691, - "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index e048d6f..766af10 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -36,10 +36,16 @@ # { device = "/dev/disk/by-uuid/xxxx"; # fsType = "etx4"; # }; + boot.initrd.luks.devices."nvme2n1p2_oldcrypt".device = "/dev/disk/by-uuid/44235dca-99e8-4ea8-9516-97d9f5a2d702"; + + # Temporarily pin to 6.12 to fix llvm/rocm build + # https://github.com/NixOS/nixpkgs/issues/368672#issuecomment-2608697421 + # boot.kernelPackages = pkgs.linuxPackages_6_12; + boot.kernelModules = [ "kvm-amd" "nct6775" ]; - # Direct patching for enabling for async reprojection (steamvr) + # Direct patching for enabling for async reprojection (steamvr) on AMD boot.kernelPatches = [ { name = "amdgpu-ignore-ctx-privileges"; @@ -167,7 +173,7 @@ # For xdebug...verify actual necessity # Have had to use this, but I think it can be disabled still - perhaps w/xdebug binding setting...don't know. - #networking.firewall.allowedTCPPorts = [ 9003 ]; + networking.firewall.allowedTCPPorts = [ 9003 ]; # Allow unfree packages nixpkgs.config.allowUnfree = true; @@ -292,14 +298,28 @@ # RX 6700 XT setup hardware.graphics.extraPackages = [ - pkgs.rocmPackages.clr.icd pkgs.amdvlk + pkgs.libcap pkgs.libva + pkgs.mesa + pkgs.rocmPackages.clr.icd + #pkgs.pcre2 + #pkgs.libselinux + #pkgs.rocmPackages.rocblas + #pkgs.rocmPackages.rocm-smi + #pkgs.rocmPackages.rocminfo + #pkgs.rocmPackages.hipblas + #pkgs.rocmPackages.rocm-device-libs + #pkgs.rocmPackages.rpp ]; + # To enable Vulkan support for 32-bit applications, also add: hardware.graphics.extraPackages32 = [ pkgs.driversi686Linux.amdvlk ]; + + hardware.amdgpu.opencl.enable = true; + services.ollama = { enable = true; acceleration = "rocm"; From 4eb463a902bce1668ab8494a765f718866063bea Mon Sep 17 00:00:00 2001 From: Chris Thompson Date: Thu, 23 Jan 2025 22:26:43 -0500 Subject: [PATCH 7/8] Correct deprecated setting --- hosts/default/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 766af10..5232c70 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -125,7 +125,7 @@ # services.printing.enable = true; # Enable sound with pipewire. - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { enable = true; From 64c1f5a2aa36f782b33c785f07b1ca1d3babbc7a Mon Sep 17 00:00:00 2001 From: Chris Thompson Date: Thu, 23 Jan 2025 22:26:50 -0500 Subject: [PATCH 8/8] Add some launchers --- hosts/default/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 5232c70..d2a3879 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -230,6 +230,8 @@ mpv # movie player #obs-studio # open broadcast studio protonup-qt # proton version installer + heroic # game launcher (GOG/Epic/Prime) + lutris # game launcher (EA/Humble/Ubi++) ]; programs.zsh.enable = true; programs.git = {