Compare commits

..

2 Commits

3 changed files with 53 additions and 28 deletions

View File

@ -100,7 +100,10 @@
myHome = {
username = "hwtr";
homeDirectory = "/home/hwtr";
packages = [ pkgs.nixgl.nixGLIntel pkgs.postman ];
packages = [
pkgs.nixgl.nixGLIntel
# pkgs.postman
];
shellAliases = {
nixGL = "nixGLIntel";
};

View File

@ -4,36 +4,56 @@
, myHome
, ...
}:
let nvim_pkgs = [
# Yes, I desperately want neovim to work out-of-the-box without flake.nix for now
# I want at least python LSP to work everywhere because it's basically
# an alternative to bash script when I move to OpenColo
pkgs.neovim
pkgs.gccStdenv
pkgs.gcc
pkgs.tree-sitter
pkgs.ripgrep
pkgs.fzf
pkgs.sumneko-lua-language-server
pkgs.ripgrep
pkgs.zk
pkgs.fd
# Python3 as alternative to bash scripts :^)
(pkgs.python310Full.withPackages (pypkgs: [
pypkgs.pynvim # nvim provider
pypkgs.ujson # pylsp seems to rely on this. satisfy it lol
]))
]; in
{
home = {
username = myHome.username;
homeDirectory = myHome.homeDirectory;
stateVersion = myHome.stateVersion or "22.05";
};
home.packages = [
home.packages = pkgs.lib.unique ([
pkgs.htop
pkgs.ripgrep
pkgs.gcc
pkgs.fd
pkgs.zk
pkgs.unzip
pkgs.rust-bin.nightly.latest.default
pkgs.rust-bin.nightly.latest.default # Needed for alacritty?
# pkgs.nodejs-18_x
# pkgs.rust-analyzer
pkgs.yq
pkgs.python39Full
pkgs.xorg.xclock # TODO: only include if have GL
pkgs.logseq # TODO: only include if have GL
pkgs.mosh
# pkgs.rust-analyzer # This should be very specific to env
# cool utilities
pkgs.yq # Yaml adaptor for jq (only pretty print, little query)
pkgs.xorg.xclock # TODO: only include if have GL # For testing GL installation
pkgs.logseq # TODO: only include if have GL # Obsidian alt
pkgs.mosh # Parsec for SSH
pkgs.nixops_unstable # nixops v2
pkgs.lynx
pkgs.lynx # Web browser at your local terminal
# pkgs.tailscale # VPC;; This should be installed in system-nix
# pkgs.python310 # dev packages should be in jk
# pkgs.python310.numpy
# pkgs.python310Packages.tensorflow
# pkgs.python310Packages.scikit-learn
] ++ (myHome.packages or [ ]);
nixpkgs.config.allowUnfree = true;
] ++ (myHome.packages or [ ]) ++ nvim_pkgs);
## Configs ##
xdg.configFile."nvim/init.lua".text = builtins.readFile ../neovim/init.lua;
@ -73,17 +93,17 @@
};
programs.home-manager.enable = true;
programs.fzf.enable = true;
programs.neovim = {
enable = true;
viAlias = true;
vimAlias = true;
withPython3 = true;
withNodeJs = true;
# I use vim-plug, so I probably don't require packaging
# extraConfig actually writes to init-home-manager.vim (not lua)
# https://github.com/nix-community/home-manager/pull/3287
# extraConfig = builtins.readFile ../neovim/init.lua;
};
# programs.neovim = {
# enable = true;
# viAlias = true;
# vimAlias = true;
# withPython3 = true;
# withNodeJs = true;
# # I use vim-plug, so I probably don't require packaging
# # extraConfig actually writes to init-home-manager.vim (not lua)
# # https://github.com/nix-community/home-manager/pull/3287
# # extraConfig = builtins.readFile ../neovim/init.lua;
# };
programs.bash = {
enable = true;
enableCompletion = true;
@ -121,8 +141,8 @@
};
# No idea why this is not appearing in home-manager search
# It's in source code, though
userName="pegasust";
userEmail="pegasucksgg@gmail.com";
userName = "pegasust";
userEmail = "pegasucksgg@gmail.com";
extraConfig = {
merge = { tool = "vimdiff"; conflictstyle = "diff3"; };
};

View File

@ -146,6 +146,8 @@ colorscheme gruvbox
require('hlargs').setup()
require('nvim-web-devicons').setup()
require('trouble').setup()
-- TODO: Any way to collect all the TODOs and its variants?
require('todo-comments').setup()
-- plugin keymaps