From e0ca2aa3bfa182654d7fa82e6490486fd9e95d43 Mon Sep 17 00:00:00 2001 From: kenji Date: Wed, 13 Aug 2025 09:11:03 -0500 Subject: [PATCH] organized --- config.nix | 4 +--- hosts/hakase/configuration.nix | 14 -------------- modules/default/apps.nix | 11 +++++++++++ modules/home/apps.nix | 10 +++++++++- 4 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 modules/default/apps.nix diff --git a/config.nix b/config.nix index 23dcccc..a782d0a 100644 --- a/config.nix +++ b/config.nix @@ -29,13 +29,11 @@ packages = pkgs: with pkgs; [ jellyfin-media-player - usbutils - pciutils + delfin goverlay geekbench_6 gparted ntfs3g - todoist feishin discord xfce.thunar diff --git a/hosts/hakase/configuration.nix b/hosts/hakase/configuration.nix index 8e6932d..9339292 100644 --- a/hosts/hakase/configuration.nix +++ b/hosts/hakase/configuration.nix @@ -21,20 +21,6 @@ i18n.defaultLocale = "en_US.UTF-8"; time.timeZone = "${myConfig.nixos.Timezone}"; - environment.systemPackages = with pkgs; [ - heroic - pavucontrol - wl-clipboard - delfin - fcitx5 - protontricks - fcitx5-mozc-ut - kdePackages.fcitx5-configtool - wget - solaar - dualsensectl - ]; - console = { earlySetup = false; font = "${pkgs.terminus_font}/share/consolefonts/ter-132n.psf.gz"; diff --git a/modules/default/apps.nix b/modules/default/apps.nix new file mode 100644 index 0000000..3d5a32d --- /dev/null +++ b/modules/default/apps.nix @@ -0,0 +1,11 @@ +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + usbutils + pciutils + pavucontrol + wget + dualsensectl + protontricks + wl-clipboard + ]; +} diff --git a/modules/home/apps.nix b/modules/home/apps.nix index c5f21ea..dfd94e8 100644 --- a/modules/home/apps.nix +++ b/modules/home/apps.nix @@ -1,5 +1,13 @@ -{ +{pkgs, ...}: { imports = [ ../../packages/firefox/home.nix ]; + + home.packages = with pkgs; [ + heroic + fcitx5 + fcitx5-mozc-ut + kdePackages.fcitx5-configtool + solaar + ]; }