make use of systemPackage

nixos
Moritz Böhme 2022-10-06 20:32:21 +02:00
parent aa42f6678e
commit 85de3b3ac6
Signed by: moritz
GPG Key ID: 970C6E89EB0547A9
8 changed files with 97 additions and 103 deletions

View File

@ -85,7 +85,6 @@ with lib; {
thunar.enable = true; thunar.enable = true;
zathura.enable = true; zathura.enable = true;
}; };
services = { services = {
dunst.enable = true; dunst.enable = true;
kdeconnect.enable = true; kdeconnect.enable = true;

View File

@ -80,16 +80,15 @@ in
WantedBy = [ "graphical-session.target" ]; WantedBy = [ "graphical-session.target" ];
}; };
}; };
home.packages = with pkgs; [
bc # HACK to get bsp-layout to work
brightnessctl
bsp-layout
feh
pamixer
playerctl
synology-drive-client
];
}; };
environment.systemPackages = with pkgs; [
bc # HACK to get bsp-layout to work
brightnessctl
bsp-layout
feh
pamixer
playerctl
synology-drive-client
];
}; };
} }

View File

@ -24,78 +24,76 @@ in
emacs = "emacsclient -t -a 'emacs -t'"; emacs = "emacsclient -t -a 'emacs -t'";
}; };
fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ]; fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ];
environment.systemPackages = with pkgs; [
### Emacs itself
binutils # native-comp needs 'as', provided by this
myEmacs
### Doom dependencies
git
(ripgrep.override { withPCRE2 = true; })
gnutls # for TLS connectivity
### Optional dependencies
fd # faster projectile indexing
imagemagick # for image-dired
zstd # for undo-fu-session/undo-tree compression
### Module dependencies
## :checkers
# spell
(hunspellWithDicts [
hunspellDicts.en_GB-ize
hunspellDicts.en_US
hunspellDicts.de_DE
])
# grammar
languagetool
## : tools
# lookup & org +roam
sqlite
gcc # HACK to get emacsqlite binary
wordnet
graphviz
## :lang
# latex & org (latex previews)
stable.texlive.combined.scheme-full # HACK to fix broken perl package
texlab
# nix
nixfmt # for formating nix
rnix-lsp
# markdown & org +pandoc
pandoc
# python
nodePackages.pyright
# sh
nodePackages.bash-language-server
## :email
# mu4e
mu
isync
## :app
# everywhere
xdotool
xorg.xwininfo
xclip
xorg.xprop
];
home-manager.users.moritz = { home-manager.users.moritz = {
home.sessionPath = [ "/home/moritz/.config/emacs/bin/" ]; home.sessionPath = [ "/home/moritz/.config/emacs/bin/" ];
services.emacs = { services.emacs = {
enable = true; enable = true;
package = myEmacs; package = myEmacs;
}; };
home.packages = with pkgs; [
### Emacs itself
binutils # native-comp needs 'as', provided by this
myEmacs
### Doom dependencies
git
(ripgrep.override { withPCRE2 = true; })
gnutls # for TLS connectivity
### Optional dependencies
fd # faster projectile indexing
imagemagick # for image-dired
zstd # for undo-fu-session/undo-tree compression
### Module dependencies
## :checkers
# spell
(hunspellWithDicts [
hunspellDicts.en_GB-ize
hunspellDicts.en_US
hunspellDicts.de_DE
])
# grammar
languagetool
## : tools
# lookup & org +roam
sqlite
gcc # HACK to get emacsqlite binary
wordnet
graphviz
## :lang
# latex & org (latex previews)
stable.texlive.combined.scheme-full # HACK to fix broken perl package
texlab
# nix
nixfmt # for formating nix
rnix-lsp
# markdown & org +pandoc
pandoc
# python
nodePackages.pyright
# sh
nodePackages.bash-language-server
## :email
# mu4e
mu
isync
## :app
# everywhere
xdotool
xorg.xwininfo
xclip
xorg.xprop
];
}; };
}; };
} }

View File

