bad/devos
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Compare commits

base: bad:8356ba209f8b7da2a142297d4fb5f56c398b2b0a
Branches Tags
bad:config
bad:nvim-lspconfig
..
compare: bad:539646493ac3c05470a44650794d36228894110c
Branches Tags
bad:config
bad:nvim-lspconfig

No commits in common. "8356ba209f8b7da2a142297d4fb5f56c398b2b0a" and "539646493ac3c05470a44650794d36228894110c" have entirely different histories.
8356ba209f ... 539646493a

7 changed files with 20 additions and 66 deletions
Show stats Expand all files Collapse all files

36
flake.lock
View file

@ -42,11 +42,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1661154924, "lastModified": 1660649317,
"narHash": "sha256-zwkShc4VZ9feLeIrWjdm6YkZBoobzXETF5xIIgi++Ec=", "narHash": "sha256-16sWaj3cTZOQQgrmzlvBSRaBFKLrHJrfYh1k7/sSWok=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "5af1aa51f63d734284bf6728a21d2c9c31eb7492", "rev": "80871c71edb3da76d40bdff9cae007a2a035c074",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -169,11 +169,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1661149922, "lastModified": 1660890677,
"narHash": "sha256-rvYJU7qdQUe82MaZoMVLyCcqQsITB4OK+TuYlT0xXDg=", "narHash": "sha256-Pjo7boTFANtflin0ESiwhFIrtCfss0z2DjEbKMjeFh8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "b30862cd69d405849e4b3e79972da551bf5620bb", "rev": "dca822b67ddf0af52f9b63feaeefc1668c8635c0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -379,11 +379,11 @@
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1661088761, "lastModified": 1660819943,
"narHash": "sha256-5DGKX81wIPAAiLwUmUYECpA3vop94AHHR7WmGXSsQok=", "narHash": "sha256-TRZV/mlW1eYuojqDC3ueYWj7jsTKXJCtyMLNYX/Ybtw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a7855f2235a1876f97473a76151fec2afa02b287", "rev": "8ea014acc33da95ea56c902229957d8225005163",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -415,11 +415,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1661094678, "lastModified": 1660749083,
"narHash": "sha256-RtaVb6SqfrgCi20gdju1ogS3u1ocyLnhsgolazrCwL0=", "narHash": "sha256-GHLFMGH+r3OmI4tV0x/RtxN7DkHcH2ZOhK8uzQeSLiY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "23534df34c1c499a6c82ce690df06d8c6e4e759d", "rev": "a55a7db823959cf509d55325201f1864af4574b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -446,11 +446,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1660998696, "lastModified": 1660646295,
"narHash": "sha256-N5eDv9THZz5pFn7NR1swaFrAJYByfrA5gU5L7JONItA=", "narHash": "sha256-V4G+egGRc3elXPTr7QLJ7r7yrYed0areIKDiIAlMLC8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "13711c9ab9f5a160a44affb7a6221be53318a873", "rev": "762b003329510ea855b4097a37511eb19c7077f0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -567,11 +567,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1661084493, "lastModified": 1660838778,
"narHash": "sha256-G/IElEE6eetQcLpESXCQtuYED/uTrsdeZj8fkqC3FSM=", "narHash": "sha256-SpV0kKZ5b0+w6y15x7ZvBTjxOiAfqgyPq5SWpHDxoV4=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "a670ff888437f4b6a3d24cc2996e9f969a87cbae", "rev": "917bd68b37de4e60e7203061a0a9c23b74d2b5c2",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
profiles/tailscale/default.nix
View file

@ -1,3 +0,0 @@
{ ... }: {
services.tailscale.enable = true;
}

2
suites/default.nix
View file

@ -1,7 +1,7 @@
{ profiles, ... }: { profiles, ... }:
with profiles; rec { with profiles; rec {
base = [ users.root core dnscrypt ]; base = [ users.root core dnscrypt ];
workstation = base ++ [ sway develop game profiles.workstation ssh flatpak torrents pwn tor rust virtualization java networkmanager pipewire flatpak peerix tailscale users.mae ]; workstation = base ++ [ sway develop game profiles.workstation ssh flatpak torrents pwn tor rust virtualization java networkmanager pipewire flatpak peerix users.mae ];
desktop = workstation ++ [ amd three_dee ]; desktop = workstation ++ [ amd three_dee ];
lap = workstation ++ [ laptop bluetooth print ]; lap = workstation ++ [ laptop bluetooth print ];
} }

18
users/modules/neovim/clangd.nix
View file

@ -1,18 +0,0 @@
{ lib, pkgs, config, ... }:
let
cfg = config.mae.nvim.clangd;
in
with lib;
{
options.mae.nvim.clangd.enable = lib.mkEnableOption "Enable C/C++ language support(with clangd) in neovim";
config = mkIf cfg.enable {
mae.nvim.lsp.servers.clangd = {
enable = true;
script = ''
{
cmd = { "${pkgs.clang-tools}/bin/clangd" },
}
'';
};
};
}

5
users/modules/neovim/default.nix
View file

@ -7,10 +7,8 @@ in
imports = [ imports = [
./nvim-lsp.nix ./nvim-lsp.nix
./js.nix ./js.nix
./go.nix
./rust.nix ./rust.nix
./nix.nix ./nix.nix
./clangd.nix
]; ];
options.mae.nvim = { options.mae.nvim = {
@ -32,9 +30,6 @@ in
vim-sleuth vim-sleuth
]; ];
extraPackages = with pkgs; [
nodePackages.prettier
];
extraConfig = '' extraConfig = ''
set background=dark set background=dark
set termguicolors set termguicolors

19
users/modules/neovim/go.nix
View file

@ -1,19 +0,0 @@
{ lib, pkgs, config, ... }:
let
cfg = config.mae.nvim.go;
in
with lib;
{
options.mae.nvim.go.enable = lib.mkEnableOption "Enable go language support in neovim";
config = mkIf cfg.enable {
mae.nvim.lsp.servers.gopls = {
enable = true;
script = ''
{
cmd = { "${pkgs.gopls}/bin/gopls" },
}
'';
};
};
}

3
users/profiles/neovim/default.nix
View file

@ -7,8 +7,7 @@
js.deno.enable = true; js.deno.enable = true;
nix.enable = true; nix.enable = true;
rust.enable = true; rust.enable = true;
go.enable = true; #clangd.enable = true;
clangd.enable = true;
#python.enable = true; #python.enable = true;
}; };
} }