Compare commits

...

3 commits

Author SHA1 Message Date
dac4931ac6 System update 2024-06-18.
Removes logseq. Was unused, and electron version is EOL.
2024-06-18 18:21:16 -04:00
0fab8ab1c7 Adds .editorconfig. 2024-06-18 18:21:16 -04:00
b48f00f67f Adds LSP support into Kate 2024-06-18 18:21:16 -04:00
8 changed files with 170 additions and 23 deletions

118
.editorconfig Normal file
View file

@ -0,0 +1,118 @@
# EditorConfig configuration for nixpkgs
# https://EditorConfig.org
# Top-most EditorConfig file
root = true
# Unix-style newlines with a newline ending every file, utf-8 charset
[*]
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
charset = utf-8
# Ignore diffs/patches
[*.{diff,patch}]
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
# We want readFile .version to return the version without a newline.
[.version]
insert_final_newline = false
# see https://nixos.org/nixpkgs/manual/#chap-conventions
# Match json/lockfiles/markdown/nix/perl/python/ruby/shell/docbook files, set indent to spaces
[*.{json,lock,md,nix,pl,pm,py,rb,sh,xml}]
indent_style = space
# Match docbook files, set indent width of one
[*.xml]
indent_size = 1
# Match json/lockfiles/markdown/nix/ruby files, set indent width of two
[*.{json,lock,md,nix,rb}]
indent_size = 2
# Match perl/python/shell scripts, set indent width of four
[*.{pl,pm,py,sh}]
indent_size = 4
# Match gemfiles, set indent to spaces with width of two
[Gemfile]
indent_size = 2
indent_style = space
# Disable file types or individual files
# some of these files may be auto-generated and/or require significant changes
[*.{c,h}]
insert_final_newline = unset
trim_trailing_whitespace = unset
[*.{asc,key,ovpn}]
insert_final_newline = unset
end_of_line = unset
trim_trailing_whitespace = unset
[*.lock]
indent_size = unset
# Although Markdown/CommonMark allows using two trailing spaces to denote
# a hard line break, we do not use that feature in nixpkgs since
# it forces the surrounding paragraph to become a <literallayout> which
# does not wrap reasonably.
# Instead of a hard line break, start a new paragraph by inserting a blank line.
[*.md]
trim_trailing_whitespace = true
# binaries
[*.nib]
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
charset = unset
[eggs.nix]
trim_trailing_whitespace = unset
[nixos/modules/services/networking/ircd-hybrid/*.{conf,in}]
trim_trailing_whitespace = unset
[pkgs/build-support/dotnetenv/Wrapper/**]
end_of_line = unset
indent_style = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
[pkgs/development/compilers/elm/registry.dat]
end_of_line = unset
insert_final_newline = unset
[pkgs/development/haskell-modules/hackage-packages.nix]
indent_style = unset
trim_trailing_whitespace = unset
[pkgs/misc/documentation-highlighter/**]
insert_final_newline = unset
[pkgs/servers/dict/wordnet_structures.py]
trim_trailing_whitespace = unset
[pkgs/tools/misc/timidity/timidity.cfg]
trim_trailing_whitespace = unset
[pkgs/tools/virtualization/ovftool/*.ova]
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
charset = unset
[lib/tests/*.plist]
indent_style = tab
insert_final_newline = unset
[pkgs/kde/generated/**]
insert_final_newline = unset
end_of_line = unset

View file

@ -60,11 +60,11 @@
]
},
"locked": {
"lastModified": 1717931644,
"narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=",
"lastModified": 1718526747,
"narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3d65009effd77cb0d6e7520b68b039836a7606cf",
"rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792",
"type": "github"
},
"original": {
@ -75,11 +75,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1717786204,
"narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
"lastModified": 1718530797,
"narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
"rev": "b60ebf54c15553b393d144357375ea956f89e9a9",
"type": "github"
},
"original": {
@ -91,11 +91,11 @@
},
"nur": {
"locked": {
"lastModified": 1718083203,
"narHash": "sha256-EbV/EWO3VBjZMhY+yrtTay5xGAxS4bnvIg7jPbgYEZU=",
"lastModified": 1718685219,
"narHash": "sha256-RYVPWU8akb4Kham9bo7G03zXtVYNjZvabthN3C0S0Cc=",
"owner": "nix-community",
"repo": "NUR",
"rev": "574fe531cb78197ba6d97e2d0f12d9ae7e4798fd",
"rev": "03dbb1378bf45c5ff79c2260f5d46236ac09c875",
"type": "github"
},
"original": {
@ -122,11 +122,11 @@
]
},
"locked": {
"lastModified": 1716675292,
"narHash": "sha256-7TFvVE4HR/b65/0AAhewYHEJzUXxIEJn82ow5bCkrDo=",
"lastModified": 1718097323,
"narHash": "sha256-zCgs8Wp7rdt0tjNUHMUIvi6sIvDoprWIHwvTGq+LMK0=",
"owner": "snowfallorg",
"repo": "lib",
"rev": "5d6e9f235735393c28e1145bec919610b172a20f",
"rev": "aa19b02b63025263cec041fcb7a0857c3cb98859",
"type": "github"
},
"original": {
@ -137,11 +137,11 @@
},
"stable": {
"locked": {
"lastModified": 1718086528,
"narHash": "sha256-hoB7B7oPgypePz16cKWawPfhVvMSXj4G/qLsfFuhFjw=",
"lastModified": 1718437845,
"narHash": "sha256-ZT7Oc1g4I4pHVGGjQFnewFVDRLH5cIZhEzODLz9YXeY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "47b604b07d1e8146d5398b42d3306fdebd343986",
"rev": "752c634c09ceb50c45e751f8791cb45cb3d46c9e",
"type": "github"
},
"original": {

View file

@ -25,7 +25,6 @@ in
] ++ (lib.optionals (!cfg.minimal) [
ungoogled-chromium reaper cardinal plex-media-player puredata
minetest prismlauncher mangohud qflipper bottles dosbox blender
logseq
]) ++ (lib.optionals (!cfg.minimal && cfg.private) [
thunderbird
]);

View file

@ -28,5 +28,16 @@
plasma-integration
];
};
xdg.configFile."kate/lspclient/settings.json" = {
text = ''
{
"global":
{
"path": ["${pkgs.mtxyz.lsp-path}/bin"]
}
}
'';
};
};
}

View file

@ -15,11 +15,8 @@
vimdiffAlias = true;
extraPackages = with pkgs; [
biome nil rust-analyzer clang-tools
ripgrep universal-ctags nixpkgs-fmt
] ++ (with python3Packages; [
python-lsp-server
]);
ripgrep mtxyz.lsp-path
];
plugins = with pkgs.vimPlugins; [
vim-fish

View file

@ -32,6 +32,7 @@ local lsp_servers = {
clangd = {},
biome = {},
nil_ls = {},
yamlls = {},
pylsp = {
pylsp = {
configurationSources = "flake8",

View file

@ -2,10 +2,9 @@
final: prev: {
# Fallback to stable packages when build issues occur.
# * qemu 8.2.3 has a build failure. 8.2.4 should be coming soon. (2024-05-17)
qemu = channels.stable.qemu;
# Past issues:
# * qemu 8.2.3 had a build failure. 8.2.4 should be coming soon. (2024-05-17)
# * Blender had a build failure. (2024-02-27)
# * Fractal build took 30m+ and 12GB+ of RAM when linking? (2024-02-27)
}

View file

@ -0,0 +1,22 @@
{
symlinkJoin,
biome,
nil,
rust-analyzer,
clang-tools,
python3Packages,
universal-ctags,
nixpkgs-fmt,
yaml-language-server,
...
}:
symlinkJoin {
name = "lsp-path";
paths = [
biome nil rust-analyzer clang-tools
python3Packages.python-lsp-server
universal-ctags nixpkgs-fmt yaml-language-server
];
}