From 73142b1bdff9b46af6a25c2668481081674439db Mon Sep 17 00:00:00 2001 From: Julia Lange Date: Sun, 7 Apr 2024 17:14:00 -0700 Subject: [PATCH] Fix imports in refactor --- nixosModules/apps/default.nix | 2 +- nixosModules/apps/games/default.nix | 2 +- nixosModules/apps/shells/default.nix | 8 ++++++ nixosModules/default.nix | 2 +- nixosModules/services/default.nix | 2 +- nixosModules/services/networking/default.nix | 2 +- systems/jibril/default.nix | 24 +++++++--------- systems/onizuka/default.nix | 30 +++++++++----------- 8 files changed, 38 insertions(+), 34 deletions(-) create mode 100644 nixosModules/apps/shells/default.nix diff --git a/nixosModules/apps/default.nix b/nixosModules/apps/default.nix index b851878..8b3447d 100644 --- a/nixosModules/apps/default.nix +++ b/nixosModules/apps/default.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: { - import = [ + imports = [ ./games ./input-remapper ./librewolf diff --git a/nixosModules/apps/games/default.nix b/nixosModules/apps/games/default.nix index 3d6b374..905db78 100644 --- a/nixosModules/apps/games/default.nix +++ b/nixosModules/apps/games/default.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: { - import = [ + imports = [ ./anime-launcher ./steam ]; diff --git a/nixosModules/apps/shells/default.nix b/nixosModules/apps/shells/default.nix new file mode 100644 index 0000000..9169af8 --- /dev/null +++ b/nixosModules/apps/shells/default.nix @@ -0,0 +1,8 @@ +{ config, pkgs, lib, ... }: + +{ + imports = [ + ./fish + ./xonsh + ]; +} diff --git a/nixosModules/default.nix b/nixosModules/default.nix index e243737..a1d9d7b 100644 --- a/nixosModules/default.nix +++ b/nixosModules/default.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: { - import = [ + imports = [ ./apps ./services ]; diff --git a/nixosModules/services/default.nix b/nixosModules/services/default.nix index e797297..128d32b 100644 --- a/nixosModules/services/default.nix +++ b/nixosModules/services/default.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: { - import = [ + imports = [ ./graphics ./networking ./pipewire diff --git a/nixosModules/services/networking/default.nix b/nixosModules/services/networking/default.nix index 867600d..0da82d9 100644 --- a/nixosModules/services/networking/default.nix +++ b/nixosModules/services/networking/default.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: { - import = [ + imports = [ ./bluetooth ./wireless ]; diff --git a/systems/jibril/default.nix b/systems/jibril/default.nix index 8a342f8..8024813 100644 --- a/systems/jibril/default.nix +++ b/systems/jibril/default.nix @@ -9,20 +9,18 @@ nixpkgs.config.allowUnfree = true; system.stateVersion = "23.05"; - config = { - pipewire.enable = true; - polkit.enable = true; - bluetooth.enable = true; - wireless.enable = true; + pipewire.enable = true; + polkit.enable = true; + bluetooth.enable = true; + wireless.enable = true; - user.name = "pan"; - user.timezone = "America/Los_Angeles"; + user.name = "pan"; + user.timezone = "America/Los_Angeles"; - tuigreet.enable = true; - hyprland.enable = true; + tuigreet.enable = true; + hyprland.enable = true; - librewolf.enable = true; - xonsh.enable = true; - syncthing.enable = true; - }; + librewolf.enable = true; + xonsh.enable = true; + syncthing.enable = true; } diff --git a/systems/onizuka/default.nix b/systems/onizuka/default.nix index d602924..9a85e4a 100644 --- a/systems/onizuka/default.nix +++ b/systems/onizuka/default.nix @@ -9,24 +9,22 @@ nixpkgs.config.allowUnfree = true; system.stateVersion = "23.05"; - config = { - nvidia.enable = true; - pipewire.enable = true; - polkit.enable = true; + nvidia.enable = true; + pipewire.enable = true; + polkit.enable = true; - user.name = "pan"; - user.timezone = "America/Los_Angeles"; + user.name = "pan"; + user.timezone = "America/Los_Angeles"; - tuigreet.enable = true; - hyprland.enable = true; + tuigreet.enable = true; + hyprland.enable = true; - librewolf.enable = true; - xonsh.enable = true; - syncthing.enable = true; + librewolf.enable = true; + xonsh.enable = true; + syncthing.enable = true; - steam.enable = true; - aagl.enable = true; - aagl.honkai-rail = true; - input-remapper.enable = true; - }; + steam.enable = true; + aagl.enable = true; + aagl.honkai-rail = true; + input-remapper.enable = true; }