voidarc/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added input function and changed nvim stuff

Browse Source
This commit is contained in:
voidarc
2026-03-05 11:11:31 +00:00
parent da43fd90fd
commit d4624bd695
3 changed files with 81 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
configs/common.nix
View File

@@ -141,6 +141,12 @@
packages = packages =
with pkgs; with pkgs;
let let
input =
{
package,
output ? "default",
}:
inputs.${package}.packages.${pkgs.stdenv.hostPlatform.system}.${output};
wrap = wrap =
{ {
name, name,
@@ -166,7 +172,10 @@
cava cava
cmatrix cmatrix
swaynotificationcenter swaynotificationcenter
inputs.chataigne.packages.${stdenv.hostPlatform.system}.chataigne (input {
package = "chataigne";
output = "chataigne";
})
wlogout wlogout
wpaperd wpaperd
kando kando
@@ -174,20 +183,27 @@
grimblast grimblast
(wrap { (wrap {
name = "otter-launcher"; name = "otter-launcher";
pkg = inputs.otter-launcher.packages.${stdenv.hostPlatform.system}.default; pkg = (
input {
package = "otter-launcher";
}
);
modules = [ modules = [
chafa chafa
wl-clipboard wl-clipboard
jq jq
]; ];
}) })
inputs.fsel.packages.${stdenv.hostPlatform.system}.default (input {
package = "fsel";
})
# Terminal # Terminal
carapace carapace
bat bat
kitty kitty
github-cli github-cli
wl-clipboard
p7zip p7zip
bluetuith bluetuith
wget wget
@@ -196,7 +212,9 @@
fastfetch fastfetch
zellij zellij
lsd lsd
inputs.doot.packages.${stdenv.hostPlatform.system}.default (input {
package = "doot";
})
stow stow
fzf fzf
ripgrep ripgrep
@@ -267,63 +285,64 @@
fonts.fontconfig.defaultFonts.serif = [ "Fira Mono Nerd Font" ]; fonts.fontconfig.defaultFonts.serif = [ "Fira Mono Nerd Font" ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(pkgs.symlinkJoin { inputs.nvim-wrapped.packages.${stdenv.hostPlatform.system}.default
name = "nvim-with-lsp"; # (pkgs.symlinkJoin {
paths = [ pkgs.neovim ]; # name = "nvim-with-lsp";
buildInputs = [ pkgs.makeWrapper ]; # paths = [ pkgs.neovim ];
postBuild = '' # buildInputs = [ pkgs.makeWrapper ];
export TREE_SITTER_LIB_PATH="/run/current-system/sw/lib" # postBuild = ''
wrapProgram $out/bin/nvim \ # export TREE_SITTER_LIB_PATH="/run/current-system/sw/lib"
--prefix PATH : ${ # wrapProgram $out/bin/nvim \
pkgs.lib.makeBinPath [ # --prefix PATH : ${
# lsps # pkgs.lib.makeBinPath [
pkgs.lua-language-server # # lsps
pkgs.vscode-langservers-extracted # pkgs.lua-language-server
pkgs.emmet-ls # pkgs.vscode-langservers-extracted
pkgs.prettier # pkgs.emmet-ls
pkgs.black # pkgs.prettier
pkgs.nixfmt # pkgs.black
pkgs.nil # pkgs.nixfmt
pkgs.python313Packages.python-lsp-server # pkgs.nil
pkgs.typescript-language-server # pkgs.python313Packages.python-lsp-server
pkgs.tailwindcss-language-server # pkgs.typescript-language-server
pkgs.stylua # pkgs.tailwindcss-language-server
pkgs.nixd # pkgs.stylua
# pkgs.nixd
# other shit #
pkgs.lua5_1 # # other shit
pkgs.tree-sitter # pkgs.lua5_1
pkgs.ripgrep # pkgs.tree-sitter
pkgs.gcc # pkgs.ripgrep
pkgs.gnumake # pkgs.gcc
pkgs.imagemagick # pkgs.gnumake
pkgs.luajitPackages.magick # pkgs.imagemagick
pkgs.ghostscript # pkgs.luajitPackages.magick
pkgs.luarocks # pkgs.ghostscript
(pkgs.texlive.combine { # pkgs.luarocks
inherit (pkgs.texlive) # (pkgs.texlive.combine {
scheme-basic # inherit (pkgs.texlive)
varwidth # scheme-basic
preview # varwidth
mathtools # preview
amsfonts # mathtools
amscdx # amsfonts
xcolor # amscdx
dvisvgm # xcolor
dvipng # for preview and export as html # dvisvgm
wrapfig # dvipng # for preview and export as html
standalone # wrapfig
graphicxbox # standalone
amsmath # graphicxbox
ulem # amsmath
hyperref # ulem
capt-of # hyperref
; # capt-of
}) # ;
] # })
} # ]
''; # }
}) # '';
# })
vim vim
unzip unzip
python310 # Its python like come on python310 # Its python like come on

1
configs/configuration-laptop.nix
View File

@@ -40,7 +40,6 @@
packages = with pkgs; [ packages = with pkgs; [
# Ricing # Ricing
inputs.way-edges.packages.${stdenv.hostPlatform.system}.way-edges inputs.way-edges.packages.${stdenv.hostPlatform.system}.way-edges
inputs.chataigne.packages.${stdenv.hostPlatform.system}.chataigne
# Terminal # Terminal
light light

1
flake.nix
View File

@@ -11,6 +11,7 @@
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
chataigne.url = "./modules/chataigne"; chataigne.url = "./modules/chataigne";
nvim-wrapped.url = "git+file:///home/user01/.dotfiles/.config/nvim";
tree-sitter.url = "github:tree-sitter/tree-sitter?ref=8b8199775f96ca8642cf7860da46100875b38453"; tree-sitter.url = "github:tree-sitter/tree-sitter?ref=8b8199775f96ca8642cf7860da46100875b38453";