trying to unfuck gfx

This commit is contained in:
Matt Nish-Lapidus 2024-12-21 15:35:54 -05:00
parent c308a203bf
commit b607388df6
7 changed files with 177 additions and 14 deletions

154
flake.lock generated
View file

@ -21,6 +21,58 @@
"url": "https://gt.emenel.ca/emenel/audio.nix.git"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"freetype2": {
"flake": false,
"locked": {
"lastModified": 1687587065,
"narHash": "sha256-+Fh+/k+NWL5Ow9sDLtp8Cv/8rLNA1oByQQCIQS/bysY=",
"owner": "wez",
"repo": "freetype2",
"rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d",
"type": "github"
},
"original": {
"owner": "wez",
"repo": "freetype2",
"rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d",
"type": "github"
}
},
"harfbuzz": {
"flake": false,
"locked": {
"lastModified": 1711722720,
"narHash": "sha256-GdxcAPx5QyniSHPAN1ih28AD9JLUPR0ItqW9JEsl3pU=",
"owner": "harfbuzz",
"repo": "harfbuzz",
"rev": "63973005bc07aba599b47fdd4cf788647b601ccd",
"type": "github"
},
"original": {
"owner": "harfbuzz",
"ref": "8.4.0",
"repo": "harfbuzz",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -66,6 +118,23 @@
"url": "https://github.com/kmonad/kmonad?dir=nix"
}
},
"libpng": {
"flake": false,
"locked": {
"lastModified": 1549245649,
"narHash": "sha256-1+cRp0Ungme/OGfc9kGJbklYIWAFxk8Il1M+NV4KSgw=",
"owner": "glennrp",
"repo": "libpng",
"rev": "8439534daa1d3a5705ba92e653eda9251246dd61",
"type": "github"
},
"original": {
"owner": "glennrp",
"repo": "libpng",
"rev": "8439534daa1d3a5705ba92e653eda9251246dd61",
"type": "github"
}
},
"musnix": {
"inputs": {
"nixpkgs": [
@ -151,7 +220,6 @@
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixos-hardware",
"type": "github"
}
@ -214,7 +282,89 @@
"nix-ld": "nix-ld",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable"
"nixpkgs-unstable": "nixpkgs-unstable",
"wezterm": "wezterm"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"wezterm",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729477859,
"narHash": "sha256-r0VyeJxy4O4CgTB/PNtfQft9fPfN1VuGvnZiCxDArvg=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "ada8266712449c4c0e6ee6fcbc442b3c217c79e1",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"wezterm": {
"inputs": {
"flake-utils": "flake-utils",
"freetype2": "freetype2",
"harfbuzz": "harfbuzz",
"libpng": "libpng",
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay",
"zlib": "zlib"
},
"locked": {
"dir": "nix",
"lastModified": 1733412933,
"narHash": "sha256-2OPDEgUEh0B6OIcSWtBbkw/zFi8r2VfluLj7FebTaVA=",
"owner": "wez",
"repo": "wezterm",
"rev": "6f375e29a2c4d70b8b51956edd494693196c6692",
"type": "github"
},
"original": {
"dir": "nix",
"owner": "wez",
"repo": "wezterm",
"type": "github"
}
},
"zlib": {
"flake": false,
"locked": {
"lastModified": 1484501380,
"narHash": "sha256-j5b6aki1ztrzfCqu8y729sPar8GpyQWIrajdzpJC+ww=",
"owner": "madler",
"repo": "zlib",
"rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f",
"type": "github"
},
"original": {
"owner": "madler",
"ref": "v1.2.11",
"repo": "zlib",
"type": "github"
}
}
},

View file

