Compare commits

...

4 Commits

Author SHA1 Message Date
Sam W b9820b9a5e git: add git-open 2022-11-19 22:37:14 +00:00
Sam W 6c85de5bcd vsc: Add nix/editorconfig exts 2022-11-19 22:37:09 +00:00
Sam W d2d59eefa0 vim: Tweak textwidth, fix python autoindent 2022-11-19 22:36:31 +00:00
Sam W 7ac16e425a Remove rust (in favour of individual direnvs) 2022-11-19 22:36:31 +00:00
5 changed files with 12 additions and 6 deletions

View File

@ -1,4 +1,5 @@
{...}: { {pkgs, ...}: {
home.packages = [pkgs.git-open];
programs.git = { programs.git = {
enable = true; enable = true;
userName = "Sam Willcocks"; userName = "Sam Willcocks";

View File

@ -2,12 +2,13 @@
vim.o.number = true vim.o.number = true
vim.o.relativenumber = true -- number + relativenumber == hybrid vim.o.relativenumber = true -- number + relativenumber == hybrid
vim.o.mouse = "nvi" -- mouse mode in normal, visual and insert vim.o.mouse = "nvi" -- mouse mode in normal, visual and insert
vim.o.textwidth = 88 -- A vaguely sensible default textwidth vim.o.textwidth = 88 -- a vaguely sensible default textwidth
vim.o.colorcolumn = "+0" -- Mark the textwidth vim.o.formatoptions = "cqj" -- the default, but minus `t` which autowraps text.
vim.o.colorcolumn = "+0" -- mark the textwidth
vim.o.shiftwidth = 4 vim.o.shiftwidth = 4
vim.o.tabstop = 4 vim.o.tabstop = 4
vim.o.softtabstop = 4 vim.o.softtabstop = 4
vim.o.expandtab = true vim.o.expandtab = true -- owo expands ur tab
vim.o.list = true vim.o.list = true
vim.o.listchars = "trail:·" -- show trailing spaces vim.o.listchars = "trail:·" -- show trailing spaces
@ -19,3 +20,6 @@ vim.o.termguicolors = true
-- Keybinds -- Keybinds
vim.api.nvim_set_keymap('n','<C-P>', '<cmd> FZF<CR>', { noremap=true }) vim.api.nvim_set_keymap('n','<C-P>', '<cmd> FZF<CR>', { noremap=true })
-- Language-specific
vim.g.pyindent_open_paren = "shiftwidth()" -- Don't double indent after ( you villain.

View File

@ -3,7 +3,7 @@
default = ./default.nix; default = ./default.nix;
# A machine for development # A machine for development
dev = {...}: { dev = {...}: {
imports = [./git.nix ./rust.nix ./vim.nix ./vim-dev]; imports = [./git.nix ./vim.nix ./vim-dev];
}; };
# A machine for dev with a GUI # A machine for dev with a GUI
# TODO: detect this automatically somehow? # TODO: detect this automatically somehow?

View File

@ -1 +0,0 @@
{pkgs, ...}: {home.packages = [pkgs.rustup pkgs.rust-analyzer];}

View File

@ -6,6 +6,8 @@
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
matklad.rust-analyzer matklad.rust-analyzer
jdinhlife.gruvbox jdinhlife.gruvbox
jnoortheen.nix-ide
editorconfig.editorconfig
]; ];
userSettings = { userSettings = {
"update.mode" = "none"; "update.mode" = "none";