This commit is contained in:
Martin Benonisen 2024-11-06 16:10:54 +01:00
parent 6450d97ac3
commit 16921788ea
Signed by: mbeno
SSH Key Fingerprint: SHA256:iAzOA1WUAxocdh/WRWXcSg5nw2dJ1aDCvPuT+3ZjkwI
5 changed files with 19 additions and 17 deletions

View File

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730633670, "lastModified": 1730837930,
"narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", "rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -23,11 +23,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1730531603, "lastModified": 1730785428,
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -52,11 +52,11 @@
}, },
"locked": { "locked": {
"dir": "packaging/nix", "dir": "packaging/nix",
"lastModified": 1730751859, "lastModified": 1730836236,
"narHash": "sha256-gc+dx5AIsY0NP24UkCNkpnBmSrkrlTR9v6f+6lJjk4A=", "narHash": "sha256-8jrg1DQrgYVaO4hpPRxRTAVluo8cE1Lcuvyv2EXuXpA=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "0b98dee77729c296e2044fc748c6dcaa168363c7", "rev": "90352466d502c40e147cfd11a428dde6c2899ab3",
"revCount": 831, "revCount": 833,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"

View File

@ -47,14 +47,21 @@
vkd3d-proton vkd3d-proton
vk-bootstrap vk-bootstrap
(lutris.override { (lutris.override {
steamSupport = true;
extraLibraries = pkgs: [ extraLibraries = pkgs: [
liboggz
libgudev
speex
libogg libogg
flac flac
graphene graphene
libvpx
]; ];
extraPkgs = pkgs: [ extraPkgs = pkgs: [
libvpx
libogg libogg
liboggz
flac flac
graphene graphene
gst_all_1.gstreamer gst_all_1.gstreamer

View File

@ -43,6 +43,7 @@
enableZshIntegration = true; enableZshIntegration = true;
nix-direnv.enable = true; nix-direnv.enable = true;
}; };
programs.firefox.enable = true;
}; };
}; };

View File

@ -4,7 +4,6 @@
age age
discord discord
jellyfin-media-player jellyfin-media-player
firefox-bin
pdfpc pdfpc
terminator terminator
openssl openssl
@ -17,6 +16,7 @@
lshw lshw
powershell powershell
vlc vlc
mosh
expat expat
xdeltaUnstable xdeltaUnstable
transmission_4-gtk transmission_4-gtk

View File

@ -1,6 +0,0 @@
{ pkgs, config, lib, inputs, user, ... }: {
options.firefox.enable = lib.mkEnableOption "Firefox";
config =
lib.mkIf config.firefox.enable { programs.firefox = { enable = true; }; };
}