Reorganize profiles

machines/kholinar/default.nix

@@ -2,13 +2,12 @@
 
 {
   imports = [
-    <home-manager/nixos>
     ./hardware.nix
     ./secret.nix
     ../../configurations/eid.nix
-    ../../profiles/bluetooth/default.nix
+    ../../profiles/bluetooth.nix
-    ../../profiles/common/default.nix
+    ../../profiles/common.nix
-    ../../profiles/graphical/default.nix
+    ../../profiles/graphical.nix
   ];
 
   networking = {

machines/oldtown/default.nix

@@ -2,13 +2,12 @@
 
 {
   imports = [
-    <home-manager/nixos>
     ./hardware.nix
     ./secret.nix
     ../../configurations/eid.nix
-    ../../profiles/bluetooth/default.nix
+    ../../profiles/bluetooth.nix
-    ../../profiles/common/default.nix
+    ../../profiles/common.nix
-    ../../profiles/graphical/default.nix
+    ../../profiles/graphical.nix
   ];
 
   networking.hostName = "oldtown";

profiles/common.nix

@@ -0,0 +1,32 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    <home-manager/nixos>
+    ../modules/zfs.nix
+    ../overlays/default.nix
+    ../configurations/direnv.nix
+    ../configurations/git.nix
+    ../configurations/locale.nix
+    ../configurations/neovim.nix
+    ../configurations/nix-index.nix
+    ../configurations/nix-store.nix
+    ../configurations/ssh.nix
+    ../configurations/tmux.nix
+    ../configurations/users.nix
+    ../configurations/zsh.nix
+  ];
+
+  home-manager.users.charlotte = { pkgs, ... }: {
+    home.packages = with pkgs; [
+      htop
+      moreutils
+      ncdu
+      pass
+      ripgrep
+      unzip
+      youtube-dl
+    ];
+  };
+
+}

profiles/common/default.nix

@@ -1,31 +0,0 @@
-{ pkgs, ... }:
-
-{
-  imports = [
-    ../../modules/zfs.nix
-    ../../overlays/default.nix
-    ../../configurations/direnv.nix
-    ../../configurations/git.nix
-    ../../configurations/locale.nix
-    ../../configurations/neovim.nix
-    ../../configurations/nix-index.nix
-    ../../configurations/nix-store.nix
-    ../../configurations/ssh.nix
-    ../../configurations/tmux.nix
-    ../../configurations/users.nix
-    ../../configurations/zsh.nix
-  ];
-
-  home-manager.users.charlotte = { pkgs, ... }: {
-    home.packages = with pkgs; [
-      htop
-      moreutils
-      ncdu
-      pass
-      ripgrep
-      unzip
-      youtube-dl
-    ];
-  };
-
-}

profiles/graphical.nix

@@ -0,0 +1,55 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ../configurations/adb.nix
+    ../configurations/docker.nix
+    ../configurations/dropbox.nix
+    ../configurations/firefox.nix
+    ../configurations/fonts.nix
+    ../configurations/gnupg.nix
+    ../configurations/i3.nix
+    ../configurations/joplin.nix
+    ../configurations/kernel.nix
+    ../configurations/kitty.nix
+    ../configurations/mounts.nix
+    ../configurations/networkmanager.nix
+    ../configurations/sound.nix
+    ../configurations/sway.nix
+    ../configurations/syncthing.nix
+    ../configurations/teams.nix
+    ../configurations/themes.nix
+    ../configurations/thunderbird.nix
+    ../configurations/xdg-dirs.nix
+  ];
+
+  home-manager.users.charlotte = { pkgs, ... }: {
+    home.packages = with pkgs; [
+      chromium
+      citrix_workspace
+      deluge
+      google-chrome
+      hledger
+      libreoffice
+      mpv
+      mumble
+      okular
+      pavucontrol
+      ranger
+      slurp
+      sshfs
+      wf-recorder
+      wl-clipboard
+      zeroad
+    ];
+    programs.zsh.loginExtra = ''
+      if [[ -z "$DISPLAY" ]] && [[ $(tty) = "/dev/tty1" ]]; then
+        exec sway
+      fi
+
+      if [[ -z "$DISPLAY" ]] && [[ $(tty) = "/dev/tty2" ]]; then
+        exec startx
+      fi
+    '';
+  };
+}

profiles/graphical/default.nix

@@ -1,55 +0,0 @@
-{ pkgs, ... }:
-
-{
-  imports = [
-    ../../configurations/adb.nix
-    ../../configurations/docker.nix
-    ../../configurations/dropbox.nix
-    ../../configurations/firefox.nix
-    ../../configurations/fonts.nix
-    ../../configurations/gnupg.nix
-    ../../configurations/i3.nix
-    ../../configurations/joplin.nix
-    ../../configurations/kernel.nix
-    ../../configurations/kitty.nix
-    ../../configurations/mounts.nix
-    ../../configurations/networkmanager.nix
-    ../../configurations/sound.nix
-    ../../configurations/sway.nix
-    ../../configurations/syncthing.nix
-    ../../configurations/teams.nix
-    ../../configurations/themes.nix
-    ../../configurations/thunderbird.nix
-    ../../configurations/xdg-dirs.nix
-  ];
-
-  home-manager.users.charlotte = { pkgs, ... }: {
-    home.packages = with pkgs; [
-      chromium
-      citrix_workspace
-      deluge
-      google-chrome
-      hledger
-      libreoffice
-      mpv
-      mumble
-      okular
-      pavucontrol
-      ranger
-      slurp
-      sshfs
-      wf-recorder
-      wl-clipboard
-      zeroad
-    ];
-    programs.zsh.loginExtra = ''
-      if [[ -z "$DISPLAY" ]] && [[ $(tty) = "/dev/tty1" ]]; then
-        exec sway
-      fi
-
-      if [[ -z "$DISPLAY" ]] && [[ $(tty) = "/dev/tty2" ]]; then
-        exec startx
-      fi
-    '';
-  };
-}