diff --git a/flake.lock b/flake.lock index ca070a9..42910bb 100644 --- a/flake.lock +++ b/flake.lock @@ -223,11 +223,11 @@ }, "joe_nixpkgs": { "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "github" }, "original": { @@ -255,11 +255,11 @@ }, "nixpkgs_stable": { "locked": { - "lastModified": 1723282977, - "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=", + "lastModified": 1723556749, + "narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc", + "rev": "4a92571f9207810b559c9eac203d1f4d79830073", "type": "github" }, "original": { @@ -271,11 +271,11 @@ }, "nixpkgs_unstable": { "locked": { - "lastModified": 1723525562, - "narHash": "sha256-iOsMdXPkDsIcu7Gbutn+ph+DFTNlUg6QicCBPSvegeM=", + "lastModified": 1723737611, + "narHash": "sha256-PFWdNM5D2qKeDl9H/5ImPnBjEuleHkWwCc3Pm91zT58=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b1953b001ec91c5c3871ab812b0e1dbef96da32e", + "rev": "fd61e577354dcc704bfcdc82d26608196fad6043", "type": "github" }, "original": { diff --git a/hosts/_common/configuration.nix b/hosts/_common/configuration.nix index f3a88d8..f1e7843 100644 --- a/hosts/_common/configuration.nix +++ b/hosts/_common/configuration.nix @@ -114,20 +114,6 @@ in # Neofetch is dead neofetch = "fastfetch"; - - # Nix deprecations - nix-hash = "echo 'The functionality of nix-hash may be covered by various subcommands or options in the new `nix` command.'"; - nix-build = "echo 'Use `nix build` instead.'"; - nix-info = "echo 'Use `nix flake info` or other `nix` subcommands to obtain system and Nix information.'"; - nix-channel = "echo 'Channels are being phased out in favor of flakes. Use `nix flake` subcommands.'"; - nix-instantiate = "echo 'Use `nix eval` or `nix-instantiate` with flakes.'"; - nix-collect-garbage = "echo 'Use `nix store gc` instead.'"; - nix-prefetch-url = "echo 'Use `nix-prefetch` or fetchers in Nix expressions.'"; - nix-copy-closure = "echo 'Use `nix copy` instead.'"; - nix-shell = "echo 'Use `nix shell` instead.'"; - # nix-daemon # No direct replacement: The Nix daemon is still in use and managed by the system service manager. - nix-store = "echo 'Use `nix store` subcommands for store operations.'"; - nix-env = "echo 'Use `nix profile` instead'"; }; environment.shellInit = builtins.readFile ./shellInit.sh; diff --git a/users/_common/home_manager/nix_deprecations.nix b/users/_common/home_manager/nix_deprecations.nix new file mode 100644 index 0000000..d281d87 --- /dev/null +++ b/users/_common/home_manager/nix_deprecations.nix @@ -0,0 +1,18 @@ +{ ... }: +{ + programs.zsh.shellAliases = { + # Nix deprecations + nix-hash = "echo 'The functionality of nix-hash may be covered by various subcommands or options in the new `nix` command.'"; + nix-build = "echo 'Use `nix build` instead.'"; + nix-info = "echo 'Use `nix flake info` or other `nix` subcommands to obtain system and Nix information.'"; + nix-channel = "echo 'Channels are being phased out in favor of flakes. Use `nix flake` subcommands.'"; + nix-instantiate = "echo 'Use `nix eval` or `nix-instantiate` with flakes.'"; + nix-collect-garbage = "echo 'Use `nix store gc` instead.'"; + nix-prefetch-url = "echo 'Use `nix-prefetch` or fetchers in Nix expressions.'"; + nix-copy-closure = "echo 'Use `nix copy` instead.'"; + nix-shell = "echo 'Use `nix shell` instead.'"; + # nix-daemon # No direct replacement: The Nix daemon is still in use and managed by the system service manager. + nix-store = "echo 'Use `nix store` subcommands for store operations.'"; + nix-env = "echo 'Use `nix profile` instead'"; + }; +} diff --git a/users/josh/home_manager/wezterm/wezterm.nix b/users/josh/home_manager/wezterm/wezterm.nix index 3133918..cd43092 100644 --- a/users/josh/home_manager/wezterm/wezterm.nix +++ b/users/josh/home_manager/wezterm/wezterm.nix @@ -1,6 +1,7 @@ { pkgs, ... }: { - home.packages = [ pkgs.wezterm ]; - home.file.".wezterm.lua".source = ./wezterm.lua; + # DISABLED + # home.packages = [ pkgs.wezterm ]; + # home.file.".wezterm.lua".source = ./wezterm.lua; }