diff --git a/hosts/darwin/home-default.nix b/hosts/darwin/home-default.nix index 18234a4..15c6b32 100644 --- a/hosts/darwin/home-default.nix +++ b/hosts/darwin/home-default.nix @@ -165,16 +165,12 @@ # Command-line utilities ncdu - imagemagick - git-credential-oauth delta fastfetch coreutils # GNU core utilities (base64, etc.) tree bzip2 - unzip duti # Set default applications for file types (macOS) - ffmpeg pdftk # Development and build tools diff --git a/hosts/nixos/home-default.nix b/hosts/nixos/home-default.nix index bd43f82..3c43d7e 100644 --- a/hosts/nixos/home-default.nix +++ b/hosts/nixos/home-default.nix @@ -11,9 +11,6 @@ ../../modules/lazygit.nix ../../modules/rsync.nix ../../modules/btop.nix - ../../modules/claude-code.nix - ../../modules/gemini-cli.nix - ../../modules/media-process.nix ../../modules/fonts.nix ../../modules/env.nix ]; @@ -23,6 +20,7 @@ home.stateVersion = "24.05"; programs.home-manager.enable = true; + nixpkgs.config.allowUnfree = true; # nixOS-specific alias programs.zsh.shellAliases = { @@ -46,18 +44,12 @@ iputils # Core network tools (ping, traceroute) inetutils # Network utilities (telnet) netcat-gnu # Network connection utility - curl # HTTP client - wget # Web downloader # Command-line utilities ncdu - git-credential-oauth delta fastfetch - coreutils # GNU core utilities (base64, etc.) bzip2 - ffmpeg - pdftk # Development and build tools python312 diff --git a/hosts/nixos/hs/home.nix b/hosts/nixos/hs/home.nix index 8352b96..d89e7eb 100644 --- a/hosts/nixos/hs/home.nix +++ b/hosts/nixos/hs/home.nix @@ -23,7 +23,4 @@ downloadDir = "/mnt/storage/Media/web-video"; }; - home.packages = with pkgs; [ - ]; - } diff --git a/hosts/nixos/nfss/home.nix b/hosts/nixos/nfss/home.nix index 2c8f1f9..d0d3c15 100644 --- a/hosts/nixos/nfss/home.nix +++ b/hosts/nixos/nfss/home.nix @@ -3,18 +3,8 @@ { imports = [ ../home-default.nix - ../../../modules/tex.nix ../../../modules/syncthing.nix - ../../../modules/schedule.nix - ../../../modules/yt-dlp.nix + ../../../modules/media-process.nix ]; - home.packages = with pkgs; [ - ]; - - programs.yt-dlp-custom = { - enable = true; - downloadDir = "/home/yanlin/Media"; - }; - } diff --git a/hosts/nixos/system-default.nix b/hosts/nixos/system-default.nix index ff19b4a..e4564a9 100644 --- a/hosts/nixos/system-default.nix +++ b/hosts/nixos/system-default.nix @@ -55,8 +55,7 @@ iotop unzip - # Shell and system management - zsh + # System management home-manager ]; diff --git a/hosts/nixos/thinkpad/home.nix b/hosts/nixos/thinkpad/home.nix index 60efc80..9f59ddb 100644 --- a/hosts/nixos/thinkpad/home.nix +++ b/hosts/nixos/thinkpad/home.nix @@ -1,12 +1,8 @@ { config, pkgs, ... }: { - nixpkgs.config.allowUnfree = true; - imports = [ ../home-default.nix ../../../modules/syncthing.nix - ../../../modules/tex.nix - ../../../modules/schedule.nix ]; } diff --git a/modules/media-process.nix b/modules/media-process.nix index ec9fb16..daf6148 100644 --- a/modules/media-process.nix +++ b/modules/media-process.nix @@ -2,6 +2,7 @@ { home.packages = with pkgs; [ + pdftk ffmpeg shntool cuetools