nix
/
System
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move more packages into home manager

This commit is contained in:
nathan mccarty 2022-07-03 00:40:04 -04:00
parent 0693bca452
commit 481cde91d9
Signed by: thatonelutenist
GPG Key ID: D70DA3DD4D1E9F96
4 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
home-manager/default.nix
View File

@ -31,6 +31,8 @@ with lib; with nLib; {
# Programs
programs = {
util = {
# Core utilites
core = mkEnableOptionT "core";
# Ssh configuration, enabled by default
ssh = mkEnableOptionT "ssh";
# Fish configuration, enabled by default
@ -38,12 +40,14 @@ with lib; with nLib; {
# Git configuration, enabled by default
git = {
enable = mkEnableOptionT "git";
gpgSign = mkEnableOptionT "git signatures";
gpgSign = mkDefaultOption "git signatures" config.nathan.config.isDesktop;
};
# Bat configuration, enabled by default
bat = mkEnableOptionT "bat";
# JSON Utilities, enabled by default
json = mkEnableOptionT "json";
# Productivity application
productivity = mkDefaultOption "Productivity applications" config.nathan.config.isDesktop;
};
# Swaywm and supoorting application configuration
swaywm = {

44
home-manager/programs/core.nix
View File

@ -2,6 +2,50 @@
with lib;
{
config = mkMerge [
(mkIf config.nathan.programs.util.core {
home.packages = with pkgs; [
# Rust rewrites of common shell utilites
exa
bat
fd
sd
du-dust
ripgrep
ripgrep-all
hyperfine
bottom
dogdns
duf
# User friendly cut
choose
# Man but terse
tealdeer
];
})
(mkIf config.nathan.programs.util.productivity {
home.packages = with pkgs; [
# Feh image viewer
feh
tokei
# Spell check
hunspell
hunspellDicts.en-us
# CLI Markdown renderer
glow
# Command line file manager
broot
# Much better curl
httpie
# CLI spreadsheets
visidata
# Cheatsheet manager
cheat
# Ping with a graph
gping
# Pandoc for documentation
pandoc
];
})
(mkIf config.nathan.programs.util.git.enable {
#########################
## Git configuration

3
modules/default.nix
View File

@ -75,9 +75,6 @@ in
# Core utililtes I want on every system
# Enabled by default
core = mkEnableOptionT "utils-core";
# Productivity utilites that make sense for a desktop
# Enabled by default on desktop
productivity = mkDefaultOption "utils-productivity" config.nathan.config.isDesktop;
# Enable multi system emulation
# Enabled by default on desktop
binfmt = mkDefaultOption "utils-productivity" config.nathan.config.isDesktop;

41
modules/programs/utils.nix
View File

@ -15,23 +15,6 @@ with lib;
unzip
any-nix-shell
htop
# Rust rewrites of common shell utilities
starship
exa
bat
fd
sd
du-dust
ripgrep
ripgrep-all
hyperfine
bottom
dogdns
duf
# User friendly cut
choose
# Man but terse
tealdeer
# For nslookup
dnsutils
# Mosh for better high-latency ssh
@ -40,30 +23,6 @@ with lib;
pv
];
})
(mkIf nathan.programs.utils.productivity {
environment.systemPackages = with pkgs; [
# Feh image viewer
feh
tokei
# Spell check
hunspell
hunspellDicts.en-us
# CLI Markdown renderer
glow
# Command line file manager
broot
# Much better curl
httpie
# CLI spreadsheets
visidata
# Cheatsheet manager
cheat
# Ping with a graph
gping
# Pandoc for documentation
pandoc
];
})
(mkIf nathan.programs.utils.binfmt {
boot.binfmt.emulatedSystems = [
"aarch64-linux"