diff --git a/home-manager/modules/media.nix b/home-manager/modules/media.nix index 3dd5d48..7b960b2 100644 --- a/home-manager/modules/media.nix +++ b/home-manager/modules/media.nix @@ -1,9 +1,9 @@ -{ pkgs, ... }: +{ pkgs, unstablePkgs, ... }: { home.packages = with pkgs; [ ffmpeg - yt-dlp + unstablePkgs.yt-dlp imagemagick mpv graphviz diff --git a/home-manager/modules/mise.nix b/home-manager/modules/mise.nix index f245287..4405dfe 100644 --- a/home-manager/modules/mise.nix +++ b/home-manager/modules/mise.nix @@ -18,11 +18,11 @@ in unstablePkgs.mise ]; - # global tools + # global tools (none anymore since we're using nixpkgs) home.file.".tool-versions".text = '' ''; - xdg.configFile."fish/conf.d/mise.fish".text = '' + programs.fish.interactiveShellInit = '' ${unstablePkgs.mise}/bin/mise activate fish | source ''; diff --git a/home-manager/modules/ssh.nix b/home-manager/modules/ssh.nix index b89ccf3..315b032 100644 --- a/home-manager/modules/ssh.nix +++ b/home-manager/modules/ssh.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { programs.ssh = { diff --git a/home-manager/modules/work/jira.nix b/home-manager/modules/work/jira.nix index 2544fc7..52c744e 100644 --- a/home-manager/modules/work/jira.nix +++ b/home-manager/modules/work/jira.nix @@ -15,6 +15,6 @@ }; programs.fish.interactiveShellInit = '' - set JIRA_API_TOKEN (cat ${secrets.work.jiraToken}) + set -x JIRA_API_TOKEN (cat ${secrets.work.jiraToken}) ''; } diff --git a/nixos/deskapp/vms-backup.nix b/nixos/deskapp/vms-backup.nix index 67baa34..e95ee74 100644 --- a/nixos/deskapp/vms-backup.nix +++ b/nixos/deskapp/vms-backup.nix @@ -32,7 +32,7 @@ let chmod -R u+wr,g+wr,a+r . # Backup - ${pkgs.rsync}/bin/rsync -av --progress --delete --whole-file --sparse . ${backupMount}/vms/ + ${pkgs.rsync}/bin/rsync -av --progress --delete --whole-file --sparse . ${backupMount}/ ''; in