diff --git a/nixos/hosts/Tibo-NixFat/default.nix b/nixos/hosts/Tibo-NixFat/default.nix index 667b8ff..25e0714 100644 --- a/nixos/hosts/Tibo-NixFat/default.nix +++ b/nixos/hosts/Tibo-NixFat/default.nix @@ -40,6 +40,7 @@ }; environment.systemPackages = with pkgs; [ + zenith-nvidia wget ]; diff --git a/nixos/modules-old/utils/default.nix b/nixos/modules-old/utils/default.nix index 4b4a5df..e80aac8 100644 --- a/nixos/modules-old/utils/default.nix +++ b/nixos/modules-old/utils/default.nix @@ -1,7 +1,6 @@ { imports = [ ./git - ./mpv ./sops ./ssh ./tea diff --git a/nixos/modules-old/utils/mpv/default.nix b/nixos/modules-old/utils/mpv/default.nix deleted file mode 100644 index 098e7d5..0000000 --- a/nixos/modules-old/utils/mpv/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, system, lib, pkgs-unstable, ... }: - -{ - home-manager.users.tdpeuter.home = { - packages = with pkgs-unstable; [ - mpv - ]; - - file.".config/mpv".source = ../../../../stow/mpv/.config/mpv; - }; -} diff --git a/nixos/modules/users/tdpeuter/default.nix b/nixos/modules/users/tdpeuter/default.nix index 2a94de0..e0cd766 100644 --- a/nixos/modules/users/tdpeuter/default.nix +++ b/nixos/modules/users/tdpeuter/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, pkgs-unstable, ... }: let cfg = config.sisyphus.users.tdpeuter; @@ -29,7 +29,7 @@ in { # If you specify an application here, it will be detected by the configuration module # and the configuration files will be put in place for you. - packages = with pkgs; [ + packages = (with pkgs; [ duf jellyfin-media-player libreoffice-fresh @@ -40,13 +40,21 @@ in { spotify unzip zathura - zenith-nvidia - ]; + ]) ++ (with pkgs-unstable; [ + mpv + ]); + # Put dotfiles in place. file = { ".config/alacritty" = lib.mkIf (builtins.elem pkgs.alacritty installedPkgs) { source = ../../../../stow/alacritty/.config/alacritty; }; + ".config/mpv" = lib.mkIf (builtins.elem pkgs-unstable.mpv installedPkgs) { + source = ../../../../stow/mpv/.config/mpv; + }; + ".config/zellij" = lib.mkIf (builtins.elem pkgs.zellij installedPkgs) { + source = ../../../../stow/zellij/.config/zellij; + }; }; };