RGBCube/ncc
1
Fork 0
mirror of https://github.com/RGBCube/ncc synced 2025-07-27 18:17:44 +00:00
Code Issues Activity

fix: don't repeat pkgs.\w too much, add taplo, tokei, typos

Browse source
This commit is contained in:
RGBCube 2025-03-25 21:06:27 +03:00
parent 79c9526b1b
commit 25d008fc47
Signed by: RGBCube
SSH key fingerprint: SHA256:CzqbPcfwt+GxFYNnFVCqoN5Itn4YFrshg1TrnACpA5M
13 changed files with 213 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/common/agenix.nix
View file

@ -1,5 +1,5 @@
{ config, lib, pkgs, ... }: let { config, lib, pkgs, ... }: let
inherit (lib) attrNames head mkAliasOptionModule mkIf; inherit (lib) attrNames attrValues head mkAliasOptionModule mkIf;
in { in {
imports = [(mkAliasOptionModule [ "secrets" ] [ "age" "secrets" ])]; imports = [(mkAliasOptionModule [ "secrets" ] [ "age" "secrets" ])];
@ -12,6 +12,10 @@ in {
environment = mkIf config.isDesktop { environment = mkIf config.isDesktop {
shellAliases.agenix = "agenix --identity ~/.ssh/id"; shellAliases.agenix = "agenix --identity ~/.ssh/id";
systemPackages = [ pkgs.agenix ]; systemPackages = attrValues {
inherit (pkgs)
agenix
;
};
}; };
} }

12
modules/common/git.nix
View file

@ -1,5 +1,5 @@
{ self, config, lib, pkgs, ... }: let { self, config, lib, pkgs, ... }: let
inherit (lib) head mkAfter enabled merge mkIf; inherit (lib) attrValues head mkAfter enabled merge mkIf;
inherit (lib.strings) match; inherit (lib.strings) match;
in { in {
environment.shellAliases = merge { environment.shellAliases = merge {
@ -68,10 +68,12 @@ in {
"ask-git" = "gh copilot suggest --target git --"; "ask-git" = "gh copilot suggest --target git --";
}; };
environment.systemPackages = [ environment.systemPackages = attrValues {
pkgs.git-absorb inherit (pkgs)
pkgs.tig git-absorb
]; tig
;
};
home-manager.sharedModules = [ home-manager.sharedModules = [
(homeArgs: let (homeArgs: let

74
modules/common/helix.nix
View file

@ -1,5 +1,5 @@
{ config, lib, pkgs, ... }: let { config, lib, pkgs, ... }: let
inherit (lib) const enabled genAttrs mkAfter mkIf; inherit (lib) attrValues const enabled genAttrs mkAfter mkIf;
in { in {
environment = { environment = {
variables.EDITOR = "hx"; variables.EDITOR = "hx";
@ -213,47 +213,57 @@ in {
}; };
}]; }];
environment.systemPackages = mkIf config.isDesktop [ environment.systemPackages = mkIf config.isDesktop <| attrValues {
# CMAKE inherit (pkgs)
pkgs.cmake-language-server # CMAKE
cmake-language-server
# GO # GO
pkgs.gopls gopls
# HTML # HTML
pkgs.vscode-langservers-extracted vscode-langservers-extracted
pkgs.nodePackages_latest.prettier
# KOTLIN # KOTLIN
pkgs.kotlin-language-server kotlin-language-server
# LATEX # LATEX
pkgs.texlab texlab
# LUA # LUA
pkgs.lua-language-server lua-language-server
# MARKDOWN # MARKDOWN
pkgs.marksman marksman
# NIX # NIX
pkgs.alejandra alejandra
pkgs.nil nil
# PYTHON
pkgs.python311Packages.python-lsp-server
# RUST # RUST
pkgs.rust-analyzer-nightly rust-analyzer-nightly
pkgs.lldb lldb
# TYPESCRIPT & OTHERS # TYPESCRIPT & OTHERS
pkgs.deno deno
# YAML # YAML
pkgs.yaml-language-server yaml-language-server
# ZIG # ZIG
pkgs.zls zls
]; ;
inherit (pkgs.python311Packages)
# PYTHON
# TODO: Replace with basedpyright.
python-lsp-server
;
inherit (pkgs.nodePackages_latest)
# HTML
prettier
;
};
} }

12
modules/common/jujutsu.nix
View file

@ -1,10 +1,12 @@
{ self, config, lib, pkgs, ... }: let { self, config, lib, pkgs, ... }: let
inherit (lib) enabled getExe head; inherit (lib) attrValues enabled getExe head;
in { in {
environment.systemPackages = [ environment.systemPackages = attrValues {
pkgs.difftastic inherit (pkgs)
pkgs.radicle-node difftastic
]; radicle-node
;
};
home-manager.sharedModules = [(homeArgs: let home-manager.sharedModules = [(homeArgs: let
homeConfig = homeArgs.config; homeConfig = homeArgs.config;

14
modules/common/nix.nix
View file

@ -1,5 +1,5 @@
{ self, config, inputs, lib, pkgs, ... }: let { self, config, inputs, lib, pkgs, ... }: let
inherit (lib) attrsToList concatStringsSep const disabled filter filterAttrs flip id isType mapAttrs mapAttrsToList merge mkAfter optionalAttrs optionals; inherit (lib) attrValues attrsToList concatStringsSep const disabled filter filterAttrs flip id isType mapAttrs mapAttrsToList merge mkAfter optionalAttrs optionals;
inherit (lib.strings) toJSON; inherit (lib.strings) toJSON;
registryMap = inputs registryMap = inputs
@ -46,11 +46,13 @@ in {
nix.optimise.automatic = true; nix.optimise.automatic = true;
environment.systemPackages = [ environment.systemPackages = attrValues {
pkgs.nh inherit (pkgs)
pkgs.nix-index nh
pkgs.nix-output-monitor nix-index
]; nix-output-monitor
;
};
home-manager.sharedModules = [{ home-manager.sharedModules = [{
programs.nushell.configFile.text = mkAfter /* nu */ '' programs.nushell.configFile.text = mkAfter /* nu */ ''

12
modules/common/nushell/default.nix
View file

@ -1,5 +1,5 @@
{ config, lib, pkgs, ... }: let { config, lib, pkgs, ... }: let
inherit (lib) enabled filter first foldl' getExe last match mkIf nameValuePair optionalAttrs readFile removeAttrs splitString; inherit (lib) attrValues enabled filter first foldl' getExe last match mkIf nameValuePair optionalAttrs readFile removeAttrs splitString;
in { in {
environment = optionalAttrs config.isLinux { environment = optionalAttrs config.isLinux {
sessionVariables.SHELLS = getExe pkgs.nushell; sessionVariables.SHELLS = getExe pkgs.nushell;
@ -20,10 +20,12 @@ in {
tree = "tree -CF --dirsfirst"; tree = "tree -CF --dirsfirst";
}; };
systemPackages = [ systemPackages = attrValues {
pkgs.fish # For completions. inherit (pkgs)
pkgs.zoxide # For completions and better cd. fish # For completions.
]; zoxide # For completions and better cd.
;
};
variables.STARSHIP_LOG = "error"; variables.STARSHIP_LOG = "error";
}; };

110
modules/common/packages.nix
View file

@ -1,57 +1,71 @@
{ config, lib, pkgs, ... }: let { config, lib, pkgs, ... }: let
inherit (lib) optionals; inherit (lib) attrValues optionalAttrs;
in { in {
environment.systemPackages = [ environment.systemPackages = attrValues <| {
pkgs.asciinema inherit (pkgs)
pkgs.cowsay asciinema
pkgs.curlHTTP3 cowsay
pkgs.dig curlHTTP3
pkgs.doggo dig
pkgs.fastfetch doggo
pkgs.fd fastfetch
(pkgs.fortune.override { withOffensive = true; }) fd
pkgs.hyperfine hyperfine
pkgs.moreutils moreutils
pkgs.openssl openssl
pkgs.p7zip p7zip
pkgs.pstree pstree
pkgs.rsync rsync
pkgs.timg timg
pkgs.tree tokei
pkgs.uutils-coreutils-noprefix tree
pkgs.yazi typos
pkgs.yt-dlp uutils-coreutils-noprefix
] ++ optionals config.isLinux [ yazi
pkgs.traceroute yt-dlp
pkgs.usbutils ;
pkgs.strace
] ++ optionals config.isDesktop [
pkgs.clang_16
pkgs.clang-tools_16
pkgs.deno
pkgs.gh
pkgs.go
pkgs.jdk
pkgs.lld
pkgs.maven
pkgs.zig
pkgs.qbittorrent fortune = pkgs.fortune.override { withOffensive = true; };
] ++ optionals (config.isLinux && config.isDesktop) [ } // optionalAttrs config.isLinux {
pkgs.thunderbird inherit (pkgs)
traceroute
usbutils
strace
;
} // optionalAttrs config.isDesktop {
inherit (pkgs)
clang_16
clang-tools_16
deno
gh
go
jdk
lld
maven
zig
pkgs.whatsapp-for-linux qbittorrent
;
} // optionalAttrs (config.isLinux && config.isDesktop) {
inherit (pkgs)
thunderbird
pkgs.element-desktop whatsapp-for-linux
pkgs.zulip
pkgs.fractal
pkgs.obs-studio element-desktop
zulip
fractal
pkgs.krita obs-studio
pkgs.libreoffice krita
pkgs.hunspellDicts.en_US
pkgs.hunspellDicts.en_GB-ize libreoffice
]; ;
inherit (pkgs.hunspellDicts)
en_US
en_GB-ize
;
};
} }

14
modules/common/python.nix
View file

@ -1,6 +1,10 @@
{ pkgs, ... }: { { lib, pkgs, ... }: let
environment.systemPackages = [ inherit (lib) attrValues;
pkgs.python314 in {
pkgs.uv environment.systemPackages = attrValues {
]; inherit (pkgs)
python314
uv
;
};
} }

22
modules/common/rust.nix
View file

@ -1,18 +1,24 @@
{ pkgs, ... }: { { lib, pkgs, ... }: let
inherit (lib) attrValues;
in {
environment.variables.CARGO_NET_GIT_FETCH_WITH_CLI = "true"; environment.variables.CARGO_NET_GIT_FETCH_WITH_CLI = "true";
environment.systemPackages = [ environment.systemPackages = attrValues {
pkgs.cargo-expand inherit (pkgs)
pkgs.cargo-fuzz cargo-expand
cargo-fuzz
pkgs.evcxr evcxr
(pkgs.fenix.complete.withComponents [ taplo
;
fenix = pkgs.fenix.complete.withComponents [
"cargo" "cargo"
"clippy" "clippy"
"rust-src" "rust-src"
"rustc" "rustc"
"rustfmt" "rustfmt"
]) ];
]; };
} }

20
modules/linux/fonts.nix
View file

@ -1,5 +1,5 @@
{ config, lib, pkgs, ... }: let { config, lib, pkgs, ... }: let
inherit (lib) disabled merge mkIf; inherit (lib) attrValues disabled merge mkIf;
in merge in merge
(mkIf config.isDesktop { (mkIf config.isDesktop {
@ -9,15 +9,17 @@ in merge
packages = [ pkgs.terminus_font ]; packages = [ pkgs.terminus_font ];
}; };
fonts.packages = [ fonts.packages = attrValues {
config.theme.font.sans.package sans = config.theme.font.sans.package;
config.theme.font.mono.package mono = config.theme.font.mono.package;
pkgs.noto-fonts inherit (pkgs)
pkgs.noto-fonts-cjk-sans noto-fonts
pkgs.noto-fonts-lgc-plus noto-fonts-cjk-sans
pkgs.noto-fonts-emoji noto-fonts-lgc-plus
]; noto-fonts-emoji
;
};
}) })
(mkIf config.isServer { (mkIf config.isServer {

28
modules/linux/hyprland/hyprland.nix
View file

@ -1,5 +1,5 @@
{ config, lib, pkgs, ... }: let { config, lib, pkgs, ... }: let
inherit (lib) enabled merge mkIf flatten range; inherit (lib) attrValues enabled merge mkIf flatten range;
in merge <| mkIf config.isDesktop { in merge <| mkIf config.isDesktop {
hardware.graphics = enabled; hardware.graphics = enabled;
@ -19,18 +19,20 @@ in merge <| mkIf config.isDesktop {
programs.xwayland = enabled; programs.xwayland = enabled;
environment.systemPackages = [ environment.systemPackages = attrValues {
pkgs.brightnessctl inherit (pkgs)
pkgs.grim brightnessctl
# pkgs.hyprpicker grim
pkgs.slurp hyprpicker
pkgs.swappy slurp
pkgs.swaybg swappy
pkgs.wl-clipboard swaybg
pkgs.wtype wl-clipboard
pkgs.xdg-utils wtype
pkgs.xwaylandvideobridge xdg-utils
]; xwaylandvideobridge
;
};
home-manager.sharedModules = [{ home-manager.sharedModules = [{
xdg.configFile."xkb/symbols/tr-swapped-i".text = '' xdg.configFile."xkb/symbols/tr-swapped-i".text = ''

10
modules/linux/steam.nix
View file

@ -1,10 +1,12 @@
{ config, pkgs, lib, ... }: let { config, pkgs, lib, ... }: let
inherit (lib) merge mkIf; inherit (lib) attrValues merge mkIf;
in merge <| mkIf config.isDesktop { in merge <| mkIf config.isDesktop {
# Steam uses 32-bit drivers for some unholy fucking reason. # Steam uses 32-bit drivers for some unholy fucking reason.
hardware.graphics.enable32Bit = true; hardware.graphics.enable32Bit = true;
environment.systemPackages = [ environment.systemPackages = attrValues {
pkgs.steam inherit (pkgs)
]; steam
;
};
} }

31
modules/linux/thunar.nix
View file

@ -1,18 +1,25 @@
{ config, lib, pkgs, ... }: let { config, lib, pkgs, ... }: let
inherit (lib) enabled merge mkIf; inherit (lib) attrValues enabled merge mkIf;
in merge <| mkIf config.isDesktop { in merge <| mkIf config.isDesktop {
programs.thunar = enabled { programs.thunar = enabled {
plugins = [ plugins = attrValues {
pkgs.xfce.thunar-archive-plugin inherit (pkgs.xfce)
pkgs.xfce.thunar-media-tags-plugin thunar-archive-plugin
pkgs.xfce.thunar-volman thunar-media-tags-plugin
]; thunar-volman
;
};
}; };
environment.systemPackages = [ environment.systemPackages = attrValues {
pkgs.ark inherit (pkgs)
pkgs.ffmpegthumbnailer ark
pkgs.libgsf ffmpegthumbnailer
pkgs.xfce.tumbler libgsf
]; ;
inherit (pkgs.xfce)
tumbler
;
};
} }