Tsting

.forgejo/workflows/update-flake-lock.yml

@@ -4,8 +4,6 @@ on:
   workflow_dispatch:  # allows manual triggering
   schedule:
     - cron: '0 0 * * 0'  # runs weekly on Sunday at 00:00
-env:
-  FORGEJO_TOKEN: ${{ secrets.GLOBAL_FORGEJO_TOKEN }}
 jobs:
   lockfile:
     runs-on: docker
@@ -15,19 +13,19 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          token: ${{ env.FORGEJO_TOKEN }}
+          token: ${{ secrets.GLOBAL_FORGEJO_TOKEN }}
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          token: ${{ env.FORGEJO_TOKEN }}
+          token: ${{ secrets.GLOBAL_FORGEJO_TOKEN }}
       - name: Install Nix
         uses: actions/nix-installer-action@main
         with:
-          token: ${{ env.FORGEJO_TOKEN }}
+          token: ${{ secrets.GLOBAL_FORGEJO_TOKEN }}
       - name: Update flake.lock
         uses: actions/update-flake-lock@main
         with:
-          token: ${{ env.FORGEJO_TOKEN }}
+          token: ${{ secrets.GLOBAL_FORGEJO_TOKEN }}
           pr-title: "Update flake.lock"
           pr-labels: |
             dependencies
@@ -36,7 +34,7 @@ jobs:
       - uses: actions/gotify-action@master
         if: always()
         with:
-          token: ${{ env.FORGEJO_TOKEN }}
+          token: ${{ secrets.GLOBAL_FORGEJO_TOKEN }}
           gotify_api_base: ${{ secrets.GOTIFY_URL }}
           gotify_app_token: ${{ secrets.GOTIFY_TOKEN }}
           notification_title: |

nixos/hosts/framework16/default.nix

@@ -1,4 +1,4 @@
-{ inputs, config, lib, pkgs, modulesPath, ... }: {
+{ hostname, inputs, config, lib, pkgs, modulesPath, ... }: {
   imports = [ 
     inputs.nixos-hardware.nixosModules.framework-16-7040-amd
     (modulesPath + "/installer/scan/not-detected.nix")
@@ -7,7 +7,8 @@
     ../../common/services/tailscale-autoconnect.nix
     ../../common/modules/secureboot.nix
     ../../common/modules/udev-rules.nix
-    # ../../common/modules/yubikey-auth.nix
+    ../../common/services/fwupd.nix
+    ../../common/modules/yubikey-auth.nix
     ../../common/modules/builder.nix
     ../../common/services/podman.nix
     ../../common/services/geoclue.nix
@@ -17,50 +18,41 @@
   ];
 
   nixpkgs.config.rocmSupport = true;
-  services.tabby.acceleration = "rocm";
-  services.ollama.acceleration = "rocm";
  
   # https://wiki.nixos.org/wiki/Ollama
   services.ollama = {
     package = pkgs.ollama-rocm; 
+    acceleration = "rocm";
     rocmOverrideGfx = "11.0.2";
-    environmentVariables.HCC_AMDGPU_TARGET = "gfx1102";   
+    environmentVariables.HCC_AMDGPU_TARGET = "gfx1102"; 
   };
 
-
-  # FIX:  One of these commented entries is causing stuttering issues.
+  # NOTE:  One of these commented entries is causing stuttering issues.
   #       Now that I commented them all out my laptop is performing great.  I might just leave it...
-  # hardware.bluetooth.enable = true; # enables support for Bluetooth
-  # hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
   # boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "uas" "sd_mod" ];
   # boot.initrd.kernelModules = [ ];
   # boot.kernelModules = [ "kvm-amd" ];
   # boot.extraModulePackages = [ ];
-  # boot.kernelParams = [ 
-  #   "boot.shell_on_fail" 
-  #   "amdgpu.abmlevel=0" # Prevents screen washout on power-save modes
-  # ];
   # boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-  services.fwupd.enable = true;
+
+  # FIX:  Pretty sure this is the line that's causing it....
+  # boot.kernelPackages = pkgs.linuxPackages_latest;
+  
+  boot.kernelParams = [ 
+    "boot.shell_on_fail" 
+    "amdgpu.abmlevel=0" # Prevents screen washout on power-save modes
+  ];
 
   networking.useDHCP = lib.mkDefault true;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
-  hardware.keyboard.zsa.enable = true;
-  hardware.cpu.amd.updateMicrocode =  lib.mkDefault config.hardware.enableRedistributableFirmware;
-  # Set your time zone.
-  # This is now handled by GeoClue 
-  # time.timeZone = "Europe/Warsaw";
-
-
-  # Set the networking hostname:
-  networking.hostName = "framework16";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
+  networking.hostName = hostname;
   hardware = {
+    keyboard.zsa.enable = true; 
+    cpu.amd.updateMicrocode =  lib.mkDefault config.hardware.enableRedistributableFirmware;
     graphics.enable = true;
     amdgpu.opencl.enable = true;
   };
 
-
   programs.gamemode = {
     enable = true;
     enableRenice = true;
@@ -84,8 +76,6 @@
   environment.systemPackages = with pkgs; [ 
     inputs.deploy-rs.packages.${system}.deploy-rs
     framework-tool
-    # Game related things
-    gamemode
     # WINE
     wineWowPackages.stable
     winetricks