From 3161bd9b79be22bfb18a899da57276c550c01143 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Thu, 2 Oct 2025 10:32:57 -0400 Subject: [PATCH 01/27] Remove KDE, add Hyprland ...attempt 1 --- hosts/default/configuration.nix | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 1877c8c..e162e53 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -135,10 +135,21 @@ in # services.xserver.enable = true; # Enable the KDE Plasma Desktop Environment. - services.displayManager.sddm.enable = true; - services.displayManager.sddm.wayland.enable = true; - services.desktopManager.plasma6.enable = true; + #services.displayManager.sddm.enable = true; + #services.displayManager.sddm.wayland.enable = true; + #services.desktopManager.plasma6.enable = true; + programs.hyprland = { + enable = true; + xwayland.enable = true; + withUWSM = true; + }; + # Optional, hint electron apps to use wayland: + environment.sessionVariables.NIXOS_OZONE_WL = "1"; + xdg.portal = { + enable = true; + extraPortals = with pkgs; [ xdg-desktop-portal-hyprland ]; + }; # Configure keymap in X11 (presumably, XWayland uses something different?) #services.xserver.xkb = { # layout = "us"; @@ -236,6 +247,13 @@ in # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ + hyprlock # Hyprland's GPU-accelerated screen locking utility. + hypridle # Hyprland's idle daemon. + hyprpaper # Hyprland's wallpaper utility. + hyprsunset # Application to enable a blue-light filter on Hyprland. + hyprpicker # Wayland color picker that does not suck. + hyprpolkitagent # Polkit authentication agent written in QT/QML. + kitty # default terminal for hyprland dnsmasq # temporarily allowed for connection sharing ansible # automation/software-defined-configuration tool binutils # gnu bin utils From 613874d76c551c3c3bfdde12b33f61a118748f01 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Sat, 4 Oct 2025 11:39:45 -0400 Subject: [PATCH 02/27] Attempt to improve I225-V (ethernet) performance --- 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 1877c8c..d8e3f8d 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -68,7 +68,7 @@ in boot.kernelModules = [ "kvm-amd" "nct6775" ]; # Fix problems with hanging on RX6700 (disables PSR - Panel Self Refresh) - boot.kernelParams = [ "amdgpu.dcdebugmask=0x10" ]; + boot.kernelParams = [ "amdgpu.dcdebugmask=0x10 pcie_port_pm=off pcie_aspm.policy=performance" ]; boot.extraModulePackages = [ (amdgpu-kernel-module.overrideAttrs (_: { From e98ac1a5e16d9db3c982c520c4a1e65098a2bb14 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Sat, 4 Oct 2025 11:39:52 -0400 Subject: [PATCH 03/27] Add go lang --- hosts/default/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index d8e3f8d..3467c83 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -311,6 +311,7 @@ in gimp # GIMP image manipulation proggy zed-editor # the most hopeful replacement for vscode...if I never learn nvim noisetorch # noise/background filter for mic + go # golang - general purpose programming ]; programs.zsh.enable = true; programs.git = { From 1a9bbf35ce4622b891dec925e88dec09ca967c8b Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Sat, 4 Oct 2025 11:40:06 -0400 Subject: [PATCH 04/27] Just overwrite any vr files --- hosts/default/home.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hosts/default/home.nix b/hosts/default/home.nix index 0daa07c..28e2116 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -73,7 +73,10 @@ # EDITOR = "emacs"; }; # For Monado: - xdg.configFile."openxr/1/active_runtime.json".source = "${pkgs.monado}/share/openxr/1/openxr_monado.json"; + xdg.configFile."openxr/1/active_runtime.json" = { + source = "${pkgs.monado}/share/openxr/1/openxr_monado.json"; + force = true + }; # For WiVRn: #xdg.configFile."openxr/1/active_runtime.json".source = "${pkgs.wivrn}/share/openxr/1/openxr_wivrn.json"; From 00afa1c95fdf1a29cd48118c33f181661d5793d9 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Sat, 4 Oct 2025 11:41:20 -0400 Subject: [PATCH 05/27] ...I like to add semi-colons, but only when they're not needed, it seems --- hosts/default/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/default/home.nix b/hosts/default/home.nix index 28e2116..da29966 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -75,7 +75,7 @@ # For Monado: xdg.configFile."openxr/1/active_runtime.json" = { source = "${pkgs.monado}/share/openxr/1/openxr_monado.json"; - force = true + force = true; }; # For WiVRn: From 02cd8d9d3ac0b90f0bd3f1941510e4a4acd5e0f4 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Sat, 4 Oct 2025 11:43:06 -0400 Subject: [PATCH 06/27] Guess you have to wrap each param for kernelParams --- 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 3467c83..1a62cfa 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -68,7 +68,7 @@ in boot.kernelModules = [ "kvm-amd" "nct6775" ]; # Fix problems with hanging on RX6700 (disables PSR - Panel Self Refresh) - boot.kernelParams = [ "amdgpu.dcdebugmask=0x10 pcie_port_pm=off pcie_aspm.policy=performance" ]; + boot.kernelParams = [ "amdgpu.dcdebugmask=0x10" "pcie_port_pm=off" "pcie_aspm.policy=performance" ]; boot.extraModulePackages = [ (amdgpu-kernel-module.overrideAttrs (_: { From 38ad3ca02a8a596a0572cad3010d45b956b0a75d Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Wed, 8 Oct 2025 23:20:00 -0400 Subject: [PATCH 07/27] Testing pipeline stuff --- .forgejo/workflows/test.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .forgejo/workflows/test.yml diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml new file mode 100644 index 0000000..d7d0dd4 --- /dev/null +++ b/.forgejo/workflows/test.yml @@ -0,0 +1,27 @@ +on: + workflow_dispatch: + +jobs: + build: + runs-on: docker + container: + image: git.agaric.com/agaric/deploycontainer:0.0.5 + env: + COMPOSER_IGNORE_PLATFORM_REQS: 1 + COMPOSER_ARGS: "install --no-dev --no-progress --no-interaction --no-scripts --optimize-autoloader" + steps: + - name: checkout + uses: actions/checkout@v3 + - name: inspect environment + shell: "bash --noprofile --norc -exo pipefail {0}" + run: | + env + jq . - <<'EOF' + ${{ toJSON(github) }} + EOF + jq . - <<'EOF' + ${{ toJSON(forge) }} + EOF + jq . - <<'EOF' + ${{ toJSON(secrets) }} + EOF From 16048d0c689d4bfa38982ee5da5c2db8d3b2fa37 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Tue, 14 Oct 2025 13:44:58 -0400 Subject: [PATCH 08/27] Add a couple utilities: dos2unix + freerdp client --- hosts/default/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 1a62cfa..2f9bb81 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -236,6 +236,8 @@ in # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ + freerdp # connect to KDE remotely w/RDP instead (KDE 6.1 servers)...seems it's still an xwindows client that's most tested. 🤮 + dos2unix # convert file line endings dnsmasq # temporarily allowed for connection sharing ansible # automation/software-defined-configuration tool binutils # gnu bin utils From d3d95bf9306270af1ac0cf69f7812eb3ec0864ac Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Wed, 15 Oct 2025 14:54:31 -0400 Subject: [PATCH 09/27] Update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index cf47d56..b1f06f6 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1759337100, - "narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=", + "lastModified": 1760462439, + "narHash": "sha256-bks3rTsKGlqehk4l7rViIg2lBnUsY6we22O+ecRZB/c=", "owner": "nix-community", "repo": "home-manager", - "rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3", + "rev": "990e5ce6791ff1f497a61280a82eb66e3789e0e9", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1760284886, + "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", "type": "github" }, "original": { From 4b43add3b9d1e5a91f78fb40809f5ee8da150f69 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Wed, 15 Oct 2025 14:55:31 -0400 Subject: [PATCH 10/27] Add h264 client ...still hasn't fixed RDP white-screen from Archie --- hosts/default/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 2f9bb81..42a8d27 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -237,6 +237,7 @@ in # $ nix search wget environment.systemPackages = with pkgs; [ freerdp # connect to KDE remotely w/RDP instead (KDE 6.1 servers)...seems it's still an xwindows client that's most tested. 🤮 + openh264 # rather, this is the client library dos2unix # convert file line endings dnsmasq # temporarily allowed for connection sharing ansible # automation/software-defined-configuration tool From 3f3eef5f281c0592080c7f21592bf6f120e2a42f Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Wed, 15 Oct 2025 14:56:09 -0400 Subject: [PATCH 11/27] Replace deprecated AMDVLK Defaults to RADV --- hosts/default/configuration.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 42a8d27..564b37c 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -384,7 +384,7 @@ in #services.rustdesk-server.openFirewall = false; # RX 6700 XT setup hardware.graphics.extraPackages = [ - pkgs.amdvlk + #pkgs.amdvlk - replaced by RADV (enabled by default) pkgs.libcap pkgs.libva pkgs.mesa @@ -398,11 +398,13 @@ in #pkgs.rocmPackages.rocm-device-libs #pkgs.rocmPackages.rpp ]; + hardware.graphics.enable = true; + hardware.graphics.enable32Bit = true; # To enable Vulkan support for 32-bit applications, also add: - hardware.graphics.extraPackages32 = [ - pkgs.driversi686Linux.amdvlk - ]; + #hardware.graphics.extraPackages32 = [ + # pkgs.driversi686Linux.amdvlk - replaced by RADV..hopefully also 32-bit enabled by default. + #]; hardware.amdgpu.opencl.enable = true; From b032bbfabb2b18b10682a99d6a5a02198973dd8c Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Wed, 15 Oct 2025 14:56:46 -0400 Subject: [PATCH 12/27] Fix current issues compiling hipblaslt ...disables GPU acceleration, but better than running out of ram when it fails to build --- hosts/default/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 564b37c..4328e00 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -388,7 +388,7 @@ in pkgs.libcap pkgs.libva pkgs.mesa - pkgs.rocmPackages.clr.icd + #pkgs.rocmPackages.clr.icd ...no idea if this is causing the rocm-related build fail. #pkgs.pcre2 #pkgs.libselinux #pkgs.rocmPackages.rocblas @@ -410,7 +410,7 @@ in services.ollama = { enable = true; - acceleration = "rocm"; + #acceleration = "rocm"; hipblaslt not compiling at present environmentVariables = { HCC_AMDGPU_TARGET = "gfx1031"; # used to be necessary, but doesn't seem to anymore OLLAMA_LOAD_TIMEOUT = "2m"; # Reduce load timeout (from 5 min)...if it's that big, forget it. From 352ce6b38a48dafd832e3e767cecca3acdf20d1c Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Wed, 15 Oct 2025 18:21:17 -0400 Subject: [PATCH 13/27] Test what inputs looks like when running via push --- .forgejo/workflows/test.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index d7d0dd4..15cab11 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -1,5 +1,13 @@ on: + push: + paths: + - '**/test.yml' workflow_dispatch: + inputs: + boolean: + description: 'Boolean' + required: true + type: boolean jobs: build: @@ -25,3 +33,6 @@ jobs: jq . - <<'EOF' ${{ toJSON(secrets) }} EOF + jq . - <<'EOF' + ${{ toJSON(inputs) }} + EOF From 7454f7a48e50d98f0e347f43eca327d5e8c4dee4 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Wed, 15 Oct 2025 18:21:45 -0400 Subject: [PATCH 14/27] Update flake.lock Still doesn't build w/rocm accel (but does w/out) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b1f06f6..ab16d33 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1760462439, - "narHash": "sha256-bks3rTsKGlqehk4l7rViIg2lBnUsY6we22O+ecRZB/c=", + "lastModified": 1760500983, + "narHash": "sha256-zfY4F4CpeUjTGgecIJZ+M7vFpwLc0Gm9epM/iMQd4w8=", "owner": "nix-community", "repo": "home-manager", - "rev": "990e5ce6791ff1f497a61280a82eb66e3789e0e9", + "rev": "c53e65ec92f38d30e3c14f8d628ab55d462947aa", "type": "github" }, "original": { From c83fa1200495a621f62bd96ecdd51b637aa85821 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Wed, 15 Oct 2025 18:24:46 -0400 Subject: [PATCH 15/27] Add vars check/and if expression --- .forgejo/workflows/test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 15cab11..1880952 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -12,6 +12,7 @@ on: jobs: build: runs-on: docker + if: inputs.boolean or vars.RUN_DEFAULT == "1" container: image: git.agaric.com/agaric/deploycontainer:0.0.5 env: @@ -36,3 +37,6 @@ jobs: jq . - <<'EOF' ${{ toJSON(inputs) }} EOF + jq . - <<'EOF' + ${{ toJSON(vars) }} + EOF From c9288b7f4d6f98f3fab323f250ab48bc90c53e09 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Wed, 15 Oct 2025 18:27:53 -0400 Subject: [PATCH 16/27] Use || instead of 'or' --- .forgejo/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 1880952..d9aa6d4 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -12,7 +12,7 @@ on: jobs: build: runs-on: docker - if: inputs.boolean or vars.RUN_DEFAULT == "1" + if: inputs.boolean || vars.RUN_DEFAULT == "1" container: image: git.agaric.com/agaric/deploycontainer:0.0.5 env: From a869609a3ae05edb9c7ed7197497d17ba8c6e810 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Wed, 15 Oct 2025 18:28:41 -0400 Subject: [PATCH 17/27] hrm...try single quotes --- .forgejo/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index d9aa6d4..d2f6568 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -12,7 +12,7 @@ on: jobs: build: runs-on: docker - if: inputs.boolean || vars.RUN_DEFAULT == "1" + if: inputs.boolean || vars.RUN_DEFAULT == '1' container: image: git.agaric.com/agaric/deploycontainer:0.0.5 env: From 2680e194f9b3aa683fbd0291c949f89e1db4a9ba Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Wed, 15 Oct 2025 19:12:45 -0400 Subject: [PATCH 18/27] Test secrets in jinja template --- .forgejo/workflows/test.yml | 5 +++++ testing.template | 1 + 2 files changed, 6 insertions(+) create mode 100644 testing.template diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index d2f6568..b9f8f9d 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -21,6 +21,10 @@ jobs: steps: - name: checkout uses: actions/checkout@v3 + - uses: release-engineers/action-template@v2 + with: + source: 'testing.template' + target: 'testing.md' - name: inspect environment shell: "bash --noprofile --norc -exo pipefail {0}" run: | @@ -40,3 +44,4 @@ jobs: jq . - <<'EOF' ${{ toJSON(vars) }} EOF + cat testing.md diff --git a/testing.template b/testing.template new file mode 100644 index 0000000..a8d4b78 --- /dev/null +++ b/testing.template @@ -0,0 +1 @@ +{{ secrets.SHHH }} From 3542329bf78f9e6db5a763cb63c505539f3664c7 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Wed, 15 Oct 2025 19:13:50 -0400 Subject: [PATCH 19/27] Use full url for things not on forgejo --- .forgejo/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index b9f8f9d..7cd2a1a 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -21,7 +21,7 @@ jobs: steps: - name: checkout uses: actions/checkout@v3 - - uses: release-engineers/action-template@v2 + - uses: https://github.com/release-engineers/action-template@v2 with: source: 'testing.template' target: 'testing.md' From 8fdcb807b4d60b8c5823d52c5c4d0ac9d064ae40 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Wed, 15 Oct 2025 20:07:32 -0400 Subject: [PATCH 20/27] Try gomplate --- .forgejo/workflows/test.yml | 8 +++++--- testing.template | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 7cd2a1a..0cb9f4c 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -18,13 +18,15 @@ jobs: env: COMPOSER_IGNORE_PLATFORM_REQS: 1 COMPOSER_ARGS: "install --no-dev --no-progress --no-interaction --no-scripts --optimize-autoloader" + SHHH: {{secrets.SHHH}} steps: - name: checkout uses: actions/checkout@v3 - - uses: https://github.com/release-engineers/action-template@v2 + - name: Run Gomplate Action + uses: https://github.com/ammarlakis/action-gomplate@v1 with: - source: 'testing.template' - target: 'testing.md' + input_file: 'testing.template' + output_file: 'testing.md' - name: inspect environment shell: "bash --noprofile --norc -exo pipefail {0}" run: | diff --git a/testing.template b/testing.template index a8d4b78..8e0b0cb 100644 --- a/testing.template +++ b/testing.template @@ -1 +1,2 @@ {{ secrets.SHHH }} +{{ .Env.SHHH }} From e5ffd8fa9787c0d2191c95459e44bef970644884 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Wed, 15 Oct 2025 20:09:06 -0400 Subject: [PATCH 21/27] Quotes? --- .forgejo/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 0cb9f4c..cab1ae0 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -18,7 +18,7 @@ jobs: env: COMPOSER_IGNORE_PLATFORM_REQS: 1 COMPOSER_ARGS: "install --no-dev --no-progress --no-interaction --no-scripts --optimize-autoloader" - SHHH: {{secrets.SHHH}} + SHHH: "{{secrets.SHHH}}" steps: - name: checkout uses: actions/checkout@v3 From b2dabec02afa2abe039e3948936d3738ac1b6650 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Wed, 15 Oct 2025 20:09:54 -0400 Subject: [PATCH 22/27] Couldn't access secrets...no surprise, really --- testing.template | 1 - 1 file changed, 1 deletion(-) diff --git a/testing.template b/testing.template index 8e0b0cb..192472f 100644 --- a/testing.template +++ b/testing.template @@ -1,2 +1 @@ -{{ secrets.SHHH }} {{ .Env.SHHH }} From 18cbefbcbcf4771dd87cd3bdc97b5b76073f0c11 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Wed, 15 Oct 2025 20:11:49 -0400 Subject: [PATCH 23/27] 'remember' how to do a secret --- .forgejo/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index cab1ae0..32a5013 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -18,7 +18,7 @@ jobs: env: COMPOSER_IGNORE_PLATFORM_REQS: 1 COMPOSER_ARGS: "install --no-dev --no-progress --no-interaction --no-scripts --optimize-autoloader" - SHHH: "{{secrets.SHHH}}" + SHHH: "${{ secrets.SHHH }}" steps: - name: checkout uses: actions/checkout@v3 From 7905d11c86a0d2ac59d23e4d2cdd461045721246 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Fri, 24 Oct 2025 23:24:20 -0400 Subject: [PATCH 24/27] Update flake.lock Note: this version seems to have some KDE issues (see next commit w/commented failures) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index ab16d33..de7a02e 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1760500983, - "narHash": "sha256-zfY4F4CpeUjTGgecIJZ+M7vFpwLc0Gm9epM/iMQd4w8=", + "lastModified": 1761344779, + "narHash": "sha256-6LNSptFYhiAd0M/maJoixJw7V0Kp5BSoMRtIahcfu3M=", "owner": "nix-community", "repo": "home-manager", - "rev": "c53e65ec92f38d30e3c14f8d628ab55d462947aa", + "rev": "c644cb018f9fdec55f5ac2afb4713a8c7beb757c", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760284886, - "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", + "lastModified": 1761114652, + "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", + "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", "type": "github" }, "original": { From 3f9e75d9d467a1654ba743a8ed5446bc28785b14 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Fri, 24 Oct 2025 23:24:57 -0400 Subject: [PATCH 25/27] TEMPORARY: comment failing builds --- hosts/default/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 4328e00..270b63d 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -265,7 +265,7 @@ in amdgpu_top # top-like monitor for AMD GPUs direnv # autoload .envrc files zoxide # directory navigator (z) - nextcloud-client # next cloud UI + # nextcloud-client # next cloud UI (also just fialed to build. Gah... damn KDE lib issues file # show file types tldr # cli command summary stress # system workload generator @@ -291,7 +291,7 @@ in distrobox # instant alternate OS availability pigz # muti-treaded replacement for gzip unzip # old standard zip handler - rpi-imager # rasbperry pi os burner util + # rpi-imager # rasbperry pi os burner util (1.9.6 failed build) # screenkey # broadcast key presses superfile # cli file manager mpv # movie player From c00381c4dddef725b4b7f8e855914e1ecfd9e124 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Fri, 24 Oct 2025 23:25:29 -0400 Subject: [PATCH 26/27] Give Cosmic desktop a try...finally They say it's in beta(3)! --- hosts/default/configuration.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 270b63d..8cccb56 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -135,9 +135,17 @@ in # services.xserver.enable = true; # Enable the KDE Plasma Desktop Environment. - services.displayManager.sddm.enable = true; - services.displayManager.sddm.wayland.enable = true; - services.desktopManager.plasma6.enable = true; + #services.displayManager.sddm.enable = true; + #services.displayManager.sddm.wayland.enable = true; + #services.desktopManager.plasma6.enable = true; + + # Enable the Cosmic Desktop Environment: + # Enable the login manager + services.displayManager.cosmic-greeter.enable = true; + # Enable the COSMIC DE itself + services.desktopManager.cosmic.enable = true; + # Enable XWayland support in COSMIC + services.desktopManager.cosmic.xwayland.enable = true; # Configure keymap in X11 (presumably, XWayland uses something different?) #services.xserver.xkb = { From 424ab17f6887907c1fec97265eefd6802b6fac2c Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Fri, 24 Oct 2025 23:27:41 -0400 Subject: [PATCH 27/27] Re-enable rocm...turns out it wasn't just hipblaslt, but also aortriton https://github.com/NixOS/nixpkgs/issues/453992 --- 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 8cccb56..eea65c3 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -418,7 +418,7 @@ in services.ollama = { enable = true; - #acceleration = "rocm"; hipblaslt not compiling at present + acceleration = "rocm"; # hipblaslt not compiling at present environmentVariables = { HCC_AMDGPU_TARGET = "gfx1031"; # used to be necessary, but doesn't seem to anymore OLLAMA_LOAD_TIMEOUT = "2m"; # Reduce load timeout (from 5 min)...if it's that big, forget it.