shells and stuff

This commit is contained in:
cnst
2024-07-13 08:39:31 +02:00
parent 503408448a
commit a20d307574
5 changed files with 91 additions and 7 deletions

View File

@@ -42,7 +42,6 @@
home-manager,
systems,
lanzaboote,
fenix,
...
} @ inputs: let
inherit (self) outputs;
@@ -57,7 +56,6 @@
);
in {
inherit lib;
packages.x86_64-linux.default = fenix.packages.x86_64-linux.minimal.toolchain;
devShells = forEachSystem (pkgs: import ./nixos/core/shells/dev.nix {inherit inputs pkgs;});
formatter = forEachSystem (pkgs: pkgs.alejandra);

View File

@@ -0,0 +1,64 @@
{pkgs, ...}: {
programs.neovim = {
enable = true;
vimAlias = true;
viAlias = true;
vimdiffAlias = true;
plugins = with pkgs.vimPlugins; [
gruvbox-material-nvim
cmp-buffer
cmp-nvim-lsp
cmp-path
cmp-spell
cmp-treesitter
cmp-vsnip
friendly-snippets
gitsigns-nvim
lightline-vim
lspkind-nvim
neogit
null-ls-nvim
nvim-autopairs
nvim-cmp
nvim-colorizer-lua
nvim-lspconfig
lualine-nvim
nvim-tree-lua
conform-nvim
(nvim-treesitter.withPlugins (_: pkgs.tree-sitter.allGrammars))
plenary-nvim
rainbow-delimiters-nvim
telescope-fzy-native-nvim
telescope-nvim
vim-floaterm
vim-sneak
vim-vsnip
which-key-nvim
];
extraPackages = with pkgs; [gcc ripgrep fd];
extraConfig = let
luaRequire = module:
builtins.readFile (builtins.toString
./config
+ "/${module}.lua");
luaConfig = builtins.concatStringsSep "\n" (map luaRequire [
"init"
"lspconfig"
"nvim-cmp"
"theming"
"treesitter"
"treesitter-textobjects"
"utils"
"which-key"
]);
in ''
lua <<
${luaConfig}
'';
};
}

View File

@@ -1,12 +1,25 @@
{
pkgs,
inputs,
pkgs ? import <nixpkgs> {},
...
}: let
minimalMkShell = import ./minimal.nix {inherit pkgs;};
# 16 is broken: https://github.com/NixOS/nixpkgs/issues/244609
# llvmPackages = pkgs.llvmPackages_16;
llvmPackages = pkgs.llvmPackages_15;
gstreamerPath =
""
+ ":"
+ "${pkgs.gst_all_1.gst-plugins-base}/lib/gstreamer-1.0"
+ ":"
+ "${pkgs.gst_all_1.gst-plugins-good}/lib/gstreamer-1.0"
+ ":"
+ "${pkgs.gst_all_1.gst-plugins-bad}/lib/gstreamer-1.0"
+ ":"
+ "${pkgs.gst_all_1.gst-plugins-ugly}/lib/gstreamer-1.0";
_rustBuildFenix = inputs.fenix.packages.${pkgs.stdenv.hostPlatform.system}.latest.withComponents [
"cargo"
"clippy"
@@ -17,8 +30,16 @@
];
_rustBuild = _rustBuildFenix;
in {
default = pkgs.mkShell {
in
minimalMkShell {
name = "cnst-nixcfg-dev";
hardeningDisable = ["fortify"];
LD_LIBRARY_PATH = "${pkgs.libglvnd}/lib";
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
RUST_BACKTRACE = 1;
GST_PLUGIN_SYSTEM_PATH = gstreamerPath;
nativeBuildInputs = with pkgs; [
_rustBuild
llvmPackages.lldb
@@ -127,5 +148,4 @@ in {
xorg.xcbutilkeysyms
xorg.xcbutilimage # wezterm
];
};
}

View File

@@ -77,6 +77,8 @@
python3
python312Packages.httplib2
python312Packages.oauth2
gtk3
gtk4
];
};
}