diff --git a/flake.lock b/flake.lock index f186f89..08307a2 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1639695966, - "narHash": "sha256-p7NLQXuG6FW0jnigznCUheQCORRcynSnZm3d6sqyFLM=", + "lastModified": 1639774225, + "narHash": "sha256-pdXvYneQVzB14fD+Q283s17tXRyQMs2JMx4mZ4JeSYg=", "owner": "nix-community", "repo": "home-manager", - "rev": "6c6f934f0ba77dbcaefa84c106cab505f1e5bc58", + "rev": "8b44e81978a2bef60c83ecc0199ab2523310214a", "type": "github" }, "original": { @@ -61,11 +61,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1639687573, - "narHash": "sha256-SsIlA2YJXtIBp1RLfg8IA7jz5XhVZEfYyUJGfdbVGpM=", + "lastModified": 1639795113, + "narHash": "sha256-pVBNbtpamfSOM3eBZWn/Xx9V9FwRaYw7WZ+yOUyz2UA=", "owner": "neovim", "repo": "neovim", - "rev": "b1757e1c29d07c7958c62427e19e85916670049d", + "rev": "818ae74eaf6f4538ca61ee4ba703543b0caaff10", "type": "github" }, "original": { @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1639728838, - "narHash": "sha256-MhSyr5hdO60hhOqn1QkfaW/Sb9QK6WK/F3cW8c45ye4=", + "lastModified": 1639846990, + "narHash": "sha256-vjB3NUJfD6HZS0TaGbK22Gw1d5NdBZlsNI1k2zonogE=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "88cdf65ea8e61368d483e167a1f982f98835271d", + "rev": "a299989784567908c8e26877341f9965a93c1d91", "type": "github" }, "original": { @@ -104,11 +104,11 @@ ] }, "locked": { - "lastModified": 1639570921, - "narHash": "sha256-5n7mjOoXx/Y8W0825liDtE6S2jvOaDfYp18HoraRRVQ=", + "lastModified": 1639852863, + "narHash": "sha256-AUAVxqgPYQOmpOfsK7A2jedjL0TEkq53CTnzssoCaAs=", "owner": "nifoc", "repo": "nix-overlay", - "rev": "ff7834be498b3f5d73bc17265b151f3175a44dee", + "rev": "5663448d4815f58e4bf2e5440db1ff88ae0db3cd", "type": "github" }, "original": { @@ -119,11 +119,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1639713555, - "narHash": "sha256-w1TacWjnqhC19n+rheyOif3JxwvWMbyxfgqYCY0FLdQ=", + "lastModified": 1639807448, + "narHash": "sha256-VA9twSpyM0e5Y5XAm20y5Vg6avky+imzfr65FoFq0G0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "45a3f9d7725c7e21b252c223676cc56fb2ed5d6d", + "rev": "2d555e5f6529d8485ea7ccdbd3633cf1681eaa2e", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index 6c735b8..11f8371 100644 --- a/home.nix +++ b/home.nix @@ -44,7 +44,11 @@ activation = { cleanAppCaches = lib.hm.dag.entryAfter [ "onFilesChange" "installPackages" "copyFonts" ] '' - nvim -c 'try | execute "LuaCacheClear" | catch /.*/ | echo "LuaCacheClear not found" | endtry | q' --headless 2> /dev/null + echo -n "Running LuaCacheClear: " + nvim -c 'try | execute "LuaCacheClear" | echo "Done" | catch /.*/ | echo "Command not found" | endtry | q' --headless + printf '\nRemoving luacache file: ' + rm -f "$HOME/.cache/nvim/luacache" + echo "Done" ''; reportChanges = lib.hm.dag.entryAfter [ "onFilesChange" "installPackages" "copyFonts" ] '' diff --git a/programs/fish.nix b/programs/fish.nix index 32fbcee..0654eec 100644 --- a/programs/fish.nix +++ b/programs/fish.nix @@ -36,7 +36,7 @@ ytdl = "ytdl_with_options"; ytdl_mp4 = "ytdl_with_options -f 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/best[ext=mp4]'"; yti = "ytdl_with_options -F"; - upa = "nix flake update ~/.config/nixpkgs -v"; + upa = "nix-channel --update nixpkgs && nix flake update ~/.config/nixpkgs -v"; upp = "nix flake update ./ -v"; upn = "$HOME/.config/nixpkgs/programs/nvim/update-plugins.sh"; ucl = "nix-collect-garbage -d && nix-store --gc && nix-store --optimise -v";