aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.nix14
1 files changed, 6 insertions, 8 deletions
diff --git a/flake.nix b/flake.nix
index 855e364..08b8c04 100644
--- a/flake.nix
+++ b/flake.nix
@@ -57,6 +57,7 @@
];
commonModules = [
+ flatpaks.nixosModules.nix-flatpak
home-manager.nixosModules.home-manager
{
home-manager = {
@@ -75,6 +76,7 @@
./modules/bluetooth
./modules/common
./modules/doas
+ ./modules/flatpak-base
./modules/fonts
./modules/gnupg
./modules/i18n
@@ -95,11 +97,10 @@
pad = mkHost {
hostPath = ./hosts/pad;
extraModules = commonModules ++ [
- flatpaks.nixosModules.nix-flatpak
./modules/1password
./modules/adguard
./modules/cinnamon
- ./modules/flatpak
+ ./modules/flatpak-extra
./modules/intel
./modules/nginx
./modules/searx
@@ -116,6 +117,7 @@
./home-manager/kanshi
./home-manager/mail
./home-manager/nextcloud
+ ./home-manager/packages
./home-manager/ssh-agent
./home-manager/zsh
];
@@ -128,13 +130,12 @@
station = mkHost {
hostPath = ./hosts/station;
extraModules = commonModules ++ [
- flatpaks.nixosModules.nix-flatpak
./modules/1password
./modules/adguard
./modules/amd
./modules/calibre
./modules/cinnamon
- ./modules/flatpak
+ ./modules/flatpak-extra
./modules/monero
./modules/nginx
./modules/ollama
@@ -152,6 +153,7 @@
./home-manager/gtk
./home-manager/mail
./home-manager/nextcloud
+ ./home-manager/packages
./home-manager/ssh-agent
./home-manager/zsh
];
@@ -164,11 +166,8 @@
work = mkHost {
hostPath = ./hosts/work;
extraModules = commonModules ++ [
- flatpaks.nixosModules.nix-flatpak
- ./modules/1password
./modules/adguard
./modules/cinnamon
- ./modules/flatpak
./modules/nginx
./modules/nvidia
./modules/ollama
@@ -177,7 +176,6 @@
home-manager = {
users.aethrvmn = {
imports = [
- ./home-manager/browser
./home-manager/dotfiles
./home-manager/fish
./home-manager/git
Directive (EU) 2019/790, Article 4(3); all rights regarding Text and Data Mining (TDM) are reserved.