update

docs/TODO.md

@@ -1,17 +1,15 @@
 # Todolist
 
 - [ ] Installation script
-- [ ] Compress png docs/src
 - [ ] Find a new icon theme (White, flat)
 - [ ] Global font-size config (Alt font size for waybar)
-- [ ] Catppuccin theme
-- [ ] Windows theme
-- [ ] MacOS theme
-- [ ] Rice screenshot script
+- [ ] Themes
+  - [ ] Catppuccin theme
+  - [ ] Windows theme
+  - [ ] MacOS theme
 - [ ] Global variable for config location
 - [ ] Obsidian conditional import
 - [ ] Make hyprcursor work
-- [ ] Remove folder's laptop conf
 - [ ] Nixvim
   - [ ] Telescope shortcut for file content
   - [ ] Markdown snippets

home/laptop.nix

@@ -2,9 +2,28 @@
 
   imports = [
     ../hosts/laptop/variables.nix
-    ./system/laptop.nix
-    ./scripts/laptop.nix
-    ./programs/laptop.nix
+
+    # Programs
+    ./programs/btop
+    ./programs/cava
+    ./programs/kitty
+    ./programs/nvim
+    ./programs/qutebrowser
+    ./programs/spicetify
+
+    # Scripts
+    ./scripts # All scripts
+
+    # System
+    ./system/dunst
+    ./system/git
+    ./system/gtk
+    ./system/hyprland
+    ./system/shell
+    ./system/sops/laptop.nix
+    ./system/waybar
+    ./system/wlogout
+    ./system/wofi
   ];
 
   home = {
@@ -57,6 +76,7 @@
       neovide
     ];
 
+    # Import wallpapers into $HOME/wallpapers
     file."wallpapers" = {
       recursive = true;
       source = ./wallpapers;

home/programs/laptop.nix

@@ -1,4 +0,0 @@
-{
-  imports =
-    [ ./btop ./kitty ./nvim/laptop.nix ./qutebrowser ./spicetify ./cava ];
-}

home/programs/nvim/colorscheme.nix

@@ -0,0 +1,9 @@
+{
+  programs.nixvim = {
+    enable = true;
+    colorschemes.catppuccin = {
+      enable = true;
+      settings = { transparent_background = true; };
+    };
+  };
+}

home/programs/nvim/default.nix

@@ -0,0 +1,30 @@
+{ inputs, ... }: {
+  imports = [
+    inputs.nixvim.homeManagerModules.nixvim
+    ./plugins/auto-pairs.nix
+    ./plugins/bufferline.nix
+    ./plugins/lazygit.nix
+    ./plugins/telescope.nix
+    ./plugins/nvim-tree.nix
+    ./plugins/lightline.nix
+    ./plugins/git.nix
+    ./plugins/cmp.nix
+    ./plugins/none-ls.nix
+    ./plugins/wilder.nix
+    ./plugins/lsp.nix
+    ./plugins/treesitter.nix
+    ./plugins/toggleterm.nix
+    ./plugins/copilot.nix
+    ./plugins/whichkey.nix
+    ./plugins/alpha.nix
+    ./plugins/keymaps.nix
+    ./plugins/comment.nix
+    ./plugins/oil.nix
+    ./plugins/trouble.nix
+    ./plugins/tmux-navigator.nix
+    ./plugins/noice.nix
+    ./plugins/obsidian.nix
+    ./options.nix
+    ./colorscheme.nix
+  ];
+}

home/programs/nvim/laptop.nix

@@ -1,38 +0,0 @@
-{ inputs, ... }: {
-  imports = [
-    inputs.nixvim.homeManagerModules.nixvim
-    ./auto-pairs.nix
-    ./options.nix
-    ./bufferline.nix
-    ./lazygit.nix
-    ./telescope.nix
-    ./nvim-tree.nix
-    ./lightline.nix
-    ./git.nix
-    ./cmp.nix
-    ./none-ls.nix
-    ./wilder.nix
-    ./lsp.nix
-    ./treesitter.nix
-    ./toggleterm.nix
-    ./copilot.nix
-    ./obsidian.nix # make conditional
-    ./whichkey.nix
-    ./alpha.nix
-    ./keymaps.nix
-    ./comment.nix
-    ./oil.nix
-    ./trouble.nix
-    ./tmux-navigator.nix
-    ./noice.nix
-  ];
-
-  programs.nixvim = {
-    enable = true;
-    colorschemes.catppuccin = {
-      enable = true;
-      settings = { transparent_background = true; };
-    };
-  };
-
-}

home/programs/nvim/plugins/obsidian.nix

@@ -1,6 +1,6 @@
-{
+{ config, ... }: {
   programs.nixvim.plugins.obsidian = {
-    enable = true;
+    enable = config.var.obsidian;
     settings = {
       dir = "~/nextcloud/Notes";
       disable_frontmatter = true;