meta: Merge packages module into existing modules

This commit is contained in:
Donovan Glover 2024-04-06 11:35:34 -04:00
parent b4af703fdf
commit 7649c658b7
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
6 changed files with 39 additions and 60 deletions

View File

@ -1,6 +1,8 @@
{ pkgs, ... }:
let
inherit (pkgs) polkit_gnome;
opacity = "0.95";
super = "SUPER";
@ -32,6 +34,7 @@ in
activate-linux
wl-clipboard-rs
wf-recorder
lutgen
];
wayland.windowManager.hyprland = {

View File

@ -21,27 +21,23 @@ in
programs.bat.enable = true;
home.packages = with pkgs; [
# c
gcc
clang-tools
pkg-config
gnumake
cmake
# go
go
gopls
# nix
nil
nixpkgs-fmt
nixfmt-rfc-style
# crystal
crystal
crystalline
shards
# node/yarn/deno/bun
nodejs
nodePackages.npm
yarn
@ -52,10 +48,12 @@ in
nodePackages."@astrojs/language-server"
nodePackages."@prisma/language-server"
nodePackages.pnpm
nodePackages.prisma
openssl
pnpm-shell-completion
tailwindcss-language-server
vscode-langservers-extracted
# rust
rustc
rustfmt
cargo
@ -68,30 +66,26 @@ in
bacon
clippy
# markdown
marksman
# lua
lua-language-server
# tex/typst
texlive.combined.scheme-full
texlab
tectonic
typst
typstfmt
typst-lsp
typst-live
# ctags
universal-ctags
# emmet
emmet-language-server
# sql
sqlite
sqlcipher
litecli
# docker
dockerfile-language-server-nodejs
docker-compose-language-service
];

View File

@ -1,4 +1,4 @@
{ nix-config, pkgs, config, lib, ... }:
{ nix-config, sakaya, pkgs, config, lib, ... }:
let
inherit (lib) mkEnableOption mkIf mkMerge;
@ -82,6 +82,7 @@ in
environment.systemPackages = mkMerge [
(mkIf japanese (attrValues {
inherit (pkgs) anki kanjidraw;
inherit (sakaya.packages.${pkgs.system}) sakaya;
}))
(mkIf bloat (attrValues {
@ -103,6 +104,7 @@ in
satty
aaaaxy
srb2
jamesdsp
;
}))

View File

@ -1,46 +0,0 @@
{ pkgs, sakaya, ... }:
{
environment.systemPackages = with pkgs; [
osu-lazer-bin
(pass.withExtensions (ext: with ext; [ pass-otp ]))
pass
jamesdsp
zbar
sakaya.packages.${system}.sakaya
sqlcipher
jpegoptim
recode
rmlint
smartmontools
restic
watchexec
ventoy
nodePackages.prisma
openssl
zola
tectonic
pipe-rename
poppler_utils
crystalline
tango
nvd
nix-init
diesel-cli
litecli
lychee
nix-search-cli
lutgen
sudachi-rs
pnpm-shell-completion
];
nixpkgs.config.allowUnfree = true;
environment.defaultPackages = [ ];
}

View File

@ -57,6 +57,16 @@ in
hwinfo
stress
hdparm
recode
rmlint
jpegoptim
watchexec
zola
pass
;
inherit (pkgs)
sudachi-rs
tango
;
inherit (pkgs)
neofetch
@ -82,7 +92,17 @@ in
rclone
ffmpeg
imagemagick
smartmontools
restic
zbar
lychee
ventoy
;
inherit (pkgs)
nixpkgs-review
nix-init
nvd
nix-search-cli
;
})

View File

@ -213,5 +213,11 @@ in
"/share/eww"
"/share/fonts"
];
environment.systemPackages = with pkgs; [
(pass.withExtensions (ext: with ext; [ pass-otp ]))
];
environment.defaultPackages = [ ];
};
}