refactor: biggest cleanup of my life

nixos/base/default.nix

@@ -1,41 +1,26 @@
 {
   inputs,
-  outputs,
-}:
-{
   lib,
-  config,
   pkgs,
   ...
 }:
 {
   imports = [
-    outputs.nixosModules
+    ./fish.nix
+    ./firefox.nix
+    ./hyprland.nix
+    ./ly.nix
   ];
 
-  nixpkgs = {
-    overlays = [
-      outputs.overlays.additions
-      outputs.overlays.modifications
-      outputs.overlays.unstable-packages
-    ];
-    config = {
-      allowUnfree = true;
-    };
-  };
-
   nix =
     let
       flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
     in
     {
       settings = {
-        # Enable flakes and new 'nix' command
         experimental-features = "nix-command flakes";
         # Opinionated: disable global registry
         flake-registry = "";
-        # Workaround for https://github.com/NixOS/nix/issues/9574
-        nix-path = config.nix.nixPath;
       };
       # Opinionated: disable channels
       channel.enable = false;

nixos/base/firefox.nix

@@ -0,0 +1,10 @@
+{
+  config,
+  lib,
+  ...
+}:
+{
+  config = lib.mkIf config.kekleo.graphical {
+    programs.firefox.enable = true;
+  };
+}

nixos/base/fish.nix

@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+{
+  programs.bash = {
+    interactiveShellInit = ''
+      if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
+      then
+        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
+        exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+      fi
+    '';
+  };
+  programs.fish.enable = true;
+}

nixos/base/hyprland.nix

@@ -0,0 +1,10 @@
+{
+  config,
+  lib,
+  ...
+}:
+{
+  config = lib.mkIf config.kekleo.graphical {
+    programs.hyprland.enable = true;
+  };
+}

nixos/base/ly.nix

@@ -0,0 +1,10 @@
+{
+  config,
+  lib,
+  ...
+}:
+{
+  config = lib.mkIf config.kekleo.graphical {
+    services.displayManager.ly.enable = true;
+  };
+}

nixos/desktop/default.nix

@@ -1,11 +1,5 @@
-{
-  inputs,
-  outputs,
-  ...
-}:
 {
   imports = [
-    (import ../base.nix { inherit inputs outputs; })
     ./hardware-configuration.nix
   ];
 

nixos/server/config.nix

@@ -1,6 +0,0 @@
-{
-  kekleo.graphical = false;
-  kekleo.publicKeys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOsLFjdS9JEcgBPa6NvOzpJp8coJPJwJFuM+PQCZ8brl leonhard"
-  ];
-}

nixos/server/default.nix

@@ -1,19 +1,19 @@
 {
-  inputs,
-  outputs,
   config,
   ...
 }:
 {
   imports = [
-    (import ../base.nix { inherit inputs outputs; })
     ./hardware-configuration.nix
-    ./config.nix
-    inputs.sops-nix.nixosModules.sops
     ./secrets
     ./dyndns
   ];
 
+  kekleo.graphical = false;
+  kekleo.publicKeys = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOsLFjdS9JEcgBPa6NvOzpJp8coJPJwJFuM+PQCZ8brl leonhard"
+  ];
+
   users.users.leonhard = {
     initialPassword = "leonhard";
     isNormalUser = true;