diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml deleted file mode 100644 index 32a5013..0000000 --- a/.forgejo/workflows/test.yml +++ /dev/null @@ -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 diff --git a/flake.lock b/flake.lock index 0cb6964..cf47d56 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1765480374, - "narHash": "sha256-HlbvQAqLx7WqZFFQZ8nu5UUJAVlXiV/kqKbyueA8srw=", + "lastModified": 1759337100, + "narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=", "owner": "nix-community", "repo": "home-manager", - "rev": "39cb677ed9e908e90478aa9fe5f3383dfc1a63f3", + "rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1765186076, - "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", "type": "github" }, "original": { diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 744ed39..e162e53 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" ]; boot.extraModulePackages = [ (amdgpu-kernel-module.overrideAttrs (_: { @@ -135,17 +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; - # 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"; @@ -201,8 +205,6 @@ in programs.kdeconnect.enable = true; # Install firefox. programs.firefox.enable = true; - # Attempt to get the kde wallet launched - #security.pam.services.login.kwallet.enable = true; # Required for DDEV to add hosts files, if your DNS will not resolve addresses to localhost. # Some firewall DNS resolvers will NOT allow an externally resolved domain name to resolve to a reserved IP (e.g. localhost). @@ -245,10 +247,13 @@ in # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ - asciinema # terminal recorder/playback tool - 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 @@ -275,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 @@ -284,11 +289,9 @@ in niv # dependency cli for nix-shell openrgb-with-all-plugins # colors hardware control just # command runner like make - ansible # configuration management system/automation tool + #ansible # configuration management system/automation tool kdePackages.kcachegrind # analyze xdebug output kdePackages.filelight # disk space visualizer - #kdePackages.kwallet # added in order to use Signal, since it tied itself to my first desktop - kdePackages.kwalletmanager # added in order to use Signal, since it tied itself to my first desktop libreoffice-qt # libreoffice - qt is best for KDE hunspell # spell checking hunspellDicts.en_US # spell check dictionary @@ -303,11 +306,11 @@ 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) - screenkey # broadcast key presses + rpi-imager # rasbperry pi os burner util + # screenkey # broadcast key presses superfile # cli file manager mpv # movie player - obs-studio # open broadcast studio + #obs-studio # open broadcast studio protonup-qt # proton version installer heroic # game launcher (GOG/Epic/Prime) lutris # game launcher (EA/Humble/Ubi++) @@ -326,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 = { @@ -396,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 @@ -410,20 +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 - build reports this no longer takes effect - package = pkgs.ollama-vulkan; + 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. @@ -509,7 +508,6 @@ in }; # Force radv environment.variables.AMD_VULKAN_ICD = "RADV"; - environment.variables.QT_QPA_PLATFORM = "wayland"; # Or #environment.variables.VK_ICD_FILENAMES = # "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; diff --git a/hosts/default/home.nix b/hosts/default/home.nix index 6c4a0b2..0daa07c 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -5,6 +5,7 @@ # manage. home.username = "wolcen"; home.homeDirectory = "/home/wolcen"; + # This value determines the Home Manager release that your configuration is # compatible with. This helps avoid breakage when a new Home Manager release # introduces backwards incompatible changes. @@ -69,15 +70,10 @@ # /etc/profiles/per-user/wolcen/etc/profile.d/hm-session-vars.sh # home.sessionVariables = { - # EDITOR = "nvim"; - # QT_QPA_PLATFORM = "wayland"; # Attempt to get KDE keyring to launch + # EDITOR = "emacs"; }; - #security.pam.services.login.kwallet.enable = true; # Also for attempt to get KDE keyring to launch # 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"; diff --git a/hosts/default/main-user.nix b/hosts/default/main-user.nix index 61fd2ec..2c4ad3f 100644 --- a/hosts/default/main-user.nix +++ b/hosts/default/main-user.nix @@ -27,8 +27,7 @@ in extraGroups = [ "wheel" "networkmanager" "docker" ]; packages = with pkgs; [ #kdePackages.kate # ... why did I add this? - bitwarden-desktop # password web service ui - mkcert # create locally trusted certificates + mkcert prismlauncher # minecraft launcher/manager thunderbird # email client keepassxc # passwords! diff --git a/testing.template b/testing.template deleted file mode 100644 index 192472f..0000000 --- a/testing.template +++ /dev/null @@ -1 +0,0 @@ -{{ .Env.SHHH }}