update home.nix and fix merge conflict

home.nix

@@ -11,35 +11,42 @@
   # 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";
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
+  # You should not change this value, even if you update Home Manager. If you do
+  # want to update the value, then make sure to first check the Home Manager
+  # release notes.
+  home.stateVersion = "22.11"; # Please read the comment before changing.
 
+  # Allow non-free packages
   nixpkgs.config.allowUnfree = true;
 
+  # The home.packages option allows you to install Nix packages into your
+  # environment.
   home.packages = [
-	pkgs.wget
-	pkgs.neofetch
-	pkgs.htop
-	pkgs.oh-my-zsh
-	pkgs.git
-	pkgs.chromium
-	pkgs.gdb
-	pkgs.clang
-	pkgs.lldb
-	pkgs.kitty
-	pkgs.xsel
+    # # Adds the 'hello' command to your environment. It prints a friendly
+    # # "Hello, world!" when run.
+    # pkgs.hello
+
+    # # It is sometimes useful to fine-tune packages, for example, by applying
+    # # overrides. You can do that directly here, just don't forget the
+    # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
+    # # fonts?
+    # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
+
+    # # You can also create simple shell scripts directly inside your
+    # # configuration. For example, this adds a command 'my-hello' to your
+    # # environment:
+    # (pkgs.writeShellScriptBin "my-hello" ''
+    #   echo "Hello, ${config.home.username}!"
+    # '')
+    pkgs.xsel	pkgs.wget	pkgs.neofetch	pkgs.htop	pkgs.oh-my-zsh
+    pkgs.git	pkgs.chromium 	pkgs.kitty
   ];
 
   programs.bash = {
     enable = true;
     bashrcExtra = ''
         . ~/bashrc
-		'';	
+    ''
   };
 
   programs.zsh = {
@@ -54,4 +61,32 @@
     };
   };
 
+  # Home Manager is pretty good at managing dotfiles. The primary way to manage
+  # plain files is through 'home.file'.
+  home.file = {
+    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
+    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
+    # # symlink to the Nix store copy.
+    # ".screenrc".source = dotfiles/screenrc;
+
+    # # You can also set the file content immediately.
+    # ".gradle/gradle.properties".text = ''
+    #   org.gradle.console=verbose
+    #   org.gradle.daemon.idletimeout=3600000
+    # '';
+  };
+
+  # You can also manage environment variables but you will have to manually
+  # source
+  #
+  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
+  #
+  # or
+  #
+  #  /etc/profiles/per-user/user/etc/profile.d/hm-session-vars.sh
+  #
+  # if you don't want to manage your shell through Home Manager.
+  home.sessionVariables = {
+    EDITOR = "vim";
+  };
 }