diff --git a/flake.lock b/flake.lock index 4f4bbea..36f1a08 100755 --- a/flake.lock +++ b/flake.lock @@ -247,6 +247,24 @@ "inputs": { "systems": "systems_3" }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_4" + }, "locked": { "lastModified": 1705309234, "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", @@ -403,6 +421,24 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1757256385, + "narHash": "sha256-WK7tOhWwr15mipcckhDg2no/eSpM1nIh4C9le8HgHhk=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "f35703b412c67b48e97beb6e27a6ab96a084cd37", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -797,6 +833,38 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1757068644, + "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1756787288, + "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1708161998, "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=", @@ -869,6 +937,7 @@ "neovim-nightly-overlay": "neovim-nightly-overlay", "nixpkgs": "nixpkgs_4", "stylix": "stylix", + "waycast": "waycast", "zig": "zig" } }, @@ -951,6 +1020,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { @@ -1053,6 +1137,26 @@ "type": "github" } }, + "waycast": { + "inputs": { + "flake-utils": "flake-utils", + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1757292265, + "narHash": "sha256-QLgPSIaaSdK3RpCmTimh+xcroV7dQjggns0+KPXNcFg=", + "ref": "refs/heads/master", + "rev": "a24962007b607d7b38ebe3c3624f4bcbbbb7fa2e", + "revCount": 68, + "type": "git", + "url": "https://gitgud.foo/thegrind/waycast" + }, + "original": { + "type": "git", + "url": "https://gitgud.foo/thegrind/waycast" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -1097,8 +1201,8 @@ "zig": { "inputs": { "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_5" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1755864794, diff --git a/flake.nix b/flake.nix index 702320e..5074bb9 100755 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,7 @@ }; hyprshell.url = "git+https://gitgud.foo/thegrind/hypr-shell.git"; hyprland.url = "github:hyprwm/Hyprland"; + waycast.url = "git+https://gitgud.foo/thegrind/waycast"; # hyprland-plugins = { # url = "github:hyprwm/hyprland-plugins"; # inputs.hyprland.follows = "hyprland"; @@ -40,6 +41,7 @@ overlays = [ inputs.neovim-nightly-overlay.overlays.default inputs.zig.overlays.default + inputs.waycast.overlays.default ]; # Helper function to create a host configuration diff --git a/modules/home/common/vscode.nix b/modules/home/common/vscode.nix index 7074ed1..371dcf8 100644 --- a/modules/home/common/vscode.nix +++ b/modules/home/common/vscode.nix @@ -45,6 +45,8 @@ ms-python.debugpy ms-python.python ms-python.vscode-pylance + # Rust + rust-lang.rust-analyzer # Zig # ziglang.vscode-zig # C++ @@ -225,6 +227,13 @@ "workbench.editor.pinnedTabsOnSeparateRow" = true; "C_Cpp.default.compileCommands" = "\${workspaceFolder}/build/compile_commands.json"; "C_Cpp.default.configurationProvider" = "ms-vscode.cmake-tools"; + # Rust Analyzer + "rust-analyzer.inlayHints.chainingHints.enable" = false; + "rust-analyzer.inlayHints.closingBraceHints.enable" = false; + "rust-analyzer.inlayHints.parameterHints.enable" = false; + "rust-analyzer.inlayHints.typeHints.enable" = false; + "rust-analyzer.inlayHints.closureStyle" = "hide"; + # Antlers (Statamic) "antlersLanguageServer.languageVersion" = "runtime"; "[antlers]" = { "editor.defaultFormatter" = "html"; diff --git a/modules/home/home.nix b/modules/home/home.nix index 34a8e97..b22e4c3 100755 --- a/modules/home/home.nix +++ b/modules/home/home.nix @@ -70,6 +70,10 @@ nodejs_22 bun zls # Zig language server + rustup + gcc + pkg-config + python3 ]; sessionVariables = { diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index 6c900ae..4b1643b 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -23,7 +23,7 @@ ]; bind = [ - # "$mod, a, hyprexpo:expo, toggle" + "$mod, a, hyprexpo:expo, toggle" # Start programs "$mod, q, exec, $terminal" "$mod SHIFT, o, exec, $browser" diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index fa6ad73..14444a9 100644 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -14,6 +14,7 @@ ./wofi.nix ./desktop-env.nix ./screenshots.nix + ./waycast.nix ]; home = { diff --git a/modules/home/hyprland/waycast.nix b/modules/home/hyprland/waycast.nix new file mode 100644 index 0000000..202331d --- /dev/null +++ b/modules/home/hyprland/waycast.nix @@ -0,0 +1,21 @@ +{ + pkgs, + config, + inputs, + ... +}: + +{ + imports = [ inputs.waycast.homeManagerModules.default ]; + programs.waycast = { + enable = true; + settings = { + plugins.projects = { + open_command = "code -n {path}"; + search_paths = [ + "/home/javi/projects" + ]; + }; + }; + }; +} diff --git a/modules/system/nfs.nix b/modules/system/nfs.nix index 7663389..8acc969 100644 --- a/modules/system/nfs.nix +++ b/modules/system/nfs.nix @@ -8,6 +8,7 @@ let "container-data" "javi" "xrandr" + "media" ]; configureShare = share: {