update home.nix and fix merge conflict

This commit is contained in:
Aditya 2023-04-01 23:18:16 +05:30
commit 3d1b92a09f

105
home.nix
View file

@ -11,47 +11,82 @@
# when a new Home Manager release introduces backwards # when a new Home Manager release introduces backwards
# incompatible changes. # incompatible changes.
# #
# You can update Home Manager without changing this value. See # You should not change this value, even if you update Home Manager. If you do
# the Home Manager release notes for a list of state version # want to update the value, then make sure to first check the Home Manager
# changes in each release. # release notes.
home.stateVersion = "22.05"; home.stateVersion = "22.11"; # Please read the comment before changing.
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
# Allow non-free packages
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
# The home.packages option allows you to install Nix packages into your
# environment.
home.packages = [ home.packages = [
pkgs.wget # # Adds the 'hello' command to your environment. It prints a friendly
pkgs.neofetch # # "Hello, world!" when run.
pkgs.htop # pkgs.hello
pkgs.oh-my-zsh
pkgs.git # # It is sometimes useful to fine-tune packages, for example, by applying
pkgs.chromium # # overrides. You can do that directly here, just don't forget the
pkgs.gdb # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
pkgs.clang # # fonts?
pkgs.lldb # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
pkgs.kitty
pkgs.xsel # # 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 = { programs.bash = {
enable = true; enable = true;
bashrcExtra = '' bashrcExtra = ''
. ~/bashrc . ~/bashrc
''; ''
}; };
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;
enableAutosuggestions = true; enableAutosuggestions = true;
enableSyntaxHighlighting = true; enableSyntaxHighlighting = true;
oh-my-zsh = { oh-my-zsh = {
enable = true; enable = true;
theme = "ys"; theme = "ys";
plugins = ["git" "colored-man-pages" "extract" "sudo"]; plugins = ["git" "colored-man-pages" "extract" "sudo"];
}; };
}; };
# 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";
};
} }