From 7ff7e8b5a25c94d9767eb25530710547ad351eb9 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 29 Jun 2023 00:06:52 -0600 Subject: [PATCH] [NixOS] Make module splits make a lot more sense. --- nixos/all.nix | 146 ------------------ ...ential-no-arm.nix => arm-incompatible.nix} | 0 nixos/cachix.nix | 9 -- nixos/dfinity.nix | 13 -- nixos/full.nix | 7 +- nixos/games.nix | 1 - nixos/home-manager.nix | 4 - nixos/machines/ivanm-dfinity-razer.nix | 2 - nixos/machines/nixquick.nix | 4 +- nixos/machines/ryzen-shine.nix | 2 - 10 files changed, 3 insertions(+), 185 deletions(-) delete mode 100644 nixos/all.nix rename nixos/{essential-no-arm.nix => arm-incompatible.nix} (100%) delete mode 100644 nixos/cachix.nix delete mode 100644 nixos/dfinity.nix diff --git a/nixos/all.nix b/nixos/all.nix deleted file mode 100644 index e86e7103..00000000 --- a/nixos/all.nix +++ /dev/null @@ -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 - ]; -} diff --git a/nixos/essential-no-arm.nix b/nixos/arm-incompatible.nix similarity index 100% rename from nixos/essential-no-arm.nix rename to nixos/arm-incompatible.nix diff --git a/nixos/cachix.nix b/nixos/cachix.nix deleted file mode 100644 index 8167ccdb..00000000 --- a/nixos/cachix.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - nix = { - binaryCaches = [ - "https://cache.nixos.org/" - ]; - binaryCachePublicKeys = [ - ]; - }; -} diff --git a/nixos/dfinity.nix b/nixos/dfinity.nix deleted file mode 100644 index e1a1401c..00000000 --- a/nixos/dfinity.nix +++ /dev/null @@ -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 - ''; -} diff --git a/nixos/full.nix b/nixos/full.nix index 133468ac..54c0dc92 100644 --- a/nixos/full.nix +++ b/nixos/full.nix @@ -1,14 +1,11 @@ { pkgs, ... }: { imports = [ - ./all.nix ./android.nix - ./base.nix - # ./cachix.nix + ./arm-incompatible.nix + ./games.nix ./code.nix - ./essential-no-arm.nix ./extra.nix ./internet-computer.nix - ./dfinity.nix ]; } diff --git a/nixos/games.nix b/nixos/games.nix index 519ddcff..aba7ebb6 100644 --- a/nixos/games.nix +++ b/nixos/games.nix @@ -7,6 +7,5 @@ boot.extraModulePackages = with pkgs; [ xboxdrv ]; - # hardware.xpadneo.enable = true; hardware.xone.enable = true; } diff --git a/nixos/home-manager.nix b/nixos/home-manager.nix index 532fe12b..0544e308 100644 --- a/nixos/home-manager.nix +++ b/nixos/home-manager.nix @@ -13,10 +13,6 @@ inputs: { pkgs, config, ... }: { forwardAgent = true; }; - # programs.zsh = { - # enable = true; - # }; - services.xscreensaver = { enable = true; }; diff --git a/nixos/machines/ivanm-dfinity-razer.nix b/nixos/machines/ivanm-dfinity-razer.nix index 05c6b41a..09f7488e 100644 --- a/nixos/machines/ivanm-dfinity-razer.nix +++ b/nixos/machines/ivanm-dfinity-razer.nix @@ -6,8 +6,6 @@ { imports = [ ../full.nix - ../extra.nix - ../dfinity.nix ]; hardware.enableRedistributableFirmware = true; diff --git a/nixos/machines/nixquick.nix b/nixos/machines/nixquick.nix index 0bd892c7..0b59a94d 100644 --- a/nixos/machines/nixquick.nix +++ b/nixos/machines/nixquick.nix @@ -1,9 +1,7 @@ { config, lib, pkgs, ... }: { imports = [ - ../base.nix - ../essential-no-arm.nix - ../desktop.nix + ../full.nix ../kat.nix ]; diff --git a/nixos/machines/ryzen-shine.nix b/nixos/machines/ryzen-shine.nix index cc7abf4c..0031cc1d 100644 --- a/nixos/machines/ryzen-shine.nix +++ b/nixos/machines/ryzen-shine.nix @@ -2,9 +2,7 @@ { imports = [ - ../users.nix ../full.nix - ../dfinity.nix ../games.nix ../essential.nix ../desktop.nix