Compare commits

..

1 commit

Author SHA1 Message Date
Chris (wolcen) Thompson
3161bd9b79 Remove KDE, add Hyprland
...attempt 1
2025-10-02 10:32:57 -04:00
5 changed files with 34 additions and 83 deletions

View file

@ -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
View file

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1761344779,
"narHash": "sha256-6LNSptFYhiAd0M/maJoixJw7V0Kp5BSoMRtIahcfu3M=",
"lastModified": 1759337100,
"narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c644cb018f9fdec55f5ac2afb4713a8c7beb757c",
"rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3",
"type": "github"
},
"original": {
@ -22,11 +22,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1761114652,
"narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
"lastModified": 1759036355,
"narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
"rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
"type": "github"
},
"original": {

View file

@ -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" ];
boot.extraModulePackages = [
(amdgpu-kernel-module.overrideAttrs (_: {
@ -138,15 +138,18 @@ in
#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;
# 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;
};
# 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";
@ -244,9 +247,13 @@ 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. 🤮
openh264 # rather, this is the client library
dos2unix # convert file line endings
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
@ -273,7 +280,7 @@ in
amdgpu_top # top-like monitor for AMD GPUs
direnv # autoload .envrc files
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
tldr # cli command summary
stress # system workload generator
@ -299,7 +306,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 (1.9.6 failed build)
rpi-imager # rasbperry pi os burner util
# screenkey # broadcast key presses
superfile # cli file manager
mpv # movie player
@ -322,7 +329,6 @@ 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 = {
@ -392,11 +398,11 @@ in
#services.rustdesk-server.openFirewall = false;
# RX 6700 XT setup
hardware.graphics.extraPackages = [
#pkgs.amdvlk - replaced by RADV (enabled by default)
pkgs.amdvlk
pkgs.libcap
pkgs.libva
pkgs.mesa
#pkgs.rocmPackages.clr.icd ...no idea if this is causing the rocm-related build fail.
pkgs.rocmPackages.clr.icd
#pkgs.pcre2
#pkgs.libselinux
#pkgs.rocmPackages.rocblas
@ -406,19 +412,17 @@ 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 - replaced by RADV..hopefully also 32-bit enabled by default.
#];
hardware.graphics.extraPackages32 = [
pkgs.driversi686Linux.amdvlk
];
hardware.amdgpu.opencl.enable = true;
services.ollama = {
enable = true;
acceleration = "rocm"; # hipblaslt not compiling at present
acceleration = "rocm";
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.

View file

@ -73,10 +73,7 @@
# EDITOR = "emacs";
};
# For Monado:
xdg.configFile."openxr/1/active_runtime.json" = {
source = "${pkgs.monado}/share/openxr/1/openxr_monado.json";
force = true;
};
xdg.configFile."openxr/1/active_runtime.json".source = "${pkgs.monado}/share/openxr/1/openxr_monado.json";
# For WiVRn:
#xdg.configFile."openxr/1/active_runtime.json".source = "${pkgs.wivrn}/share/openxr/1/openxr_wivrn.json";

View file

@ -1 +0,0 @@
{{ .Env.SHHH }}