Commit graph

1005 commits

Author SHA1 Message Date
Oliver Davies a0fc60ce28 chore(flake): update 2022-10-12 16:36:52 +01:00
Oliver Davies 7cfdca5a06 feat: add and use zoxide 2022-10-12 07:59:47 +01:00
Oliver Davies f7df88b616 feat(nvim): re-add neogit 2022-10-11 22:11:59 +01:00
Oliver Davies 459428a979 refactor: combine bin directories 2022-10-11 22:09:42 +01:00
Oliver Davies f3f1051f1f chore: remove teams 2022-10-11 15:05:53 +01:00
Oliver Davies 14b1b2885e fix: use Neovim nightly for NixOS 2022-10-06 12:33:59 +01:00
Oliver Davies 8798a82bbe fix(nixos): enable experimental features 2022-10-04 23:11:23 +01:00
Oliver Davies 2d5963dbc4 refactor(nvim): delete roles 2022-10-04 09:40:42 +01:00
Oliver Davies 5630466780 refactor(nvim): manage Neovim with Home Manager 2022-10-04 09:38:42 +01:00
Oliver Davies 83c43d07df fix(nvim): re-add plugins 2022-10-04 09:21:39 +01:00
Oliver Davies c4a2baa71e refactor: re-organise packages 2022-10-04 08:17:18 +01:00
Oliver Davies 493a63dc2a chore: remove duplicate shell aliases 2022-10-04 08:07:15 +01:00
Oliver Davies 06440c5f0d chore: delete result directory after running 2022-10-04 08:01:46 +01:00
Oliver Davies 7c206927dc build: allow for specifying the command 2022-10-04 07:29:34 +01:00
Oliver Davies 1a0707910e fix(nvim): treesitter paths 2022-10-03 21:33:14 +01:00
Oliver Davies 85db57210d feat(nvim): add rnix LSP for Nix files 2022-10-03 17:47:17 +01:00
Oliver Davies f64b58d6f5 fix: update bash path 2022-10-03 17:46:49 +01:00
Oliver Davies 23d776e537 fix(flake): add missing flake name 2022-10-03 09:55:41 +01:00
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