Commit graph

787 commits

Author SHA1 Message Date
Oliver Davies 47ca17f781 feat: add NixOS config for Apollo laptop 2022-10-03 09:27:46 +01:00
Oliver Davies 60b0e1f824 feat(justfile): add update 2022-10-01 23:55:00 +01:00
Oliver Davies ccef7209b7 chore: flake update 2022-10-01 23:54:32 +01:00
Oliver Davies ffdbb50f01 feat: install LSP and formatters 2022-09-29 20:59:38 +01:00
Oliver Davies e01784d8ce chore: move nix files 2022-09-29 19:29:50 +01:00
Oliver Davies c7b4055a95 feat: add markdownlint 2022-09-29 19:25:48 +01:00
Oliver Davies f4c9e5c83b feat(nvim): add Neovim plugins 2022-09-29 15:17:25 +01:00
Oliver Davies 228086f19a fix(zsh): include powerlevel10k configuration 2022-09-29 15:17:25 +01:00
Oliver Davies 691da2a053 revert(alacritty): configure Alacritty
This reverts commit afa768224855f4c1136eb3b62c2b09224f25ade0.
2022-09-29 15:17:25 +01:00
Oliver Davies a02f5bb68b refactor: extract a common module
diff --git a/configuration/pop-os/default.nix b/configuration/pop-os/default.nix
index 9ed9e69..2287793 100644
--- a/configuration/pop-os/default.nix
+++ b/configuration/pop-os/default.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ../../home-manager/modules/alacritty.nix
+    ../../home-manager/modules/common.nix
     ../../home-manager/modules/git.nix
     ../../home-manager/modules/home-manager.nix
     ../../home-manager/modules/tmux.nix
@@ -15,9 +16,5 @@
     docker
     docker-compose
     jetbrains-mono
-    just
-    neovim
   ];
-
-  programs.bat.enable = true;
 }
diff --git a/configuration/wsl2/default.nix b/configuration/wsl2/default.nix
index 84c1242..de6afe3 100644
--- a/configuration/wsl2/default.nix
+++ b/configuration/wsl2/default.nix
@@ -2,17 +2,10 @@

 {
   imports = [
+    ../../home-manager/modules/common.nix
     ../../home-manager/modules/git.nix
     ../../home-manager/modules/home-manager.nix
     ../../home-manager/modules/tmux.nix
     ../../home-manager/modules/zsh.nix
   ];
-
-  home.packages = with pkgs; [
-    just
-    neovim
-    zsh
-  ];
-
-  programs.bat.enable = true;
 }
diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix
new file mode 100644
index 0000000..0a77fe8
--- /dev/null
+++ b/home-manager/modules/common.nix
@@ -0,0 +1,9 @@
+{ config, lib, pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    just
+    neovim
+  ];
+
+  programs.bat.enable = true;
+}
2022-09-29 15:17:25 +01:00
Oliver Davies ecab676b75 refactor: move OS configuration files 2022-09-29 15:17:25 +01:00
Oliver Davies c08df2a342 feat(alacritty): configure Alacritty 2022-09-29 15:17:25 +01:00
Oliver Davies 96ca78cf8d feat: add Git shell aliases 2022-09-29 15:17:25 +01:00
Oliver Davies 7e03839b70 feat: add wsl2 flake 2022-09-29 15:17:25 +01:00
Oliver Davies 8c281cd5d2 refactor: split into modules 2022-09-29 15:17:25 +01:00
Oliver Davies 501fe8533f refactor: use a flake for Pop!_OS 2022-09-29 15:17:25 +01:00
Oliver Davies a5fa4e80ab feat(zsh): add run alias 2022-09-29 15:17:25 +01:00
Oliver Davies 2c4e616026 feat(zsh): configure autocd and cdpath 2022-09-29 15:17:25 +01:00
Oliver Davies aad6001ccd fix(zsh): case insensitive autocompletion 2022-09-29 15:17:25 +01:00
Oliver Davies cb812ee063 fix(tmux): syntax error in tmux.conf 2022-09-29 15:17:25 +01:00
Oliver Davies 80f76da981 fix(tmux): colours 2022-09-29 15:17:25 +01:00
Oliver Davies ebdc6bf771 build: add justfile 2022-09-29 15:17:25 +01:00
Oliver Davies 21e0969fe0 chore: move home.nix 2022-09-29 15:17:25 +01:00
Oliver Davies 45c7a28ac6 feat: enable bat 2022-09-29 15:17:25 +01:00
Oliver Davies dd7f3f0d95 feat(git): more configuration 2022-09-29 15:17:25 +01:00
Oliver Davies b0fdd2429d feat(git): re-add aliases 2022-09-29 15:17:25 +01:00
Oliver Davies 4e2e81c815 fix(zsh): disable completion
Fix error when running `home-manager switch` by disabling ZSH
completions.
2022-09-29 15:17:25 +01:00
Oliver Davies b5308adf17 chore(zsh): change dotDir 2022-09-29 15:17:25 +01:00
Oliver Davies c731e814a5 feat(git): add g function 2022-09-29 15:17:25 +01:00
Oliver Davies 01910284dc feat(git): start configuring Git 2022-09-29 15:17:25 +01:00
Oliver Davies 503e40b762 feat(zsh): configure plugins 2022-09-29 15:17:25 +01:00
Oliver Davies a1bc689a01 feat(zsh): enable zsh 2022-09-29 15:17:25 +01:00
Oliver Davies af1d8d3777 feat: initial commit 2022-09-29 15:17:25 +01:00
Oliver Davies 41b8f3f552 feat: use nix package manager 2022-09-29 15:17:15 +01:00
Oliver Davies 7039451cef
feat(nvim): add tpope/vim-abolish 2022-09-25 22:15:26 +01:00
Oliver Davies 7e935b12c0 feat(nvim): improve C-d and C-u mappings
Move up or down by half a page but also automatically re-center the
screen so that the cursor is always within a consistent positiion.
2022-09-01 22:01:42 +01:00
Oliver Davies 8466a81183 chore(nvim): remove ununsed plugins 2022-09-01 22:01:15 +01:00
Oliver Davies 976045d1ca feat(nvim): add nvim-treesitter-context 2022-09-01 21:58:44 +01:00
Oliver Davies cf0a317b23 chore(nvim): add keymap to format text
Add a keymap within the LSP client to format the text rather than
automatically formatting it on save.
2022-09-01 18:50:50 +01:00
Oliver Davies 14b6d80507 chore(nvim): remove auto-formatting 2022-09-01 18:50:32 +01:00
Oliver Davies 351c4d7814 fix(nvim): replace resolved_capabilities
Replace the deprecated `client.resolved_capabilities` with
`client.server_capabilities`
2022-09-01 18:49:10 +01:00
Oliver Davies 2b20cd1e59
fix(aliases): update to use gh 2022-08-25 00:28:08 +01:00
Oliver Davies 8c7f6739d0
fix(aliases): update to use gh 2022-08-25 00:27:08 +01:00
Oliver Davies 4248c20ea1 fix(aliases): update to use gh 2022-08-24 23:43:11 +01:00
Oliver Davies 69fb4104ee feat(git): add worktrees alias 2022-08-24 23:09:57 +01:00
Oliver Davies dc79ebf5a7 feat(run): allow run files in notes directories
Move `run` from a simple alias to a function which checks a for a
`.notes/run` file first or defaults back to the previous functionality
and uses a file in the current directory.
2022-08-19 10:23:31 +01:00
Oliver Davies 66b491395d style(nvim): run stylua 2022-08-18 00:09:53 +01:00
Oliver Davies 2cee68f31d feat(nvim): add HTTP client plugin
I went to GitHub to find a HTTP client plugin that I could use to
replace Postman, and found https://github.com/rest-nvim/rest.nvim.

It seems to work well. Thanks @NTBBloodbath!
2022-08-18 00:09:53 +01:00
Oliver Davies 8ed8b71a7e refactor(zsh): extract prompt functions 2022-08-16 16:26:19 +01:00
Oliver Davies 436c3d4b1f chore(nvim): specify TreeSitter languages 2022-08-16 16:00:44 +01:00