@ -25,6 +25,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
# set as default shell # set as default shell
users.users.moritz.shell = pkgs.fish; users.users.moritz.shell = pkgs.fish;
environment.systemPackages = with pkgs.fishPlugins; [ fzf-fish pisces ];
# needed for nix completions # needed for nix completions
programs.fish.enable = true; programs.fish.enable = true;
@ -88,7 +89,6 @@ in
fzf.enableFishIntegration = true; fzf.enableFishIntegration = true;
starship.enableFishIntegration = true; starship.enableFishIntegration = true;
}; };
home.packages = with pkgs.fishPlugins; [ fzf-fish pisces ];
}; };
}; };
} }

View File

@ -35,26 +35,24 @@ in
reg = "ledger reg -R -V --tail 15"; reg = "ledger reg -R -V --tail 15";
}; };
}; };
environment.systemPackages = with pkgs; let
reg-copy = writeShellApplication {
name = "reg-copy";
runtimeInputs = [ ledger xclip ];
text = ''
table="$(printf '%-10s %-30s %8s %8s\n' Datum Beschreibung Einzeln Gesamt && ledger reg -V --format '%10D %.30P %8t %8T\n' "$@")"
echo "$table"
echo "$table" | xclip -selection clipboard
'';
};
in
[ ledger reg-copy hledger hledger-ui hledger-web ];
home-manager.users.moritz = { home-manager.users.moritz = {
home.packages = with pkgs; let xdg.configFile = {
reg-copy = writeShellApplication { "fish/completions/ledger.fish" = {
name = "reg-copy"; text = builtins.readFile ./ledger.fish;
runtimeInputs = [ ledger xclip ];
text = ''
table="$(printf '%-10s %-30s %8s %8s\n' Datum Beschreibung Einzeln Gesamt && ledger reg -V --format '%10D %.30P %8t %8T\n' "$@")"
echo "$table"
echo "$table" | xclip -selection clipboard
'';
};
in
[ ledger reg-copy hledger hledger-ui hledger-web ];
home-manager.users.moritz = {
xdg.configFile = {
"fish/completions/ledger.fish" = {
text = builtins.readFile ./ledger.fish;
};
}; };
}; };
}; };

View File

@ -52,6 +52,11 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [
(lib.mkIf config.networking.networkmanager.enable networkmanager_dmenu)
(lib.mkIf config.hardware.bluetooth.enable rofi-bluetooth)
rofi-power-menu
];
home-manager.users.moritz = { home-manager.users.moritz = {
programs.rofi = { programs.rofi = {
enable = true; enable = true;
@ -59,11 +64,6 @@ in
pkgs.rofi.override { plugins = with pkgs; [ rofi-calc rofi-emoji ]; }; pkgs.rofi.override { plugins = with pkgs; [ rofi-calc rofi-emoji ]; };
extraConfig = { combi-modi = "drun,window,emoji"; }; extraConfig = { combi-modi = "drun,window,emoji"; };
}; };
home.packages = with pkgs; [
(lib.mkIf config.networking.networkmanager.enable networkmanager_dmenu)
(lib.mkIf config.hardware.bluetooth.enable rofi-bluetooth)
rofi-power-menu
];
xdg = { xdg = {
enable = true; enable = true;
configFile."networkmanager-dmenu/config.ini".text = '' configFile."networkmanager-dmenu/config.ini".text = ''

View File

@ -22,8 +22,8 @@ in
file = ../../secrets/spotifyd.age; file = ../../secrets/spotifyd.age;
owner = "1000"; owner = "1000";
}; };
environment.systemPackages = with pkgs; [ spotify-tui sptlrx ];
home-manager.users.moritz = { home-manager.users.moritz = {
home.packages = with pkgs; [ spotify-tui sptlrx ];
services.spotifyd = { services.spotifyd = {
enable = true; enable = true;
package = pkgs.spotifyd.override { withMpris = true; }; package = pkgs.spotifyd.override { withMpris = true; };

View File

@ -22,7 +22,7 @@ in
enable = true; enable = true;
package = pkgs.libvirt; package = pkgs.libvirt;
}; };
home-manager.users.moritz.home.packages = with pkgs; [ virt-manager ]; environment.systemPackages = with pkgs; [ virt-manager ];
users.users.moritz.extraGroups = [ "libvirtd" ]; users.users.moritz.extraGroups = [ "libvirtd" ];
}; };
} }