Xetibo/DashNix
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

nvim: include more formatters and lsps

Browse source
This commit is contained in:
DashieTM 2024-05-22 02:48:39 +02:00
parent 61e08fe876
commit 393a5f9037
9 changed files with 160 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

269
nix/flake.lock generated
View file

@ -209,7 +209,7 @@
}, },
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1705309234,
@ -227,7 +227,7 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1705309234,
@ -245,7 +245,7 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems_5" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1705309234,
@ -263,7 +263,7 @@
}, },
"flake-utils_4": { "flake-utils_4": {
"inputs": { "inputs": {
"systems": "systems_6" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1705309234,
@ -281,7 +281,7 @@
}, },
"flake-utils_5": { "flake-utils_5": {
"inputs": { "inputs": {
"systems": "systems_7" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1705309234,
@ -299,7 +299,7 @@
}, },
"flake-utils_6": { "flake-utils_6": {
"inputs": { "inputs": {
"systems": "systems_8" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1705309234,
@ -335,61 +335,19 @@
"type": "github" "type": "github"
} }
}, },
"hyprlang": {
"inputs": {
"nixpkgs": [
"hyprlock",
"nixpkgs"
],
"systems": "systems"
},
"locked": {
"lastModified": 1713121246,
"narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprlock": {
"inputs": {
"hyprlang": "hyprlang",
"nixpkgs": "nixpkgs_2",
"systems": "systems_2"
},
"locked": {
"lastModified": 1716242428,
"narHash": "sha256-9itkgx3Sl8xPToweCHQoLfvyiTX/b5PZb7clYcKYyIs=",
"owner": "hyprwm",
"repo": "hyprlock",
"rev": "18d2d2ba6af6ac76e4714fae2737a55d223716f8",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlock",
"type": "github"
}
},
"ironbar": { "ironbar": {
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_3",
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1716154552, "lastModified": 1716298131,
"narHash": "sha256-JZqgSOeU2MalRnF75gQ1vZu3VftGfmIgkxPMpkd218o=", "narHash": "sha256-3gK89CiryG8PAXZvtWo+2rrwfyMApQOB5trNrM+cUUY=",
"owner": "JakeStanger", "owner": "JakeStanger",
"repo": "ironbar", "repo": "ironbar",
"rev": "4ad4b0e070cc4e271251763db7210e70857d68ca", "rev": "fd58ce771d3494b3cc034ac49c88af72aab57bf3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -400,7 +358,7 @@
}, },
"naersk": { "naersk": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1713520724, "lastModified": 1713520724,
@ -464,22 +422,6 @@
} }
}, },
"nixpkgs_10": { "nixpkgs_10": {
"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"
}
},
"nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1716137900, "lastModified": 1716137900,
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
@ -495,7 +437,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_12": { "nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1716190602, "lastModified": 1716190602,
"narHash": "sha256-xYRimrR0duWvokWQEvB87bSsICeCvvX9DxpUOzCfsDE=", "narHash": "sha256-xYRimrR0duWvokWQEvB87bSsICeCvvX9DxpUOzCfsDE=",
@ -511,7 +453,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_13": { "nixpkgs_12": {
"locked": { "locked": {
"lastModified": 1716137900, "lastModified": 1716137900,
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
@ -527,23 +469,23 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_13": {
"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"
}
},
"nixpkgs_14": { "nixpkgs_14": {
"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"
}
},
"nixpkgs_15": {
"locked": { "locked": {
"lastModified": 1716137900, "lastModified": 1716137900,
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
@ -559,7 +501,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_16": { "nixpkgs_15": {
"locked": { "locked": {
"lastModified": 1706487304, "lastModified": 1706487304,
"narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
@ -575,7 +517,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_17": { "nixpkgs_16": {
"locked": { "locked": {
"lastModified": 1716062047, "lastModified": 1716062047,
"narHash": "sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA=", "narHash": "sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA=",
@ -592,22 +534,6 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1712963716,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1714314149, "lastModified": 1714314149,
"narHash": "sha256-yNAevSKF4krRWacmLUsLK7D7PlfuY3zF0lYnGYNi9vQ=", "narHash": "sha256-yNAevSKF4krRWacmLUsLK7D7PlfuY3zF0lYnGYNi9vQ=",
@ -621,7 +547,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1714253743, "lastModified": 1714253743,
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
@ -637,17 +563,33 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": {
"locked": {
"lastModified": 1716293225,
"narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=",
"owner": "NixOs",
"repo": "nixpkgs",
"rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916",
"type": "github"
},
"original": {
"owner": "NixOs",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1716137900, "lastModified": 1716137900,
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
"owner": "NixOs", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOs", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
@ -670,6 +612,22 @@
} }
}, },
"nixpkgs_7": { "nixpkgs_7": {
"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"
}
},
"nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1716137900, "lastModified": 1716137900,
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
@ -685,7 +643,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_8": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1706487304, "lastModified": 1706487304,
"narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
@ -701,26 +659,10 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_9": {
"locked": {
"lastModified": 1716137900,
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"oxicalc": { "oxicalc": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1716225554, "lastModified": 1716225554,
@ -739,7 +681,7 @@
"oxidash": { "oxidash": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_3",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_6",
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
@ -759,7 +701,7 @@
"oxinoti": { "oxinoti": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_4", "flake-parts": "flake-parts_4",
"nixpkgs": "nixpkgs_9", "nixpkgs": "nixpkgs_8",
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_3"
}, },
"locked": { "locked": {
@ -779,7 +721,7 @@
"oxipaste": { "oxipaste": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_5", "flake-parts": "flake-parts_5",
"nixpkgs": "nixpkgs_11", "nixpkgs": "nixpkgs_10",
"rust-overlay": "rust-overlay_4" "rust-overlay": "rust-overlay_4"
}, },
"locked": { "locked": {
@ -799,7 +741,7 @@
"oxishut": { "oxishut": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_6", "flake-parts": "flake-parts_6",
"nixpkgs": "nixpkgs_13", "nixpkgs": "nixpkgs_12",
"rust-overlay": "rust-overlay_5" "rust-overlay": "rust-overlay_5"
}, },
"locked": { "locked": {
@ -819,7 +761,7 @@
"reset": { "reset": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_7", "flake-parts": "flake-parts_7",
"nixpkgs": "nixpkgs_15", "nixpkgs": "nixpkgs_14",
"rust-overlay": "rust-overlay_6" "rust-overlay": "rust-overlay_6"
}, },
"locked": { "locked": {
@ -841,10 +783,9 @@
"Hyprspace": "Hyprspace", "Hyprspace": "Hyprspace",
"anyrun": "anyrun", "anyrun": "anyrun",
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprlock": "hyprlock",
"ironbar": "ironbar", "ironbar": "ironbar",
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_4",
"oxicalc": "oxicalc", "oxicalc": "oxicalc",
"oxidash": "oxidash", "oxidash": "oxidash",
"oxinoti": "oxinoti", "oxinoti": "oxinoti",
@ -879,7 +820,7 @@
"rust-overlay_2": { "rust-overlay_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1716171463, "lastModified": 1716171463,
@ -898,7 +839,7 @@
"rust-overlay_3": { "rust-overlay_3": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_10" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
"lastModified": 1716171463, "lastModified": 1716171463,
@ -917,7 +858,7 @@
"rust-overlay_4": { "rust-overlay_4": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_12" "nixpkgs": "nixpkgs_11"
}, },
"locked": { "locked": {
"lastModified": 1716171463, "lastModified": 1716171463,
@ -936,7 +877,7 @@
"rust-overlay_5": { "rust-overlay_5": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_14" "nixpkgs": "nixpkgs_13"
}, },
"locked": { "locked": {
"lastModified": 1716171463, "lastModified": 1716171463,
@ -955,7 +896,7 @@
"rust-overlay_6": { "rust-overlay_6": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_6",
"nixpkgs": "nixpkgs_16" "nixpkgs": "nixpkgs_15"
}, },
"locked": { "locked": {
"lastModified": 1716171463, "lastModified": 1716171463,
@ -973,7 +914,7 @@
}, },
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_17", "nixpkgs": "nixpkgs_16",
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
@ -992,31 +933,31 @@
}, },
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1681028828,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems", "owner": "nix-systems",
"repo": "default-linux", "repo": "default",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-systems", "owner": "nix-systems",
"repo": "default-linux", "repo": "default",
"type": "github" "type": "github"
} }
}, },
"systems_2": { "systems_2": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1681028828,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems", "owner": "nix-systems",
"repo": "default-linux", "repo": "default",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-systems", "owner": "nix-systems",
"repo": "default-linux", "repo": "default",
"type": "github" "type": "github"
} }
}, },
@ -1079,36 +1020,6 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_7": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_8": {
"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", "root": "root",

2
nix/flake.nix
View file

@ -16,8 +16,6 @@
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
hyprlock.url = "github:hyprwm/hyprlock";
Hyprspace = { Hyprspace = {
url = "github:KZDKM/Hyprspace"; url = "github:KZDKM/Hyprspace";
# Hyprspace uses latest Hyprland. We declare this to keep them in sync. # Hyprspace uses latest Hyprland. We declare this to keep them in sync.

14
nix/programs/coding.nix
View file

@ -22,6 +22,13 @@
# cpp # cpp
bear bear
#sql
nodePackages.sql-formatter
sqls
#assembly
asm-lsp
#yaml #yaml
yamlfmt yamlfmt
yamllint yamllint
@ -29,12 +36,17 @@
#markdown #markdown
marksman marksman
mdformat
#bash
nodePackages.bash-language-server
shfmt
#html #html
html-tidy html-tidy
#json #json
jsonfmt jq
#css #css
tailwindcss tailwindcss

2
nix/programs/common.nix
View file

@ -101,6 +101,8 @@ in
home.sessionVariables = home.sessionVariables =
{ {
FLAKE = "home/dasshie/gits/dotFiles/nix"; FLAKE = "home/dasshie/gits/dotFiles/nix";
# don't ask... marksman somehow requires this
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = 1;
}; };
sops = { sops = {

3
nix/programs/default.nix
View file

@ -1,7 +1,6 @@
{ inputs, pkgs, mod, ... }: { inputs, pkgs, mod, ... }:
let let
base_imports = [ base_imports = [
inputs.hyprlock.homeManagerModules.default
inputs.anyrun.homeManagerModules.default inputs.anyrun.homeManagerModules.default
inputs.ironbar.homeManagerModules.default inputs.ironbar.homeManagerModules.default
inputs.oxicalc.homeManagerModules.default inputs.oxicalc.homeManagerModules.default
@ -26,8 +25,6 @@ in
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.dashie = { home-manager.users.dashie = {
#home-manager overlap -> use flake instead
disabledModules = [ "programs/hyprlock.nix" ];
imports = [ imports = [
{ {
_module = { args = { inherit inputs; }; }; _module = { args = { inherit inputs; }; };

4
nix/programs/hyprland/hyprlock.nix
View file

@ -5,8 +5,7 @@
}: }:
{ {
programs.hyprlock.enable = true; programs.hyprlock.enable = true;
programs.hyprlock = { programs.hyprlock.settings = {
backgrounds = [ backgrounds = [
{ {
monitor = ""; monitor = "";
@ -32,6 +31,5 @@
halign = "center"; halign = "center";
} }
]; ];
}; };
} }

1
nix/programs/nvim/default.nix
View file

@ -134,7 +134,6 @@
{ import = "lazyvim.plugins.extras.lang.markdown" }, { import = "lazyvim.plugins.extras.lang.markdown" },
{ import = "lazyvim.plugins.extras.lang.cmake" }, { import = "lazyvim.plugins.extras.lang.cmake" },
{ import = "lazyvim.plugins.extras.lang.omnisharp" }, { import = "lazyvim.plugins.extras.lang.omnisharp" },
{ import = "lazyvim.plugins.extras.lang.json" },
{ import = "lazyvim.plugins.extras.lang.tex" }, { import = "lazyvim.plugins.extras.lang.tex" },
{ import = "lazyvim.plugins.extras.util.dot" }, { import = "lazyvim.plugins.extras.util.dot" },
{ import = "lazyvim.plugins.extras.dap.core" }, { import = "lazyvim.plugins.extras.dap.core" },

59
nix/programs/nvim/lua/plugins/lsp.lua
View file

@ -11,9 +11,6 @@ return {
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
---@class PluginLspOpts ---@class PluginLspOpts
opts = { opts = {
-- inlay_hints = {
-- enabled = true,
-- },
format_notify = false, format_notify = false,
-- LSP Server Settings -- LSP Server Settings
---@type lspconfig.options ---@type lspconfig.options
@ -66,7 +63,49 @@ return {
}, },
omnisharp = { omnisharp = {
mason = false, mason = false,
cmd = { "OmniSharp" }, handlers = {
["textDocument/definition"] = function(...)
return require("omnisharp_extended").handler(...)
end,
},
keys = {
{
"<leader>oe",
function()
require("omnisharp_extended").telescope_lsp_definitions()
end,
desc = "Goto Definition",
},
},
cmd = {
-- no comment
"OmniSharp",
"-z",
"--hostPID",
tostring(vim.fn.getpid()),
"DotNet:enablePackageRestore=false",
"--encoding",
"utf-8",
"--languageserver",
"FormattingOptions:EnableEditorConfigSupport=true",
"FormattingOptions:OrganizeImports=true",
"RoslynExtensionsOptions:EnableAnalyzersSupport=true",
"RoslynExtensionsOptions:EnableImportCompletion=true",
-- inlay hints are bugged until next release.....
-- "RoslynExtensionsOptions:InlayHintsOptions:EnableForParameters=true",
-- "RoslynExtensionsOptions:InlayHintsOptions:ForLiteralParameters=true",
-- "RoslynExtensionsOptions:InlayHintsOptions:ForIndexerParameters=true",
-- "RoslynExtensionsOptions:InlayHintsOptions:ForObjectCreationParameters=true",
-- "RoslynExtensionsOptions:InlayHintsOptions:ForOtherParameters=true",
-- "RoslynExtensionsOptions:InlayHintsOptions:SuppressForParametersThatDifferOnlyBySuffix=false",
-- "RoslynExtensionsOptions:InlayHintsOptions:SuppressForParametersThatMatchMethodIntent=false",
-- "RoslynExtensionsOptions:InlayHintsOptions:SuppressForParametersThatMatchArgumentName=false",
-- "RoslynExtensionsOptions:InlayHintsOptions:EnableForTypes=true",
-- "RoslynExtensionsOptions:InlayHintsOptions:ForImplicitVariableTypes=true",
-- "RoslynExtensionsOptions:InlayHintsOptions:ForLambdaParameterTypes=true",
-- "RoslynExtensionsOptions:InlayHintsOptions:ForImplicitObjectCreation=true",
"Sdk:IncludePrereleases=true",
},
}, },
typst_lsp = { typst_lsp = {
settings = { settings = {
@ -106,7 +145,7 @@ return {
}, },
mason = false, mason = false,
}, },
sqlls = { sqls = {
mason = false, mason = false,
}, },
lemminx = { lemminx = {
@ -118,9 +157,12 @@ return {
yamlls = { yamlls = {
mason = false, mason = false,
}, },
zls = {
mason = false,
},
cssls = { cssls = {
mason = false, mason = false,
cmd = { "css-languageserver", '--stdio' }, cmd = { "css-languageserver", "--stdio" },
}, },
lua_ls = { lua_ls = {
mason = false, mason = false,
@ -167,6 +209,11 @@ return {
lua = { "stylua" }, lua = { "stylua" },
sh = { "shfmt" }, sh = { "shfmt" },
cs = { "dotnet-csharpier" }, cs = { "dotnet-csharpier" },
markdown = { "mdformat" },
sql = { "sql-formatter" },
-- json doesn't work?
json = { "jq" },
yaml = { "yamlfmt" },
}, },
}, },
}, },

1
nix/programs/nvim/lua/plugins/plugins.lua
View file

@ -280,4 +280,5 @@ return {
}, },
}, },
{ "akinsho/git-conflict.nvim", version = "*", config = true }, { "akinsho/git-conflict.nvim", version = "*", config = true },
{ "Hoffs/omnisharp-extended-lsp.nvim" },
} }