Minor worf updates

This commit is contained in:
Felix Albrigtsen 2023-08-08 08:51:20 +02:00 committed by Felix Albrigtsen
parent 80d4c64ed2
commit da3041ef4f
4 changed files with 27 additions and 25 deletions

View File

@ -20,6 +20,7 @@
gnugrep gnugrep
ripgrep ripgrep
wget wget
sshfs
]; ];
variables = { variables = {
@ -80,7 +81,7 @@
autohide = true; autohide = true;
autohide-delay = 0.0; autohide-delay = 0.0;
autohide-time-modifier = 1.0; autohide-time-modifier = 1.0;
tilesize = 80; tilesize = 45;
static-only = false; static-only = false;
showhidden = false; showhidden = false;
show-recents = false; show-recents = false;

View File

@ -12,13 +12,15 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
bottom bottom
discord cocoapods
exa exa
iterm2 iterm2
ncdu
neofetch
nix-index nix-index
nodejs nodejs
slack
spotify spotify
tldr
vscode vscode
]; ];
@ -29,6 +31,7 @@
pull.rebase = "true"; pull.rebase = "true";
color.ui = "auto"; color.ui = "auto";
init.defaultBranch = "main"; init.defaultBranch = "main";
lfs.enable = true;
user = { user = {
name = "Felix Albrigtsen"; name = "Felix Albrigtsen";

View File

@ -1,15 +1,5 @@
{ pkgs, lib, inputs, config, ...}: { pkgs, lib, inputs, config, ...}:
let {
# fromGitHub = rev: ref: repo: pkgs.vimUtils.buildVimPluginFrom2Nix {
# pname = "${lib.strings.sanitizeDerivationName repo}";
# version = ref;
# src = builtins.fetchGit {
# url = "https://github.com/${repo}.git";
# ref = ref;
# rev = rev;
# };
# };
in {
programs.neovim = { programs.neovim = {
enable = true; enable = true;
defaultEditor = true; defaultEditor = true;
@ -31,14 +21,21 @@ in {
copilot-vim copilot-vim
nvim-treesitter nvim-treesitter
coc-css
coc-json
coc-nvim coc-nvim
coc-pyright coc-pyright
coc-go
vim-nix vim-nix
]; ];
extraConfig = '' extraConfig = ''
let mapleader = ',' let mapleader = ','
set number
set shiftwidth=2
set tabstop=2
set expandtab
" Integrate status with lightline " Integrate status with lightline
let g:lightline = { let g:lightline = {

View File

@ -1,9 +1,4 @@
{ pkgs { pkgs, lib, inputs, config, ... }: {
, lib
, inputs
, config
, ...
}: {
programs = { programs = {
zsh = { zsh = {
enable = true; enable = true;
@ -39,10 +34,16 @@
]; ];
}; };
initExtra = ''
# Autocomplete ../
zstyle ':completion:*' special-dirs true
'';
shellAliases = { shellAliases = {
l = "exa -l"; l = "exa -l";
tree = "exa --tree --icons"; tree = "exa --tree --icons";
rebuild = "darwin-rebuild switch --flake /Users/felixalb/nix"; rebuild = "darwin-rebuild switch --flake /Users/felixalb/nix";
shell = "nix-shell --run zsh";
gst = "git status -sb"; gst = "git status -sb";
gcm = "git commit -m"; gcm = "git commit -m";
gps = "git push"; gps = "git push";