diff --git a/flake.lock b/flake.lock index ebf2808a..789da66a 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1723920171, - "narHash": "sha256-dVCMrAe+D/5S91erhwQj2DSzHOVzAanWqoy+vPWB9DY=", + "lastModified": 1724006173, + "narHash": "sha256-1ROh0buuxiMyc6eIb3CIbJsmYO7PhLqSYs55mOx1XTk=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "71d49670fe246cdaff4860b0effba0ab9f163b72", + "rev": "7f8df01d4297b9068a9592400f16044602844f86", "type": "github" }, "original": { @@ -102,12 +102,12 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1723531925, - "narHash": "sha256-QPETOkVNZwm3Zx0FRfkrPWScbc46I5QwIOdBmByYtKg=", - "rev": "b8b1c616f8b869af7bce3179ad423e3d45b0d079", - "revCount": 1336, + "lastModified": 1724179929, + "narHash": "sha256-71OTuLbwQ7f9tYn2gOikv2+wA8snkBA2+ozqS9BfptI=", + "rev": "a1a11c4bcc8df500b3e11857d02f457b67342779", + "revCount": 1355, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1336%2Brev-b8b1c616f8b869af7bce3179ad423e3d45b0d079/01914a8c-c7f9-75a8-a4f6-9bd0651d9e6f/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1355%2Brev-a1a11c4bcc8df500b3e11857d02f457b67342779/01917124-7c92-79ff-85c1-a584be36ebc9/source.tar.gz" }, "original": { "type": "tarball", @@ -179,11 +179,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1723444276, - "narHash": "sha256-ErWXmB84hedrDmeaHOaFFfNShC21AopTfM4x4rlvk3c=", + "lastModified": 1724135364, + "narHash": "sha256-DuPnJXOeigXK8xQdP6BBc6MqJ9p4TzvNUqSrB2P1GQ4=", "owner": "nix-community", "repo": "fenix", - "rev": "70c22198ab822aa93c92a7ec0933908b17131edd", + "rev": "b6a1c29a8f460af63f66cad2b5acf3b78867603e", "type": "github" }, "original": { @@ -201,11 +201,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1723953800, - "narHash": "sha256-QHSk/BF+t9vL866B+jzMUDsqotrPYCu8yOGwGhLZglw=", + "lastModified": 1724212992, + "narHash": "sha256-MXxSlGiA/wIhts79vKUM1mRYk1BKW8amVx9D8ZUXAHY=", "owner": "rycee", "repo": "nur-expressions", - "rev": "a1c9db35c44de710621494302af2eebeccb22457", + "rev": "e4d175f6f71348b15f20dcd1ad15193149736412", "type": "gitlab" }, "original": { @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1723984150, - "narHash": "sha256-mEMimxxfpHdyu3IvXz+LRLtA0aBslJ+85gj0O7+4k6w=", + "lastModified": 1724202245, + "narHash": "sha256-f5KOqfiC4pTHFQ9Ef4u9erH0sN9lX8cS8svpBjxE2SM=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "92d24b9d11ff64a5ed2e5473266ec825e39725b1", + "rev": "0cad3d778eede09d6eff11c15fb08288bbdb5cbf", "type": "github" }, "original": { @@ -484,11 +484,11 @@ ] }, "locked": { - "lastModified": 1723202784, - "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", + "lastModified": 1723803910, + "narHash": "sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "c7012d0c18567c889b948781bc74a501e92275d1", + "rev": "bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba", "type": "github" }, "original": { @@ -543,11 +543,11 @@ }, "hardware": { "locked": { - "lastModified": 1723310128, - "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", + "lastModified": 1724067415, + "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", + "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2", "type": "github" }, "original": { @@ -588,11 +588,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1723986931, + "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", "type": "github" }, "original": { @@ -609,11 +609,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1723986931, + "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", "type": "github" }, "original": { @@ -630,11 +630,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1723986931, + "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", "type": "github" }, "original": { @@ -684,11 +684,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1723969407, - "narHash": "sha256-COChiv/1EsfN0aVQcDBPXqNR/T5sUXtalsuO1RGvwcY=", + "lastModified": 1724085862, + "narHash": "sha256-qIPLv+MmTVZ0sjhx99EZhe/2aGzy5JOskmlqPd6DNFQ=", "ref": "refs/heads/main", - "rev": "1006663b6eaa55149e9a21aa8a34e41c85eb08ca", - "revCount": 5103, + "rev": "c86db7bbb0cf14d4955ee3a4d13c0ed9f8a0e0ae", + "revCount": 5115, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -868,11 +868,11 @@ ] }, "locked": { - "lastModified": 1723367191, - "narHash": "sha256-noi5tre7BLtxImN38jEHeVOtOG1Xu37sJFwHKSAPHjo=", + "lastModified": 1724128906, + "narHash": "sha256-junn8oz6yG1akc5R5b8LjcAl1epKJkAzwPlG57bB3E0=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "91178062f365b64eece94c5dff93e09b07e87d9d", + "rev": "d9947d55383ece6ac396820112d34734cf47e2bb", "type": "github" }, "original": { @@ -965,11 +965,11 @@ ] }, "locked": { - "lastModified": 1722924007, - "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", + "lastModified": 1723859949, + "narHash": "sha256-kiaGz4deGYKMjJPOji/JVvSP/eTefrIA3rAjOnOpXl4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", + "rev": "076b9a905af8a52b866c8db068d6da475839d97b", "type": "github" }, "original": { @@ -989,11 +989,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1723945279, - "narHash": "sha256-3W+/u3v/e0dTOxht6wW6pL+kr44e8Amb8A1Z3Bx8BUE=", + "lastModified": 1724203387, + "narHash": "sha256-nm54uFppQFRYM+2v1BLpmlxB6Jv5n0zzwjU+aZShZlE=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "bcf8116981cc332c2734d4c82a034f115780853d", + "rev": "ad4e195c8fd545944273f633fd6ec9b993e088ed", "type": "github" }, "original": { @@ -1036,11 +1036,11 @@ ] }, "locked": { - "lastModified": 1723688652, - "narHash": "sha256-yag+lCB908g2ZPIeRBu6EO2R2Kmx0JfFojoOrtKZa0E=", + "lastModified": 1724161388, + "narHash": "sha256-IQKkLdZdj2sm4GzCXUPtYzsBkzySbai1FAH9e48qtfM=", "owner": "nixpak", "repo": "nixpak", - "rev": "ebffe76fb837b03bc0d54c4eeba9837e7a0541d9", + "rev": "7b924406fead4e9529c0d295f5edfefd2631ccc2", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ }, "nixpkgs-small": { "locked": { - "lastModified": 1723957280, - "narHash": "sha256-J08Yqf2IJ73y7myI69qEKsQ048ibweG6FeJeCxbIdB4=", + "lastModified": 1724137240, + "narHash": "sha256-VjbV/91spoYpl+fD7cK1asDhQIjJduP0lT+SgeXtcIc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "abcef4da4ebb72240bddc370a27263627e64877f", + "rev": "d2fa2514f041934a6aa261c66dc44829251cffd3", "type": "github" }, "original": { @@ -1130,11 +1130,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1723362943, - "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a58bc8ad779655e790115244571758e8de055e3d", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { @@ -1193,11 +1193,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { @@ -1209,11 +1209,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { @@ -1236,11 +1236,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1723923888, - "narHash": "sha256-w+/PG6KqB8en0x1JH5aMuf0QC78Nfei208EaaaRuYG4=", + "lastModified": 1724204906, + "narHash": "sha256-5MGgiIY2IKDR3CKzODtLWDfx6xoKdu4YndYblFQ968I=", "owner": "nix-community", "repo": "nixvim", - "rev": "78fc4be6a830e8dc01f3e66ddbe3243b4bfe8560", + "rev": "38b09c1621b07518b8ba51d68ea4153216a09569", "type": "github" }, "original": { @@ -1258,11 +1258,11 @@ ] }, "locked": { - "lastModified": 1723367906, - "narHash": "sha256-v1qA4WBGDI2uH/TVqRwuXSBP341W681psbzYJ8zrjog=", + "lastModified": 1723969429, + "narHash": "sha256-BuewfNEXEf11MIkJY+uvWsdLu1dIvgJqntWChvNdALg=", "owner": "NuschtOS", "repo": "search", - "rev": "6ca2c3ae05a915c160512bd41f6810f456c9b30d", + "rev": "a05d1805f2a2bc47d230e5e92aecbf69f784f3d0", "type": "github" }, "original": { @@ -1327,11 +1327,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1723304838, - "narHash": "sha256-xAxVDxuvCs8WWkrxVWjCiqxTkHhGj7sSppr1YMuEdT8=", + "lastModified": 1724088625, + "narHash": "sha256-vgSBWgUKRyT0ZRZYj43GZkZzPEKgNodCuX/uofqlPsc=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "0daeb5c0b05cfdf2101b0f078c27539099bf38e6", + "rev": "979e3b54f70f6f231c117a5d628b98106e5c7d31", "type": "github" }, "original": { @@ -1496,11 +1496,11 @@ ] }, "locked": { - "lastModified": 1723454642, - "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=", + "lastModified": 1723808491, + "narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "349de7bc435bdff37785c2466f054ed1766173be", + "rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a", "type": "github" }, "original": { diff --git a/home/users/adam/shell.nix b/home/users/adam/shell.nix index 7ba93fea..35ce6481 100644 --- a/home/users/adam/shell.nix +++ b/home/users/adam/shell.nix @@ -47,8 +47,14 @@ 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{143}%~%f $(git_prompt_info)$(virtualenv_prompt_info) + %F{red}󰫱󰫲󰬃%f %F{143}$ ' + else PROMPT='%F{143}%~%f $(git_prompt_info)$(virtualenv_prompt_info) %F{143}$ ' + fi RPROMPT='$(ruby_prompt_info)' diff --git a/home/users/cnst/shell.nix b/home/users/cnst/shell.nix index e511b268..5f05f007 100644 --- a/home/users/cnst/shell.nix +++ b/home/users/cnst/shell.nix @@ -47,8 +47,14 @@ 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{143}%~%f $(git_prompt_info)$(virtualenv_prompt_info) + %F{red}󰫱󰫲󰬃%f %F{143}$ ' + else PROMPT='%F{143}%~%f $(git_prompt_info)$(virtualenv_prompt_info) %F{143}$ ' + fi RPROMPT='$(ruby_prompt_info)' diff --git a/home/users/toothpick/shell.nix b/home/users/toothpick/shell.nix index e14e473c..798d4b8a 100644 --- a/home/users/toothpick/shell.nix +++ b/home/users/toothpick/shell.nix @@ -47,8 +47,14 @@ 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{143}%~%f $(git_prompt_info)$(virtualenv_prompt_info) + %F{red}󰫱󰫲󰬃%f %F{143}$ ' + else PROMPT='%F{143}%~%f $(git_prompt_info)$(virtualenv_prompt_info) %F{143}$ ' + fi RPROMPT='$(ruby_prompt_info)' diff --git a/system/nix/shell/default.nix b/system/nix/shell/default.nix index 1d891f0b..06c60304 100644 --- a/system/nix/shell/default.nix +++ b/system/nix/shell/default.nix @@ -3,22 +3,31 @@ NIX_CONFIG = "extra-experimental-features = nix-command flakes"; RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}"; nativeBuildInputs = with pkgs; [ - rust-analyzer - cargo - clippy - rustc - rustfmt - openssl - pkg-config - gtk3 - gtk4 - libadwaita - glib - clang - gnumake - cmake - nasm - perl + rust-analyzer # Rust language server for code completion and analysis + cargo # Rust package manager and build tool + rustc # Rust compiler + clippy # Linter to catch common mistakes in Rust code + rustfmt # Tool to format Rust code according to style guidelines + + # Wayland-specific dependencies + wayland # Wayland client library + wayland-protocols # Wayland protocols (essential for building against Wayland) + pkg-config # Helps to manage libraries during compilation + + # Aquamarine: Hyprland's new compositor library + aquamarine # Aquamarine compositor library for Wayland + + # Other utilities and tools + openssl # Required for some crates that involve networking or encryption + git # Version control system, useful for development ]; + shellHook = '' + # Set SHELL to zsh if available + export SHELL=$(which zsh) + # Optionally, start zsh directly if it's not the current shell + if [ "$SHELL" != "$(which zsh)" ]; then + exec $SHELL + fi + ''; }; }