Commit graph

118 commits

Author SHA1 Message Date
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 21e0969fe0 chore: move home.nix 2022-09-29 15:17:25 +01:00