@ -3,7 +3,7 @@
description = "My Home Manager configuration";
inputs = {
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nixos-hardware.url = "github:NixOS/nixos-hardware";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
@ -30,6 +30,11 @@
inputs.nixpkgs.follows = "nixpkgs";
};
wezterm = {
url = "github:wez/wezterm?dir=nix";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-ld.url = "github:Mic92/nix-ld";
nix-ld.inputs.nixpkgs.follows = "nixpkgs";
@ -37,7 +42,7 @@
# affinity-nix.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = {nixpkgs, nixpkgs-unstable, home-manager, audio, nix-flatpak, kmonad, musnix, nix-ld, self, ... } @ inputs: {
outputs = {nixpkgs, nixpkgs-unstable, wezterm, home-manager, audio, nix-flatpak, kmonad, musnix, nix-ld, self, ... } @ inputs: {
# packages = nixpkgs.legacyPackages.x86_64-linux;

View file

@ -54,6 +54,7 @@
bison
mesa
neofetch
nvd
xwayland
nitch
ripgrep-all
@ -69,6 +70,12 @@
gst_all_1.gstreamer
alsa-oss
powertop
nix-du
# nvtopPackages.amd
# nvtopPackages.nvidia
usbutils
pciutils
util-linux
@ -460,6 +467,7 @@
};
wezterm = {
enable = true;
package = inputs.wezterm.packages.${pkgs.system}.default;
};
bat = {
enable = true;
@ -610,9 +618,9 @@
systemd.user = {
enable = true;
startServices = "sd-switch";
startServices = "sd-switch"; # auto reload services when home is rebuilt
sessionVariables = {
GSK_RENDERER = "gl";
GSK_RENDERER = "ngl";
MOZ_ENABLE_WAYLAND = 1;
};
services.ulauncher = {

View file

@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
pname = "osirus";
version = "latest";
src = fetchurl {
url = "https://futurenoize.com/dsp56300/builds/osirus/beta/DSP56300Emu-1.4.0-Linux_x86_64-Osirus-CLAP.zip";
sha256 = "sha256-Y0oCpt9Mk/PoZu/FkC7X4RY1hVWuZ6cFwJV83WdpDe0=";
url = "https://futurenoize.com/dsp56300/builds/osirus/beta/DSP56300Emu-1.4.1-Linux_x86_64-Osirus-CLAP.zip";
sha256 = "sha256-+LkyQAaW/yTaLUxiou/Srk9KAhJDQ660u5P9584o4JU=";
};
nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ];
buildInputs = with pkgs; [

View file

@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
pname = "ostirus";
version = "latest";
src = fetchurl {
url = "https://futurenoize.com/dsp56300/builds/ostirus/beta/DSP56300Emu-1.4.0-Linux_x86_64-OsTIrus-CLAP.zip";
sha256 = "sha256-F+n/0gtJ0U7pF7KWr0EQbDSW1oGlG0az17l5zlE3H0s=";
url = "https://futurenoize.com/dsp56300/builds/ostirus/beta/DSP56300Emu-1.4.1-Linux_x86_64-OsTIrus-CLAP.zip";
sha256 = "sha256-0qMqeT5L87AuGgj4UmumhE5YYL4Zba6Ev/NHoemkjW8=";
};
nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ];
buildInputs = with pkgs; [

View file

@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
pname = "vavra";
version = "latest";
src = fetchurl {
url = "https://futurenoize.com/dsp56300/builds/vavra/beta/DSP56300Emu-1.4.0-Linux_x86_64-Vavra-CLAP.zip";
sha256 = "sha256-ed5Rd3gk0ySe85232RDSIDknnw74EtQBrmkWwmick0g=";
url = "https://futurenoize.com/dsp56300/builds/vavra/beta/DSP56300Emu-1.4.1-Linux_x86_64-Vavra-CLAP.zip";
sha256 = "sha256-dWEyzdLyMdkx3XeH4q9U8ko7aslfRROlsJI1DYgLBA4=";
};
nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ];
buildInputs = with pkgs; [

View file

@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
pname = "xenia";
version = "latest";
src = fetchurl {
url = "https://futurenoize.com/dsp56300/builds/xenia/beta/DSP56300Emu-1.4.0-Linux_x86_64-Xenia-CLAP.zip";
sha256 = "sha256-iCsJfzif6NHPSxZbNxKmUxTNhQeKGlx9E2V3+2sbgww=";
url = "https://futurenoize.com/dsp56300/builds/xenia/beta/DSP56300Emu-1.4.1-Linux_x86_64-Xenia-CLAP.zip";
sha256 = "sha256-E+nSzawztU6L8Cxp3o59TG+oUJkvdZNcn8fqopbj7Ac=";
};
nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ];
buildInputs = with pkgs; [