restructuring

configuration.nix

@@ -8,7 +8,7 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ./home.nix
+      ./rices/cwm.nix
     ];
 
   # Use the GRUB 2 boot loader.
@@ -45,7 +45,6 @@
 
   # Enable the X11 windowing system.
   services.xserver.enable = true;
-  services.xserver.displayManager.startx.enable = true;
 
   # use nix flakes
   nix = {
@@ -96,13 +95,13 @@
     "EDITOR" = "nvim";
   };
 
-  services.gnome3.gnome-keyring.enable = true;
+  services.gnome.gnome-keyring.enable = true;
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   fonts.fonts = with pkgs; [ jetbrains-mono dejavu_fonts ];
   environment.systemPackages = with pkgs; [
-    vim neovim neofetch tmux
+    vim neovim neofetch pfetch tmux
     fff
     nodejs shellcheck
     dash git

home.nix

@@ -1,11 +0,0 @@
-{ config, pkgs, ... }:
-let
-  home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
-in
-{
-  imports = [
-    (import "${home-manager}/nixos")
-  ];
-
-  home-manager.users.junikim = import ./rices/cwm.nix { inherit config pkgs; };
-}

rices/cwm.nix

@@ -1,5 +1,15 @@
-{ config, pkgs, ...}:
+{ config, pkgs, ... }:
+let
+  home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
+in
 {
+  imports = [
+    (import "${home-manager}/nixos")
+  ];
+
+  services.xserver.displayManager.startx.enable = true;
+
+  home-manager.users.junikim = {
     # Home Manager needs a bit of information about you and the
     # paths it should manage.
     home.username = "junikim";
@@ -70,4 +80,5 @@
       ".tmux.conf".source = ../dotfiles/tmux.conf;
       ".zshrc".source = ../dotfiles/zshrc;
     };
+  };
 }

rices/gnome.nix

@@ -1,5 +1,16 @@
-{ config, pkgs, ...}:
+{ config, pkgs, ... }:
+let
+  home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
+in
 {
+  imports = [
+    (import "${home-manager}/nixos")
+  ];
+
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
+
+  home-manager.users.junikim = {
     # Home Manager needs a bit of information about you and the
     # paths it should manage.
     home.username = "junikim";
@@ -18,7 +29,6 @@
     # Let Home Manager install and manage itself.
     programs.home-manager.enable = true;
 
-  services.xserver.desktopManager.gnome.enable = true;
 
     programs.starship.enable = true;
 
@@ -63,4 +73,5 @@
       ".tmux.conf".source = ../dotfiles/tmux.conf;
       ".zshrc".source = ../dotfiles/zshrc;
     };
+  };
 }