diff --git a/flake.lock b/flake.lock index 337bdfdc..e537bb1d 100644 --- a/flake.lock +++ b/flake.lock @@ -67,11 +67,11 @@ ] }, "locked": { - "lastModified": 1728901530, - "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=", + "lastModified": 1731032247, + "narHash": "sha256-OjLft7fwkmiRLXQsGAudGFZxEYXOT0nHwrQ9GbsBqJ4=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6", + "rev": "2fbf4a8417c28cf45bae6e6e97248cbbd9b78632", "type": "github" }, "original": { @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1728922573, - "narHash": "sha256-FegyBabjV4868aJUbvFtqH0zKDEtUpeCAfnB1vWXeBg=", + "lastModified": 1731051511, + "narHash": "sha256-INZxHLoqy7uTLuMhEEnYkyMgouXvJtBupup2pOpcM+s=", "owner": "nix-community", "repo": "disko", - "rev": "3b778f10eb275573da9f5c8a7a49e774200b87e5", + "rev": "a8bdb16b473f457609eb76d0dabb2fcb4e1f64b8", "type": "github" }, "original": { @@ -145,11 +145,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1728903686, - "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -161,11 +161,11 @@ "homebrew-bundle": { "flake": false, "locked": { - "lastModified": 1728638697, - "narHash": "sha256-wut6dMdgveQpIKBQiOoq898AmMPFXEMCLvaxGYdqn3k=", + "lastModified": 1731028300, + "narHash": "sha256-k0iyDC/J5YeIjxVAYYBMT8lvCD1Ny1TsN0eoYrixs9g=", "owner": "homebrew", "repo": "homebrew-bundle", - "rev": "836b67f84a21deec9016253f41f994c2a98cea15", + "rev": "bb8ff046665f91ff4d55d11bcc4cf317a5d47d27", "type": "github" }, "original": { @@ -177,11 +177,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1728961997, - "narHash": "sha256-KYjiVtOFQiZe3rbdvL2OfZLkXSWDGKbo0EKGy3W32os=", + "lastModified": 1731059399, + "narHash": "sha256-TTkztxt6DKzlZ0D//vdjnW6ZRH4eUnuqwBku9jWe5qQ=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "cb02e539e445ec5b74eb95050752bb5cefe11ca8", + "rev": "3380944480acab37ae674199d24f497778c2eca5", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1728959695, - "narHash": "sha256-LFyNymLbsfcPEKxRIJRai++zvj0Lf5ob3j0tQvt1D+s=", + "lastModified": 1731055593, + "narHash": "sha256-Thf7XaM1Wwcwc2uyPXPGp7hRrA2wQn8u77GCupwTR1Y=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "d6064466be72a798099d1dd6876e813861afb73f", + "rev": "27299b152a601cf296f1500918a35fa6cec664bd", "type": "github" }, "original": { @@ -263,11 +263,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { @@ -308,11 +308,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { diff --git a/modules/shared/home-manager.nix b/modules/shared/home-manager.nix index 3b5f6eb0..878c3ad1 100644 --- a/modules/shared/home-manager.nix +++ b/modules/shared/home-manager.nix @@ -67,9 +67,6 @@ let name = "Dustin Lyons"; # PHP Deployer alias deploy='dep deploy' - alias watch="tmux new-session -d -s watch-session 'bash ./bin/watch.sh'" - alias unwatch='tmux kill-session -t watch-session' - # Use difftastic, syntax-aware diffing alias diff=difft @@ -330,6 +327,9 @@ let name = "Dustin Lyons"; escapeTime = 10; historyLimit = 50000; extraConfig = '' + # Default shell + set-option -g default-shell /run/current-system/sw/bin/zsh + # Remove Vim mode delays set -g focus-events on diff --git a/modules/shared/packages.nix b/modules/shared/packages.nix index 8c01cda0..8350f30d 100644 --- a/modules/shared/packages.nix +++ b/modules/shared/packages.nix @@ -94,6 +94,6 @@ with pkgs; [ # Python packages black - python39 - python39Packages.virtualenv + python3 + virtualenv ]