diff --git a/devflakes/rust/flake.lock b/devflakes/rust/flake.lock deleted file mode 100644 index d432072..0000000 --- a/devflakes/rust/flake.lock +++ /dev/null @@ -1,61 +0,0 @@ -{ - "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1726937504, - "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9357f4f23713673f310988025d9dc261c20e70c6", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/devflakes/rust/flake.nix b/devflakes/rust/flake.nix deleted file mode 100644 index dc2276a..0000000 --- a/devflakes/rust/flake.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - description = "A flake for a clean Rust development environment"; - - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - flake-utils.url = "github:numtide/flake-utils"; - }; - - outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachSystem [ "x86_64-linux" ] (system: - let - pkgs = import nixpkgs { - inherit system; - overlays = [ - (self: super: { - inherit (super) nixvim zsh git; - }) - ]; - }; - in rec { - devShell = pkgs.mkShell { - name = "rust-dev-env"; - buildInputs = [ - pkgs.rustup # Rust toolchain manager - pkgs.cargo # Cargo package manager - pkgs.rustc # Rust compiler - pkgs.cargo-watch # Automatically rebuilds Cargo project on change - pkgs.clippy # Linter for Rust - pkgs.rustfmt # Rust code formatting - pkgs.pkg-config # Needed for many Rust dependencies - pkgs.openssl # OpenSSL (common Rust dependency) - ]; - - shellHook = '' - echo "Rust dev environment initialized" - export SHELL=$(which zsh) - [ -f $HOME/.zshrc ] && source $HOME/.zshrc - rustup default stable - ''; - }; - }); -} diff --git a/glasshouse-desktop/configuration.nix b/glasshouse-desktop/configuration.nix index d6a9f20..6d0fc17 100644 --- a/glasshouse-desktop/configuration.nix +++ b/glasshouse-desktop/configuration.nix @@ -59,6 +59,8 @@ alsa-utils alsa-lib zsh + rustc + cargo git kitty xwaylandvideobridge diff --git a/glasshouse-desktop/dotfiles/packages/nixvim/config/plugins/lsp.nix b/glasshouse-desktop/dotfiles/packages/nixvim/config/plugins/lsp.nix index 923503c..2418134 100644 --- a/glasshouse-desktop/dotfiles/packages/nixvim/config/plugins/lsp.nix +++ b/glasshouse-desktop/dotfiles/packages/nixvim/config/plugins/lsp.nix @@ -12,6 +12,7 @@ nil-ls.enable = true; pyright.enable = true; sqls.enable = true; + rust-analyzer.enable = true; }; }; } diff --git a/glasshouse-desktop/modules/zshell.nix b/glasshouse-desktop/modules/zshell.nix index dba2718..04aaa93 100644 --- a/glasshouse-desktop/modules/zshell.nix +++ b/glasshouse-desktop/modules/zshell.nix @@ -14,7 +14,7 @@ }; shellAliases = { - wifi = "nmtui-connect"; + enterwifi = "nmtui-connect"; grep = "grep --color=auto"; v = "nvim"; mv = "mv -v";