diff --git a/dotfiles/.gitconfig b/dotfiles/.gitconfig deleted file mode 100644 index 25d20f1..0000000 --- a/dotfiles/.gitconfig +++ /dev/null @@ -1,29 +0,0 @@ -[user] - email = root@ivnglkv.me - name = Ivan Golikov - -[push] - default = current - -[diff] - external = difft - tool = difftastic - -[difftool] - prompt = false - -[difftool "difftastic"] - cmd = difft "$LOCAL" "$REMOTE" - -[pager] - difftool = true - -[credential] - helper = cache --timeout=600 - -[core] - editor = nvim - autocrlf = input - -[init] - defaultBranch = main diff --git a/home.nix b/home.nix index c0f8fb7..f3cee3b 100644 --- a/home.nix +++ b/home.nix @@ -17,27 +17,31 @@ # The home.packages option allows you to install Nix packages into your # environment. - home.packages = with pkgs; [ - obsidian - kitty - git - darktable - gparted - telegram-desktop - keepassxc - libreoffice - ungoogled-chromium - difftastic - uv - lazygit - zoxide - qmk - dos2unix - gnumake - ripgrep - github-copilot-cli - nerd-fonts.iosevka-term - fzf + home.packages = [ + pkgs.obsidian + pkgs.kitty + pkgs.git + pkgs.darktable + pkgs.gparted + pkgs.telegram-desktop + pkgs.keepassxc + pkgs.libreoffice + pkgs.ungoogled-chromium + pkgs.difftastic + pkgs.uv + pkgs.lazygit + pkgs.zoxide + pkgs.qmk + pkgs.dos2unix + pkgs.gnumake + pkgs.ripgrep + pkgs.github-copilot-cli + pkgs.nerd-fonts.iosevka-term + pkgs.fzf + # # 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