diff --git a/flake.lock b/flake.lock index ff377fd..9168b95 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1730633670, - "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -52,11 +52,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1730751859, - "narHash": "sha256-gc+dx5AIsY0NP24UkCNkpnBmSrkrlTR9v6f+6lJjk4A=", + "lastModified": 1730836236, + "narHash": "sha256-8jrg1DQrgYVaO4hpPRxRTAVluo8cE1Lcuvyv2EXuXpA=", "ref": "refs/heads/main", - "rev": "0b98dee77729c296e2044fc748c6dcaa168363c7", - "revCount": 831, + "rev": "90352466d502c40e147cfd11a428dde6c2899ab3", + "revCount": 833, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" diff --git a/system/programs.nix b/system/programs.nix index 11362bd..04d71ca 100644 --- a/system/programs.nix +++ b/system/programs.nix @@ -47,14 +47,21 @@ vkd3d-proton vk-bootstrap (lutris.override { + steamSupport = true; extraLibraries = pkgs: [ + liboggz + libgudev + speex libogg flac graphene + libvpx ]; extraPkgs = pkgs: [ + libvpx libogg + liboggz flac graphene gst_all_1.gstreamer diff --git a/user/default.nix b/user/default.nix index 39080c6..cc72c8e 100644 --- a/user/default.nix +++ b/user/default.nix @@ -43,6 +43,7 @@ enableZshIntegration = true; nix-direnv.enable = true; }; + programs.firefox.enable = true; }; }; diff --git a/user/packages/default.nix b/user/packages/default.nix index 0d0ead1..bd29a83 100644 --- a/user/packages/default.nix +++ b/user/packages/default.nix @@ -4,7 +4,6 @@ age discord jellyfin-media-player - firefox-bin pdfpc terminator openssl @@ -17,6 +16,7 @@ lshw powershell vlc + mosh expat xdeltaUnstable transmission_4-gtk diff --git a/user/programs/firefox/default.nix b/user/programs/firefox/default.nix deleted file mode 100644 index e6d3445..0000000 --- a/user/programs/firefox/default.nix +++ /dev/null @@ -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; }; }; -}