Merge remote-tracking branch 'origin/master' into work

Merge pull request 'master > work' (#36 ) from master into work
Reviewed-on: #36
2026-02-11 12:26:08 +01:00 · 2026-02-11 10:21:26 +01:00 · 2026-02-11 10:20:47 +01:00 · 2026-02-11 10:19:15 +01:00 · 2026-02-07 11:40:34 +01:00 · 2026-02-07 11:40:34 +01:00
2 changed files with 1 additions and 2 deletions
@@ -17,8 +17,8 @@
    ./programs/tmux.nix
    ./programs/git.nix
    ./programs/libreoffice.nix
-    ./programs/nvim.nix
    ./programs/vscode.nix
+    ./programs/nvim.nix
    ./wm/rofi.nix
    ./wm/cursor.nix
    ./wm/dconf.nix
@@ -5,7 +5,6 @@
    enable = true;

    plugins = with pkgs.vimPlugins; [
-      neo-tree-nvim
      catppuccin-nvim
      tokyonight-nvim
      nvim-lspconfig
Author	SHA1	Message	Date
armel	69ce33422a	Merge remote-tracking branch 'origin/master' into work	2026-02-11 12:26:08 +01:00
armel	3c4f2b4f94	Merge pull request 'master > work' (#36 ) from master into work Reviewed-on: #36	2026-02-11 10:21:26 +01:00
armel	06bcb20ccd	Merge pull request 'Add file browser' (#37 ) from feature/file-browser into master Reviewed-on: #37	2026-02-11 10:20:47 +01:00
armel	696c7e50cf	Add file browser	2026-02-11 10:19:15 +01:00
Armel van Ravels	b1ee7bcb2d	Add compamny git config	2026-02-07 11:40:34 +01:00
Armel van Ravels	23cf21da76	Add direnv integration to vscode	2026-02-07 11:40:34 +01:00
Armel van Ravels	dea56f0fe3	Battery status	2026-02-07 11:40:34 +01:00
Armel van Ravels	8196f20547	Add vscode	2026-02-07 11:40:34 +01:00
Armel van Ravels	612392acf0	Add vscode to programs	2026-02-07 11:40:33 +01:00
Armel van Ravels	979f0bd7a1	Changes for work machine	2026-02-07 11:40:06 +01:00