diff --git a/configuration.nix b/configuration.nix
index 33d6863..d26664c 100644
--- a/configuration.nix
+++ b/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
diff --git a/home.nix b/home.nix
deleted file mode 100644
index 33058df..0000000
--- a/home.nix
+++ /dev/null
@@ -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; };
-}
diff --git a/rices/cwm.nix b/rices/cwm.nix
index bd2bdef..4ace1f2 100644
--- a/rices/cwm.nix
+++ b/rices/cwm.nix
@@ -1,73 +1,84 @@
-{ config, pkgs, ...}:
+{ config, pkgs, ... }:
+let
+  home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
+in
 {
-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
-  home.username = "junikim";
-  home.homeDirectory = "/home/junikim";
+  imports = [
+    (import "${home-manager}/nixos")
+  ];
 
-  # This value determines the Home Manager release that your
-  # configuration is compatible with. This helps avoid breakage
-  # when a new Home Manager release introduces backwards
-  # incompatible changes.
-  #
-  # You can update Home Manager without changing this value. See
-  # the Home Manager release notes for a list of state version
-  # changes in each release.
-  home.stateVersion = "22.05";
+  services.xserver.displayManager.startx.enable = true;
 
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
+  home-manager.users.junikim = {
+    # Home Manager needs a bit of information about you and the
+    # paths it should manage.
+    home.username = "junikim";
+    home.homeDirectory = "/home/junikim";
 
-  programs.starship.enable = true;
+    # This value determines the Home Manager release that your
+    # configuration is compatible with. This helps avoid breakage
+    # when a new Home Manager release introduces backwards
+    # incompatible changes.
+    #
+    # You can update Home Manager without changing this value. See
+    # the Home Manager release notes for a list of state version
+    # changes in each release.
+    home.stateVersion = "22.05";
 
-  home.packages = with pkgs; [
-    vim xclip neofetch tmux
-    fff
-    nodejs shellcheck
-    dash
-    wget brave
-    cwm polybarFull kitty nitrogen dmenu picom
-    nfs-utils gcc gnumake pulsemixer
-  ];
+    # Let Home Manager install and manage itself.
+    programs.home-manager.enable = true;
+
+    programs.starship.enable = true;
 
-  programs.neovim = {
-    enable = true;
-    plugins = with pkgs.vimPlugins; [
-      coc-nvim
-      neovim-sensible
-      vim-airline
-      vim-airline-themes
-      vim-nix
+    home.packages = with pkgs; [
+      vim xclip neofetch tmux
+      fff
+      nodejs shellcheck
+      dash
+      wget brave
+      cwm polybarFull kitty nitrogen dmenu picom
+      nfs-utils gcc gnumake pulsemixer
     ];
-    extraConfig = builtins.readFile ../dotfiles/init.vim;
-  };
 
-  programs.git = {
-    enable = true;
-    userName = "Juni Kim";
-    userEmail = "junikimm717@gmail.com";
-  };
+    programs.neovim = {
+      enable = true;
+      plugins = with pkgs.vimPlugins; [
+        coc-nvim
+        neovim-sensible
+        vim-airline
+        vim-airline-themes
+        vim-nix
+      ];
+      extraConfig = builtins.readFile ../dotfiles/init.vim;
+    };
 
-  programs.zsh = {
-    oh-my-zsh = {
+    programs.git = {
       enable = true;
-      theme = "robbyrussell";
+      userName = "Juni Kim";
+      userEmail = "junikimm717@gmail.com";
+    };
+
+    programs.zsh = {
+      oh-my-zsh = {
+        enable = true;
+        theme = "robbyrussell";
+      };
     };
-  };
 
-  home.file = {
-    #".config/nvim/init.vim".source = ./dotfiles/init.vim;
-    ".config/polybar" = {
-      source = ../dotfiles/polybar;
-      recursive = true;
+    home.file = {
+      #".config/nvim/init.vim".source = ./dotfiles/init.vim;
+      ".config/polybar" = {
+        source = ../dotfiles/polybar;
+        recursive = true;
+      };
+      ".config/kitty/kitty.conf".source = ../dotfiles/kitty.conf;
+      ".config/picom/picom.conf".source = ../dotfiles/picom.conf;
+      ".config/nixpkgs/config.nix".source = ../dotfiles/config.nix;
+      ".cwmrc".source = ../dotfiles/cwmrc;
+      "cwm.sh".source = ../dotfiles/cwm.sh;
+      ".xinitrc".source = ../dotfiles/xinitrc;
+      ".tmux.conf".source = ../dotfiles/tmux.conf;
+      ".zshrc".source = ../dotfiles/zshrc;
     };
-    ".config/kitty/kitty.conf".source = ../dotfiles/kitty.conf;
-    ".config/picom/picom.conf".source = ../dotfiles/picom.conf;
-    ".config/nixpkgs/config.nix".source = ../dotfiles/config.nix;
-    ".cwmrc".source = ../dotfiles/cwmrc;
-    "cwm.sh".source = ../dotfiles/cwm.sh;
-    ".xinitrc".source = ../dotfiles/xinitrc;
-    ".tmux.conf".source = ../dotfiles/tmux.conf;
-    ".zshrc".source = ../dotfiles/zshrc;
   };
 }
diff --git a/rices/gnome.nix b/rices/gnome.nix
index 676e83c..a234cea 100644
--- a/rices/gnome.nix
+++ b/rices/gnome.nix
@@ -1,66 +1,77 @@
-{ config, pkgs, ...}:
+{ config, pkgs, ... }:
+let
+  home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
+in
 {
-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
-  home.username = "junikim";
-  home.homeDirectory = "/home/junikim";
+  imports = [
+    (import "${home-manager}/nixos")
+  ];
 
-  # This value determines the Home Manager release that your
-  # configuration is compatible with. This helps avoid breakage
-  # when a new Home Manager release introduces backwards
-  # incompatible changes.
-  #
-  # You can update Home Manager without changing this value. See
-  # the Home Manager release notes for a list of state version
-  # changes in each release.
-  home.stateVersion = "22.05";
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
 
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
+  home-manager.users.junikim = {
+    # Home Manager needs a bit of information about you and the
+    # paths it should manage.
+    home.username = "junikim";
+    home.homeDirectory = "/home/junikim";
 
-  services.xserver.desktopManager.gnome.enable = true;
+    # This value determines the Home Manager release that your
+    # configuration is compatible with. This helps avoid breakage
+    # when a new Home Manager release introduces backwards
+    # incompatible changes.
+    #
+    # You can update Home Manager without changing this value. See
+    # the Home Manager release notes for a list of state version
+    # changes in each release.
+    home.stateVersion = "22.05";
 
-  programs.starship.enable = true;
+    # Let Home Manager install and manage itself.
+    programs.home-manager.enable = true;
 
-  home.packages = with pkgs; [
-    vim xclip neofetch tmux
-    fff
-    nodejs shellcheck
-    dash
-    wget brave
-    kitty nitrogen
-    nfs-utils gcc gnumake pulsemixer
-  ];
 
-  programs.neovim = {
-    enable = true;
-    plugins = with pkgs.vimPlugins; [
-      coc-nvim
-      neovim-sensible
-      vim-airline
-      vim-airline-themes
-      vim-nix
+    programs.starship.enable = true;
+
+    home.packages = with pkgs; [
+      vim xclip neofetch tmux
+      fff
+      nodejs shellcheck
+      dash
+      wget brave
+      kitty nitrogen
+      nfs-utils gcc gnumake pulsemixer
     ];
-    extraConfig = builtins.readFile ../dotfiles/init.vim;
-  };
 
-  programs.git = {
-    enable = true;
-    userName = "Juni Kim";
-    userEmail = "junikimm717@gmail.com";
-  };
+    programs.neovim = {
+      enable = true;
+      plugins = with pkgs.vimPlugins; [
+        coc-nvim
+        neovim-sensible
+        vim-airline
+        vim-airline-themes
+        vim-nix
+      ];
+      extraConfig = builtins.readFile ../dotfiles/init.vim;
+    };
 
-  programs.zsh = {
-    oh-my-zsh = {
+    programs.git = {
       enable = true;
-      theme = "robbyrussell";
+      userName = "Juni Kim";
+      userEmail = "junikimm717@gmail.com";
     };
-  };
 
-  home.file = {
-    ".config/kitty/kitty.conf".source = ../dotfiles/kitty.conf;
-    ".config/nixpkgs/config.nix".source = ../dotfiles/config.nix;
-    ".tmux.conf".source = ../dotfiles/tmux.conf;
-    ".zshrc".source = ../dotfiles/zshrc;
+    programs.zsh = {
+      oh-my-zsh = {
+        enable = true;
+        theme = "robbyrussell";
+      };
+    };
+
+    home.file = {
+      ".config/kitty/kitty.conf".source = ../dotfiles/kitty.conf;
+      ".config/nixpkgs/config.nix".source = ../dotfiles/config.nix;
+      ".tmux.conf".source = ../dotfiles/tmux.conf;
+      ".zshrc".source = ../dotfiles/zshrc;
+    };
   };
 }