From dcfb38839da1990d050fe6adfe79c6824f60efd1 Mon Sep 17 00:00:00 2001 From: DashieTM Date: Fri, 3 May 2024 22:47:20 +0200 Subject: [PATCH] change go path, ffs --- nix/base/env.nix | 5 ++++- nix/flake.lock | 30 +++++++-------------------- nix/flake.nix | 1 + nix/programs/coding.nix | 2 ++ nix/programs/nvim/default.nix | 1 + nix/programs/nvim/lua/plugins/lsp.lua | 5 +++++ 6 files changed, 21 insertions(+), 23 deletions(-) diff --git a/nix/base/env.nix b/nix/base/env.nix index d4efa9c..5166603 100644 --- a/nix/base/env.nix +++ b/nix/base/env.nix @@ -9,5 +9,8 @@ SUDO_EDITOR = "neovide --no-fork"; SCRIPTS = "$HOME/.config/scripts"; }; - environment.sessionVariables.NIXOS_OZONE_WL = "1"; + environment.sessionVariables = { + NIXOS_OZONE_WL = "1"; + GOPATH = "$HOME/.go"; + }; } diff --git a/nix/flake.lock b/nix/flake.lock index 0f9508a..e3500e7 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -350,11 +350,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1713625742, - "narHash": "sha256-8MD2uCuGs0v09S/sLR8xC0gYXk6RFSwWdyqYyTpCnes=", + "lastModified": 1714642414, + "narHash": "sha256-Fs83qDWunAxlTbEiC9YbCzpMvxS8wZmPJ18W28Zgl/8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "141867ab45d3f1dba928d61dea643bd5a98778fb", + "rev": "121251b7c5567bc118d6af2ec8c464a951792b45", "type": "github" }, "original": { @@ -363,22 +363,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1706487304, - "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "Hyprspace": "Hyprspace", @@ -416,11 +400,13 @@ "rust-overlay_2": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1713579131, - "narHash": "sha256-j/lrqFNzm7SdlBlKX43kA2Wp0OaGVOUjQGnER9//4Ao=", + "lastModified": 1714702555, + "narHash": "sha256-/NoUbE5S5xpK1FU3nlHhQ/tL126+JcisXdzy3Ng4pDU=", "type": "tarball", "url": "https://github.com/oxalica/rust-overlay/archive/master.tar.gz" }, diff --git a/nix/flake.nix b/nix/flake.nix index 92bb4c7..20e1b37 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -23,6 +23,7 @@ }; rust-overlay = { url = "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs"; }; anyrun.url = "github:Kirottu/anyrun"; diff --git a/nix/programs/coding.nix b/nix/programs/coding.nix index e7df120..c7658d6 100644 --- a/nix/programs/coding.nix +++ b/nix/programs/coding.nix @@ -31,6 +31,8 @@ maven jdt-language-server adoptopenjdk-jre-bin + omnisharp-roslyn + csharpier #vscode-extensions.vscjava.vscode-java-test #vscode-extensions.vscjava.vscode-java-debug ]; diff --git a/nix/programs/nvim/default.nix b/nix/programs/nvim/default.nix index 5c1e1fe..c0f7885 100644 --- a/nix/programs/nvim/default.nix +++ b/nix/programs/nvim/default.nix @@ -67,6 +67,7 @@ nvim-ts-context-commentstring nvim-web-devicons nvim-jdtls + omnisharp-extended-lsp-nvim neotest neotest-java neotest-rust diff --git a/nix/programs/nvim/lua/plugins/lsp.lua b/nix/programs/nvim/lua/plugins/lsp.lua index 33b43d6..52f7d55 100644 --- a/nix/programs/nvim/lua/plugins/lsp.lua +++ b/nix/programs/nvim/lua/plugins/lsp.lua @@ -64,6 +64,10 @@ return { ansiblels = { mason = false, }, + omnisharp = { + mason = false, + cmd = { "OmniSharp" }, + }, typst_lsp = { settings = { experimentalFormatterMode = "on", @@ -158,6 +162,7 @@ return { nix = { "nixpkgs-fmt" }, lua = { "stylua" }, sh = { "shfmt" }, + cs = { "dotnet-csharpier" }, }, }, },