matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: make sshd module and some code refactor

Browse source
This commit is contained in:
matt1432 2023-12-27 11:39:38 -05:00
parent f8442fc37e
commit ed92a42266
15 changed files with 89 additions and 97 deletions

20
common/home/neovim/default.nix
View file

@ -161,11 +161,6 @@ in {
type = "viml";
config = fileContents ./plugins/dracula.vim;
}
{
plugin = lualine-nvim;
type = "lua";
config = fileContents ./plugins/lualine.lua;
}
{
plugin = todo-comments-nvim;
type = "lua";
@ -176,11 +171,6 @@ in {
type = "lua";
config = fileContents ./plugins/gitsigns.lua;
}
{
plugin = nvim-autopairs;
type = "lua";
config = fileContents ./plugins/autopairs.lua;
}
{
plugin = indent-blankline-nvim;
type = "lua";
@ -221,6 +211,16 @@ in {
coc-markdownlint
coc-tsserver
{
plugin = nvim-autopairs;
type = "lua";
config = fileContents ./plugins/autopairs.lua;
}
{
plugin = lualine-nvim;
type = "lua";
config = fileContents ./plugins/lualine.lua;
}
{
plugin = neo-tree-nvim;
type = "viml";

4
common/nix-on-droid.nix
View file

@ -22,10 +22,14 @@
substituters = [
# Neovim and stuff
"https://nix-community.cachix.org"
# Personal config cache
"https://cache.nelim.org"
];
trustedPublicKeys = [
# Neovim and stuff
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
# Personal config cache
"cache.nelim.org:JmFqkUdH11EA9EZOFAGVHuRYp7EbsdJDHvTQzG2pPyY="
];
};

21
common/pkgs/default.nix
View file

@ -2,7 +2,8 @@
lib,
pkgs,
...
}: let
}:
with lib; let
mkPackage = name: v: {
${name} = pkgs.callPackage ./${name} {};
};
@ -10,19 +11,15 @@
rmNotPackage = name: value:
value
== "directory"
&& builtins.pathExists ./${name}/default.nix;
&& pathExists ./${name}/default.nix;
packages = lib.attrsets.filterAttrs rmNotPackage (builtins.readDir ./.);
packages = filterAttrs rmNotPackage (builtins.readDir ./.);
pkgSet = lib.attrsets.concatMapAttrs mkPackage packages;
pkgSet = concatMapAttrs mkPackage packages;
in {
imports = [
{
options.customPkgs = lib.mkOption {
type = lib.types.attrs;
};
}
];
options.customPkgs = mkOption {
type = types.attrs;
};
customPkgs = pkgSet;
config.customPkgs = pkgSet;
}