Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3161bd9b79 |
5 changed files with 34 additions and 83 deletions
|
|
@ -1,49 +0,0 @@
|
||||||
on:
|
|
||||||
push:
|
|
||||||
paths:
|
|
||||||
- '**/test.yml'
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
boolean:
|
|
||||||
description: 'Boolean'
|
|
||||||
required: true
|
|
||||||
type: boolean
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: docker
|
|
||||||
if: inputs.boolean || vars.RUN_DEFAULT == '1'
|
|
||||||
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"
|
|
||||||
SHHH: "${{ secrets.SHHH }}"
|
|
||||||
steps:
|
|
||||||
- name: checkout
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
- name: Run Gomplate Action
|
|
||||||
uses: https://github.com/ammarlakis/action-gomplate@v1
|
|
||||||
with:
|
|
||||||
input_file: 'testing.template'
|
|
||||||
output_file: 'testing.md'
|
|
||||||
- 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
|
|
||||||
jq . - <<'EOF'
|
|
||||||
${{ toJSON(inputs) }}
|
|
||||||
EOF
|
|
||||||
jq . - <<'EOF'
|
|
||||||
${{ toJSON(vars) }}
|
|
||||||
EOF
|
|
||||||
cat testing.md
|
|
||||||
12
flake.lock
generated
12
flake.lock
generated
|
|
@ -7,11 +7,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761344779,
|
"lastModified": 1759337100,
|
||||||
"narHash": "sha256-6LNSptFYhiAd0M/maJoixJw7V0Kp5BSoMRtIahcfu3M=",
|
"narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "c644cb018f9fdec55f5ac2afb4713a8c7beb757c",
|
"rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -22,11 +22,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761114652,
|
"lastModified": 1759036355,
|
||||||
"narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
|
"narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
|
"rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@ in
|
||||||
boot.kernelModules = [ "kvm-amd" "nct6775" ];
|
boot.kernelModules = [ "kvm-amd" "nct6775" ];
|
||||||
|
|
||||||
# Fix problems with hanging on RX6700 (disables PSR - Panel Self Refresh)
|
# 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" ];
|
||||||
|
|
||||||
boot.extraModulePackages = [
|
boot.extraModulePackages = [
|
||||||
(amdgpu-kernel-module.overrideAttrs (_: {
|
(amdgpu-kernel-module.overrideAttrs (_: {
|
||||||
|
|
@ -138,15 +138,18 @@ in
|
||||||
#services.displayManager.sddm.enable = true;
|
#services.displayManager.sddm.enable = true;
|
||||||
#services.displayManager.sddm.wayland.enable = true;
|
#services.displayManager.sddm.wayland.enable = true;
|
||||||
#services.desktopManager.plasma6.enable = true;
|
#services.desktopManager.plasma6.enable = true;
|
||||||
|
programs.hyprland = {
|
||||||
|
enable = true;
|
||||||
|
xwayland.enable = true;
|
||||||
|
withUWSM = true;
|
||||||
|
|
||||||
# Enable the Cosmic Desktop Environment:
|
};
|
||||||
# Enable the login manager
|
# Optional, hint electron apps to use wayland:
|
||||||
services.displayManager.cosmic-greeter.enable = true;
|
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
||||||
# Enable the COSMIC DE itself
|
xdg.portal = {
|
||||||
services.desktopManager.cosmic.enable = true;
|
enable = true;
|
||||||
# Enable XWayland support in COSMIC
|
extraPortals = with pkgs; [ xdg-desktop-portal-hyprland ];
|
||||||
services.desktopManager.cosmic.xwayland.enable = true;
|
};
|
||||||
|
|
||||||
# Configure keymap in X11 (presumably, XWayland uses something different?)
|
# Configure keymap in X11 (presumably, XWayland uses something different?)
|
||||||
#services.xserver.xkb = {
|
#services.xserver.xkb = {
|
||||||
# layout = "us";
|
# layout = "us";
|
||||||
|
|
@ -244,9 +247,13 @@ in
|
||||||
# List packages installed in system profile. To search, run:
|
# List packages installed in system profile. To search, run:
|
||||||
# $ nix search wget
|
# $ nix search wget
|
||||||
environment.systemPackages = with pkgs; [
|
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. 🤮
|
hyprlock # Hyprland's GPU-accelerated screen locking utility.
|
||||||
openh264 # rather, this is the client library
|
hypridle # Hyprland's idle daemon.
|
||||||
dos2unix # convert file line endings
|
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
|
dnsmasq # temporarily allowed for connection sharing
|
||||||
ansible # automation/software-defined-configuration tool
|
ansible # automation/software-defined-configuration tool
|
||||||
binutils # gnu bin utils
|
binutils # gnu bin utils
|
||||||
|
|
@ -273,7 +280,7 @@ in
|
||||||
amdgpu_top # top-like monitor for AMD GPUs
|
amdgpu_top # top-like monitor for AMD GPUs
|
||||||
direnv # autoload .envrc files
|
direnv # autoload .envrc files
|
||||||
zoxide # directory navigator (z)
|
zoxide # directory navigator (z)
|
||||||
# nextcloud-client # next cloud UI (also just fialed to build. Gah... damn KDE lib issues
|
nextcloud-client # next cloud UI
|
||||||
file # show file types
|
file # show file types
|
||||||
tldr # cli command summary
|
tldr # cli command summary
|
||||||
stress # system workload generator
|
stress # system workload generator
|
||||||
|
|
@ -299,7 +306,7 @@ in
|
||||||
distrobox # instant alternate OS availability
|
distrobox # instant alternate OS availability
|
||||||
pigz # muti-treaded replacement for gzip
|
pigz # muti-treaded replacement for gzip
|
||||||
unzip # old standard zip handler
|
unzip # old standard zip handler
|
||||||
# rpi-imager # rasbperry pi os burner util (1.9.6 failed build)
|
rpi-imager # rasbperry pi os burner util
|
||||||
# screenkey # broadcast key presses
|
# screenkey # broadcast key presses
|
||||||
superfile # cli file manager
|
superfile # cli file manager
|
||||||
mpv # movie player
|
mpv # movie player
|
||||||
|
|
@ -322,7 +329,6 @@ in
|
||||||
gimp # GIMP image manipulation proggy
|
gimp # GIMP image manipulation proggy
|
||||||
zed-editor # the most hopeful replacement for vscode...if I never learn nvim
|
zed-editor # the most hopeful replacement for vscode...if I never learn nvim
|
||||||
noisetorch # noise/background filter for mic
|
noisetorch # noise/background filter for mic
|
||||||
go # golang - general purpose programming
|
|
||||||
];
|
];
|
||||||
programs.zsh.enable = true;
|
programs.zsh.enable = true;
|
||||||
programs.git = {
|
programs.git = {
|
||||||
|
|
@ -392,11 +398,11 @@ in
|
||||||
#services.rustdesk-server.openFirewall = false;
|
#services.rustdesk-server.openFirewall = false;
|
||||||
# RX 6700 XT setup
|
# RX 6700 XT setup
|
||||||
hardware.graphics.extraPackages = [
|
hardware.graphics.extraPackages = [
|
||||||
#pkgs.amdvlk - replaced by RADV (enabled by default)
|
pkgs.amdvlk
|
||||||
pkgs.libcap
|
pkgs.libcap
|
||||||
pkgs.libva
|
pkgs.libva
|
||||||
pkgs.mesa
|
pkgs.mesa
|
||||||
#pkgs.rocmPackages.clr.icd ...no idea if this is causing the rocm-related build fail.
|
pkgs.rocmPackages.clr.icd
|
||||||
#pkgs.pcre2
|
#pkgs.pcre2
|
||||||
#pkgs.libselinux
|
#pkgs.libselinux
|
||||||
#pkgs.rocmPackages.rocblas
|
#pkgs.rocmPackages.rocblas
|
||||||
|
|
@ -406,19 +412,17 @@ in
|
||||||
#pkgs.rocmPackages.rocm-device-libs
|
#pkgs.rocmPackages.rocm-device-libs
|
||||||
#pkgs.rocmPackages.rpp
|
#pkgs.rocmPackages.rpp
|
||||||
];
|
];
|
||||||
hardware.graphics.enable = true;
|
|
||||||
hardware.graphics.enable32Bit = true;
|
|
||||||
|
|
||||||
# To enable Vulkan support for 32-bit applications, also add:
|
# To enable Vulkan support for 32-bit applications, also add:
|
||||||
#hardware.graphics.extraPackages32 = [
|
hardware.graphics.extraPackages32 = [
|
||||||
# pkgs.driversi686Linux.amdvlk - replaced by RADV..hopefully also 32-bit enabled by default.
|
pkgs.driversi686Linux.amdvlk
|
||||||
#];
|
];
|
||||||
|
|
||||||
hardware.amdgpu.opencl.enable = true;
|
hardware.amdgpu.opencl.enable = true;
|
||||||
|
|
||||||
services.ollama = {
|
services.ollama = {
|
||||||
enable = true;
|
enable = true;
|
||||||
acceleration = "rocm"; # hipblaslt not compiling at present
|
acceleration = "rocm";
|
||||||
environmentVariables = {
|
environmentVariables = {
|
||||||
HCC_AMDGPU_TARGET = "gfx1031"; # used to be necessary, but doesn't seem to anymore
|
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.
|
OLLAMA_LOAD_TIMEOUT = "2m"; # Reduce load timeout (from 5 min)...if it's that big, forget it.
|
||||||
|
|
|
||||||
|
|
@ -73,10 +73,7 @@
|
||||||
# EDITOR = "emacs";
|
# EDITOR = "emacs";
|
||||||
};
|
};
|
||||||
# For Monado:
|
# For Monado:
|
||||||
xdg.configFile."openxr/1/active_runtime.json" = {
|
xdg.configFile."openxr/1/active_runtime.json".source = "${pkgs.monado}/share/openxr/1/openxr_monado.json";
|
||||||
source = "${pkgs.monado}/share/openxr/1/openxr_monado.json";
|
|
||||||
force = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# For WiVRn:
|
# For WiVRn:
|
||||||
#xdg.configFile."openxr/1/active_runtime.json".source = "${pkgs.wivrn}/share/openxr/1/openxr_wivrn.json";
|
#xdg.configFile."openxr/1/active_runtime.json".source = "${pkgs.wivrn}/share/openxr/1/openxr_wivrn.json";
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
{{ .Env.SHHH }}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue