emenel/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

major rewrite of flake including new bitwig package for betas

Browse source
This commit is contained in:
Matt Nish-Lapidus 2024-12-31 14:33:59 -05:00
parent 2e67727fc0
commit 124a466a76
4 changed files with 16 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

71
flake.lock generated
View file

@ -1,26 +1,5 @@
{ {
"nodes": { "nodes": {
"audio": {
"inputs": {
"nix-buildproxy": "nix-buildproxy",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1735613558,
"narHash": "sha256-AellDXIA2KrIAxi3PyvhMnkBiIEjYaLYruB6vuiDrTs=",
"ref": "refs/heads/master",
"rev": "1600f91c10d6a033d75443be995a57ebe27d0165",
"revCount": 76,
"type": "git",
"url": "https://gt.emenel.ca/emenel/audio.nix.git"
},
"original": {
"type": "git",
"url": "https://gt.emenel.ca/emenel/audio.nix.git"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
@ -155,25 +134,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-buildproxy": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1708455753,
"narHash": "sha256-qP79WfPiTl92KrZkmvacba9Xas4WwSFln5DjkP2Q/Lg=",
"owner": "polygon",
"repo": "nix-buildproxy",
"rev": "77d486cb4b0458cb4c4a296c3140f7a6c36ab3e6",
"type": "github"
},
"original": {
"owner": "polygon",
"ref": "v0.1.0",
"repo": "nix-buildproxy",
"type": "github"
}
},
"nix-flatpak": { "nix-flatpak": {
"locked": { "locked": {
"lastModified": 1735500379, "lastModified": 1735500379,
@ -206,16 +166,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1708118438, "lastModified": 1735531152,
"narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -236,31 +196,14 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1735531152,
"narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"audio": "audio",
"home-manager": "home-manager", "home-manager": "home-manager",
"kmonad": "kmonad", "kmonad": "kmonad",
"musnix": "musnix", "musnix": "musnix",
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"wezterm": "wezterm" "wezterm": "wezterm"
} }

7
flake.nix
View file

@ -25,11 +25,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
audio = {
url = "git+https://gt.emenel.ca/emenel/audio.nix.git";
inputs.nixpkgs.follows = "nixpkgs";
};
wezterm = { wezterm = {
url = "github:wez/wezterm?dir=nix"; url = "github:wez/wezterm?dir=nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -42,7 +37,7 @@
# affinity-nix.inputs.nixpkgs.follows = "nixpkgs"; # affinity-nix.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = {nixpkgs, nixpkgs-unstable, wezterm, home-manager, audio, nix-flatpak, kmonad, musnix, self, ... } @ inputs: outputs = {nixpkgs, nixpkgs-unstable, wezterm, home-manager, nix-flatpak, kmonad, musnix, self, ... } @ inputs:
let let
inherit (self) outputs; inherit (self) outputs;
# Supported systems for your flake packages, shell, etc. # Supported systems for your flake packages, shell, etc.

26
home/home.nix
View file

@ -8,8 +8,6 @@
outputs.overlays.additions outputs.overlays.additions
outputs.overlays.modifications outputs.overlays.modifications
outputs.overlays.unstable-packages outputs.overlays.unstable-packages
# inputs.audio.overlays.default
]; ];
# Configure your nixpkgs instance # Configure your nixpkgs instance
@ -237,29 +235,15 @@
stirling-pdf stirling-pdf
trash-cli trash-cli
(wineWowPackages.stagingFull.override { wineWowPackages.stagingFull
waylandSupport = true;
fontconfigSupport = true;
vulkanSupport = true;
})
# wineWowPackages.fonts # wineWowPackages.fonts
winetricks winetricks
# bottles (yabridge.override {
wine = wineWowPackages.stagingFull;
(pkgs.unstable.yabridge.override {
wine = (wineWowPackages.stagingFull.override {
waylandSupport = true;
fontconfigSupport = true;
vulkanSupport = true;
});
}) })
(pkgs.unstable.yabridgectl.override { (yabridgectl.override {
wine = (wineWowPackages.stagingFull.override { wine = wineWowPackages.stagingFull;
waylandSupport = true;
fontconfigSupport = true;
vulkanSupport = true;
});
}) })
spice spice

3
overlays/default.nix
View file

@ -18,6 +18,9 @@
wineWowPackages.stagingFull = prev.wineWowPackages.stagingFull.overrideAttrs (old: { wineWowPackages.stagingFull = prev.wineWowPackages.stagingFull.overrideAttrs (old: {
patches = old.patches ++ [ ./wine-6006.patch ]; patches = old.patches ++ [ ./wine-6006.patch ];
waylandSupport = true;
fontconfigSupport = true;
vulkanSupport = true;
}); });
}; };