mirror of https://github.com/wlcx/home.git
Compare commits
4 Commits
55c41e4f3f
...
b9820b9a5e
Author | SHA1 | Date |
---|---|---|
Sam W | b9820b9a5e | |
Sam W | 6c85de5bcd | |
Sam W | d2d59eefa0 | |
Sam W | 7ac16e425a |
|
@ -1,4 +1,5 @@
|
||||||
{...}: {
|
{pkgs, ...}: {
|
||||||
|
home.packages = [pkgs.git-open];
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
userName = "Sam Willcocks";
|
userName = "Sam Willcocks";
|
||||||
|
|
|
@ -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.
|
||||||
|
|
||||||
|
|
|
@ -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?
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
{pkgs, ...}: {home.packages = [pkgs.rustup pkgs.rust-analyzer];}
|
|
|
@ -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";
|
||||||
|
|
Loading…
Reference in New Issue