[NixOS] Make module splits make a lot more sense.

This commit is contained in:
Ivan Malison 2023-06-29 00:06:52 -06:00
parent 006b8d8433
commit 7ff7e8b5a2
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
10 changed files with 3 additions and 185 deletions

View File

@ -1,146 +0,0 @@
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
# Applications
alacritty
gnome.cheese
dfeet
discord
emacs
firefox
gitter
google-chrome
hexchat
keybase-gui
kitty
kleopatra
libreoffice
lxappearance
okular
quassel
slack
simplescreenrecorder
spotify
transmission-gtk
vlc
xfce.thunar
wire-desktop
yubikey-manager
zoom-us
# Appearance
libsForQt5.breeze-gtk
gnome.adwaita-icon-theme
hicolor-icon-theme
materia-theme
numix-icon-theme-circle
papirus-icon-theme
# plasma5.breeze-gtk
# plasma5.breeze-qt5
# Desktop
autorandr
betterlockscreen
blueman
clipit
feh
gnome.gpaste
libnotify
lxqt.lxqt-powermanagement
networkmanagerapplet
notify-osd-customizable
pasystray
picom
pinentry
pommed_light
rofi
rofi-pass
rofi-systemd
skippy-xd
synergy
udiskie
volnoti
# xorg
wmctrl
xclip
xdotool
xorg.xev
xorg.xkbcomp
xorg.xwininfo
xsettingsd
# Audio
pulsemixer
pavucontrol
playerctl
# Tools
automake
bind
binutils
cmake
dex
direnv
dpkg
fd
file
gcc
gdb
gitAndTools.git-crypt
gitAndTools.git-extras
gitAndTools.git-fame
gitAndTools.git-sync
gitAndTools.hub
gitFull
glxinfo
gnumake
gnupg
gparted
htop
inetutils
inotify-tools
ispell
jq
libtool
lsof
mercurial
ncdu
neofetch
openvpn
parallel
pass
patchelf
pciutils
plasma-workspace
pijul
powertop
prometheus
pscircle
pstree
qt5.qttools
rcm
# rr
scrot
silver-searcher
stow
subversion
swig
tmux
tzupdate
unzip
usbutils
valgrind
wget
yubikey-manager
rustup
# Nix
nix-prefetch-git
# cachix
# Miscellaneous
android-udev-rules
librsvg
];
}

View File

@ -1,9 +0,0 @@
{
nix = {
binaryCaches = [
"https://cache.nixos.org/"
];
binaryCachePublicKeys = [
];
};
}

View File

@ -1,13 +0,0 @@
{
nix.settings = {
trusted-binary-caches = [ https://nix.oregon.dfinity.build ];
trusted-public-keys = [
"hydra.oregon.dfinity.build-2:KMTixHrh9DpAjF/0xU/49VEtNuGzQ71YaVIUSOLUaCM="
"cache.dfinity.systems-1:IcOn/2SVyPGOi8i3hKhQOlyiSQotiOBKwTFmyPX5YNw="
];
};
networking.extraHosts =
''
10.20.12.55 nix.oregon.dfinity.build
'';
}

View File

@ -1,14 +1,11 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ imports = [
./all.nix
./android.nix ./android.nix
./base.nix ./arm-incompatible.nix
# ./cachix.nix ./games.nix
./code.nix ./code.nix
./essential-no-arm.nix
./extra.nix ./extra.nix
./internet-computer.nix ./internet-computer.nix
./dfinity.nix
]; ];
} }

View File

@ -7,6 +7,5 @@
boot.extraModulePackages = with pkgs; [ boot.extraModulePackages = with pkgs; [
xboxdrv xboxdrv
]; ];
# hardware.xpadneo.enable = true;
hardware.xone.enable = true; hardware.xone.enable = true;
} }

View File

@ -13,10 +13,6 @@ inputs: { pkgs, config, ... }: {
forwardAgent = true; forwardAgent = true;
}; };
# programs.zsh = {
# enable = true;
# };
services.xscreensaver = { services.xscreensaver = {
enable = true; enable = true;
}; };

View File

@ -6,8 +6,6 @@
{ {
imports = [ imports = [
../full.nix ../full.nix
../extra.nix
../dfinity.nix
]; ];
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;

View File

@ -1,9 +1,7 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
imports = [ imports = [
../base.nix ../full.nix
../essential-no-arm.nix
../desktop.nix
../kat.nix ../kat.nix
]; ];

View File

@ -2,9 +2,7 @@
{ {
imports = [ imports = [
../users.nix
../full.nix ../full.nix
../dfinity.nix
../games.nix ../games.nix
../essential.nix ../essential.nix
../desktop.nix ../desktop.nix