Lillian-Violet/NixOS-Config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Refactor a bit by adding globally shared packages in one file

Browse source
This commit is contained in:
Lillian Violet 2024-01-30 12:03:29 +01:00
parent d111828131
commit 7e7baef730
4 changed files with 43 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
nixos/desktop/configuration.nix
View file

@ -9,7 +9,11 @@
... ...
}: { }: {
imports = [ imports = [
# Import locale settings
../shared/locale/configuration.nix ../shared/locale/configuration.nix
# Import shared packages
../../shared/packages/configuration.nix
]; ];
nixpkgs = { nixpkgs = {
# You can add overlays here # You can add overlays here
@ -59,23 +63,12 @@
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Custom tools
dvd
dvt
# System tools # System tools
age
alejandra
direnv direnv
docker docker
docker-compose docker-compose
git-filter-repo git-filter-repo
home-manager
htop
oh-my-zsh
pciutils pciutils
rsync
wget
waydroid waydroid
xwaylandvideobridge xwaylandvideobridge
zsh zsh
@ -92,11 +85,6 @@
libsForQt5.packagekit-qt libsForQt5.packagekit-qt
libportal-qt5 libportal-qt5
# System libraries
noto-fonts
noto-fonts-emoji-blob-bin
noto-fonts-emoji
# User tools # User tools
noisetorch noisetorch
]; ];

15
nixos/hosts/queen/configuration.nix
View file

@ -21,6 +21,9 @@
# Import locale settings # Import locale settings
../../shared/locale/configuration.nix ../../shared/locale/configuration.nix
# Import shared packages
../../shared/packages/configuration.nix
#../../server/package-configs/akkoma/configuration.nix #../../server/package-configs/akkoma/configuration.nix
../../server/package-configs/forgejo/configuration.nix ../../server/package-configs/forgejo/configuration.nix
../../server/package-configs/gotosocial/configuration.nix ../../server/package-configs/gotosocial/configuration.nix
@ -88,12 +91,10 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
akkoma akkoma
age
fzf fzf
matrix-conduit matrix-conduit
docker docker
docker-compose docker-compose
git
gitea gitea
gotosocial gotosocial
alejandra alejandra
@ -101,22 +102,14 @@
imagemagick imagemagick
ffmpeg ffmpeg
aria2 aria2
git-filter-repo
home-manager
htop
jellyfin jellyfin
jellyfin-web jellyfin-web
jellyfin-ffmpeg jellyfin-ffmpeg
nextcloud28 nextcloud28
nginx nginx
noto-fonts
noto-fonts-emoji-blob-bin
noto-fonts-emoji
oh-my-zsh
onlyoffice-documentserver onlyoffice-documentserver
postgresql_16 postgresql_16
python3 python3
rsync
rabbitmq-server rabbitmq-server
roundcube roundcube
roundcubePlugins.contextmenu roundcubePlugins.contextmenu
@ -125,8 +118,6 @@
roundcubePlugins.persistent_login roundcubePlugins.persistent_login
roundcubePlugins.thunderbird_labels roundcubePlugins.thunderbird_labels
youtube-dl youtube-dl
wget
zsh
]; ];
# Enable networking # Enable networking

5
nixos/hosts/wheatley/configuration.nix
View file

@ -14,7 +14,12 @@
./armv7l.nix ./armv7l.nix
./hardware-configuration.nix ./hardware-configuration.nix
# Import locale settings
../../shared/locale/configuration.nix ../../shared/locale/configuration.nix
# Import shared packages
../../shared/packages/configuration.nix
]; ];
boot.loader.generic-extlinux-compatible.enable = true; boot.loader.generic-extlinux-compatible.enable = true;

31
nixos/shared/packages/configuration.nix Normal file
View file

@ -0,0 +1,31 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
environment.systemPackages = with pkgs; [
# Custom tools
dvd
dvt
# System tools
age
git
git-filter-repo
home-manager
htop
neofetch
oh-my-zsh
rsync
wget
zsh
# System libraries
noto-fonts
noto-fonts-emoji-blob-bin
noto-fonts-emoji
];
}