home/git.nix

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

home/init.lua

@@ -2,13 +2,12 @@
 vim.o.number = true
 vim.o.relativenumber = true  -- number + relativenumber == hybrid
 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.formatoptions = "cqj"  -- the default, but minus `t` which autowraps text.
+vim.o.colorcolumn = "+0"  -- Mark the textwidth
-vim.o.colorcolumn = "+0"  -- mark the textwidth
 vim.o.shiftwidth = 4
 vim.o.tabstop = 4
 vim.o.softtabstop = 4
-vim.o.expandtab = true  -- owo expands ur tab
+vim.o.expandtab = true
 
 vim.o.list = true
 vim.o.listchars = "trail:·"  -- show trailing spaces
@@ -20,6 +19,3 @@ vim.o.termguicolors = true
 -- Keybinds
 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.
-

home/profiles.nix

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

home/rust.nix

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

home/vscode.nix

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