diff --git a/flake.lock b/flake.lock index d64ecd12..e5d43ba1 100644 --- a/flake.lock +++ b/flake.lock @@ -82,12 +82,12 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1731977366, - "narHash": "sha256-UufePQLAmJtLG2ghOSYG/asD+sSo2qubwdozd9Bj9f4=", - "rev": "a5536db0de3357bee3a78725ebecb6c0b660e3f6", - "revCount": 1515, + "lastModified": 1732047192, + "narHash": "sha256-QVvcbiOgQIMLM5+NrpKxpB3IRKH4ZbP7+WKBISKO1zM=", + "rev": "d3ec352824dbec68aa0c17851f7424fdc735ecc4", + "revCount": 1516, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1515%2Brev-a5536db0de3357bee3a78725ebecb6c0b660e3f6/019341ed-4fe6-7559-a347-98284c27be9b/source.tar.gz?rev=a5536db0de3357bee3a78725ebecb6c0b660e3f6&revCount=1515" + "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1516%2Brev-d3ec352824dbec68aa0c17851f7424fdc735ecc4/01934613-7358-7041-acf2-053fb4f76a4c/source.tar.gz?rev=d3ec352824dbec68aa0c17851f7424fdc735ecc4&revCount=1516" }, "original": { "type": "tarball", @@ -169,11 +169,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1731998089, - "narHash": "sha256-nyTC7PboxqkPXgtwn142GV837AUlUOJ1TeVxtFn8kA8=", + "lastModified": 1732084544, + "narHash": "sha256-0p50xdUCAvKWh3s7seOiGN4BaXwPAk852gYvNc13hWc=", "owner": "nix-community", "repo": "fenix", - "rev": "3a8ac5fe1052d1ebe0cfee036aab71cce110b713", + "rev": "6120ce1d29263ed58981e7e223e55942702de853", "type": "github" }, "original": { @@ -458,11 +458,11 @@ ] }, "locked": { - "lastModified": 1731887066, - "narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=", + "lastModified": 1732025103, + "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a", + "rev": "a46e702093a5c46e192243edbd977d5749e7f294", "type": "github" }, "original": { @@ -547,11 +547,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1731978971, - "narHash": "sha256-iwELdS0z0Yr8e3zRIBw07ug451T0rkEfGo3+vA5/Gg0=", + "lastModified": 1732100541, + "narHash": "sha256-ryxqTo2N5EOwHjrDXCoVFKuG1ZKpoMlRmCjqqUhjQPU=", "owner": "hyprwm", "repo": "hyprland", - "rev": "67cee430061626ccd73dc6d30eed9db289053608", + "rev": "940f7aa990dbc99815bab8d355999d8277534b17", "type": "github" }, "original": { @@ -816,11 +816,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1731965225, - "narHash": "sha256-H5NE2ThzfGyKwhFSHZB2/Tp59y5L7eLzfFCKfWeS++c=", + "lastModified": 1732055037, + "narHash": "sha256-gTl7l/jJReaxhKn1HA6JJp1mfq/eu8XJbeK88NVeGnw=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "944006f859a351aef72399a2615018f966e5cb00", + "rev": "230dd8b13b024eb039613c579f940802ea5857e5", "type": "github" }, "original": { @@ -838,11 +838,11 @@ ] }, "locked": { - "lastModified": 1731736013, - "narHash": "sha256-AYB3yeogE9vtBuSStdFFmGR0kzGuumW4nrpdlcuZ/As=", + "lastModified": 1732032028, + "narHash": "sha256-NjyfJQQxs/a2a/KwTmXM44K7XjeJwGsf4YFtebueQzo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a2c6d8d1acce49de8dc7ed951428aae901908316", + "rev": "65dc04371cf914c9af4f073638821e4787303005", "type": "github" }, "original": { @@ -1210,11 +1210,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1731827189, - "narHash": "sha256-isYgZVCLHYoXPtkns2jL+QAKFxnZ6lXCvKO7mT4ooiE=", + "lastModified": 1732050317, + "narHash": "sha256-G5LUEOC4kvB/Xbkglv0Noi04HnCfryur7dVjzlHkgpI=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "ba56d9b9b5f7ae7311b4bd1cc47159d87eb033d0", + "rev": "c0bbbb3e5d7d1d1d60308c8270bfd5b250032bb4", "type": "github" }, "original": { diff --git a/modules/home/programs/zsh/default.nix b/modules/home/programs/zsh/default.nix index f8ee8106..da438207 100644 --- a/modules/home/programs/zsh/default.nix +++ b/modules/home/programs/zsh/default.nix @@ -23,22 +23,21 @@ in { shellAliases = { cat = "${getExe bat} --style=plain"; ls = "${getExe eza} -h --git --icons --color=auto --group-directories-first -s extension"; + ll = "${getExe eza} -l --git --icons --color=auto --group-directories-first -s extension"; la = "${getExe eza} -lah --tree"; tree = "${getExe eza} --tree --icons=always"; extract = "extract.sh"; - usermodules = "$EDITOR /home/$USER/.nix-config/users/$USER/modules.nix"; - umod = "$EDITOR /home/$USER/.nix-config/users/$USER/modules.nix"; - systemmodules = "$EDITOR /home/$USER/.nix-config/hosts/$HOST/modules.nix"; - smod = "$EDITOR /home/$USER/.nix-config/hosts/$HOST/modules.nix"; + homemodules = "$EDITOR /home/$USER/.nix-config/users/$USER/modules.nix"; + hmod = "$EDITOR /home/$USER/.nix-config/users/$USER/modules.nix"; + nixosmodules = "$EDITOR /home/$USER/.nix-config/hosts/$HOST/modules.nix"; + nmod = "$EDITOR /home/$USER/.nix-config/hosts/$HOST/modules.nix"; nixcleanboot = "sudo nix run /home/$USER/.nix-config#cleanup-boot"; nixclean = "nh clean all --keep 3"; nixdev = "nix develop ~/.nix-config -c $SHELL"; nixconfig = "cd /home/$USER/.nix-config/"; - ll = "ls -l"; - nixupdate = "nh os switch -v -H $HOST"; nixup = "nh os switch -H $HOST"; - flakeupdate = "nh os switch -u -v -H $HOST"; - flakeup = "nh os switch -u -H $HOST"; + nixupv = "nh os switch -v -H $HOST"; + flakeup = "nix flake update"; ".." = "cd .."; "..." = "cd ../../"; "...." = "cd ../../../"; diff --git a/users/toothpick/shell.nix b/users/toothpick/shell.nix deleted file mode 100644 index 234f8e85..00000000 --- a/users/toothpick/shell.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: let - inherit (lib.meta) getExe; - inherit (pkgs) eza bat; -in { - programs.zsh = { - enable = true; - dotDir = ".config/zsh"; - enableCompletion = true; - autosuggestion.enable = true; - syntaxHighlighting.enable = true; - - shellAliases = { - cat = "${getExe bat} --style=plain"; - ls = "${getExe eza} -h --git --icons --color=auto --group-directories-first -s extension"; - la = "${getExe eza} -lah --tree"; - ll = "${getExe eza} -l --git --icons --color=auto --group-directories-first -s extension"; - tree = "${getExe eza} --tree --icons=always"; - extract = "extract.sh"; - homemodules = "$EDITOR /home/$USER/.nix-config/users/$USER/modules.nix"; - hmod = "$EDITOR /home/$USER/.nix-config/users/$USER/modules.nix"; - nixosmodules = "$EDITOR /home/$USER/.nix-config/hosts/$HOST/modules.nix"; - nmod = "$EDITOR /home/$USER/.nix-config/hosts/$HOST/modules.nix"; - nixclean = "nh clean all --keep 3"; - nixdev = "nix develop ~/.nix-config -c $SHELL"; - nixconfig = "cd /home/$USER/.nix-config/"; - nixup = "nh os switch -H $HOST"; - nixupv = "nh os switch -v -H $HOST"; - flakeup = "nix flake update"; - ".." = "cd .."; - "..." = "cd ../../"; - "...." = "cd ../../../"; - "....." = "cd ../../../../"; - "......" = "cd ../../../../../"; - }; - history = { - size = 1000; - path = "${config.xdg.dataHome}/zsh/history"; - }; - oh-my-zsh = { - enable = true; - plugins = [ - "git" - # "thefuck" - ]; - theme = "robbyrussell"; - }; - profileExtra = '' - export PATH="$HOME/.local/bin:$PATH" - ''; - initExtraFirst = '' - autoload -U colors && colors - ''; - initExtra = '' - ZSH_THEME_GIT_PROMPT_PREFIX="%F{143}(%F{167}" - ZSH_THEME_GIT_PROMPT_SUFFIX="%f " - ZSH_THEME_GIT_PROMPT_DIRTY="%F{143}) %F{202}%1{✗%}" - ZSH_THEME_GIT_PROMPT_CLEAN="%F{143})" - - ZSH_THEME_RUBY_PROMPT_PREFIX="%F{167}‹" - ZSH_THEME_RUBY_PROMPT_SUFFIX="›%f" - - # Check if we're in a nix-shell or nix develop environment - if [[ -n "$IN_NIX_SHELL" ]]; then - PROMPT='%F{red}DEV%f%F{143}%~%f $(git_prompt_info)$(virtualenv_prompt_info) - %F{143}$ ' - else - PROMPT='%F{143}%~%f $(git_prompt_info)$(virtualenv_prompt_info) - %F{143}$ ' - fi - - RPROMPT='$(ruby_prompt_info)' - - VIRTUAL_ENV_DISABLE_PROMPT=0 - ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX=" %F{66}🐍 " - ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX="%f" - ZSH_THEME_VIRTUALENV_PREFIX=$ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX - ZSH_THEME_VIRTUALENV_SUFFIX=$ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX - - ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=241' - microfetch - ''; - }; -}