moved everything to their own modules

6 files changed, 143 insertions, 134 deletions

diff --git a/modules/home/i3wm/original/default.nix b/modules/home/i3wm/original/default.nix
index 362d6f8..6fef12b 100644
--- a/modules/home/i3wm/original/default.nix
+++ b/modules/home/i3wm/original/default.nix
@@ -5,8 +5,12 @@
     ./dunst.nix
     ./i3.nix
     ./kitty.nix
+    ./neovim.nix
+    ./nnn.nix
     ./picom.nix
     ./polybar.nix
+    ./rofi.nix
     ./scripts.nix
+    ./xdg.nix
   ];
 }
\ No newline at end of file
diff --git a/modules/home/i3wm/original/neovim.nix b/modules/home/i3wm/original/neovim.nix
new file mode 100644
index 0000000..2b39f59
--- /dev/null
+++ b/modules/home/i3wm/original/neovim.nix
@@ -0,0 +1,101 @@
+{ pkgs, ... }:
+
+{
+  neovim = {
+    enable = true;
+    defaultEditor = true;
+    viAlias = true;
+    vimAlias = true;
+    withNodeJs = true;
+
+    # +ANT FIX 
+    plugins = []; # disable HM plugin processing
+
+    extraLuaConfig = ''
+      -- LazyVim bootstrap
+      local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+      if not vim.loop.fs_stat(lazypath) then
+        vim.fn.system({
+          "git", "clone", "--filter=blob:none",
+          "https://github.com/folke/lazy.nvim.git",
+          "--branch=stable", lazypath,
+        })
+      end
+      vim.opt.rtp:prepend(lazypath)
+
+      require("lazy").setup({
+        spec = {
+          { "LazyVim/LazyVim", import = "lazyvim.plugins" },
+          { import = "lazyvim.plugins.extras.lang.tex" },
+          { import = "lazyvim.plugins.extras.lang.markdown" },
+          { import = "lazyvim.plugins.extras.ui.mini-animate" },
+          { import = "lazyvim.plugins.extras.lang.typescript" },
+          { import = "lazyvim.plugins.extras.lang.python" },
+          { import = "lazyvim.plugins.extras.lang.rust" },
+          { import = "lazyvim.plugins.extras.lang.nix" },
+
+          {
+            "lervag/vimtex",
+            lazy = false,
+            init = function()
+              vim.g.vimtex_view_method = "zathura"
+            end
+          },
+
+          {
+            "MeanderingProgrammer/render-markdown.nvim",
+            opts = {
+              enabled = true,
+              file_types = { "markdown", "rmd" },
+              colorscheme = "default",
+            },
+            dependencies = {
+              "nvim-treesitter/nvim-treesitter",
+              "nvim-tree/nvim-web-devicons",
+            },
+          },
+
+          { "mracos/mermaid.vim", ft = { "mermaid" } },
+        },
+
+        defaults = { lazy = false, version = false },
+        checker = { enabled = true },
+
+        performance = {
+          rtp = {
+            disabled_plugins = {
+              "gzip", "tarPlugin", "tohtml",
+              "tutor", "zipPlugin",
+            },
+          },
+        },
+      })
+
+      -- LaTeX wrapping
+      vim.api.nvim_create_autocmd("FileType", {
+        pattern = "tex",
+        callback = function()
+          vim.opt_local.wrap = true
+          vim.opt_local.linebreak = true
+          vim.opt_local.breakindent = true
+          vim.opt_local.breakindentopt = "shift:2"
+          vim.opt_local.textwidth = 0
+        end,
+      })
+
+      -- Disable diagnostics in markdown
+      vim.api.nvim_create_autocmd("FileType", {
+        pattern = "markdown",
+        callback = function()
+          vim.diagnostic.disable(0)
+        end,
+      })
+
+      -- Nix LSP
+      local lspconfig = require("lspconfig")
+      lspconfig.nil_ls.setup({ cmd = { "nil" } })
+
+      vim.opt.clipboard = "unnamedplus"
+    '';
+  };
+}
\ No newline at end of file
diff --git a/modules/home/i3wm/original/nnn.nix b/modules/home/i3wm/original/nnn.nix
new file mode 100644
index 0000000..2f40f32
--- /dev/null
+++ b/modules/home/i3wm/original/nnn.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  nnn = {
+    enable = true;
+    package = pkgs.nnn.override { withNerdIcons = true; };
+  };
+}
\ No newline at end of file
diff --git a/modules/home/i3wm/original/rofi.nix b/modules/home/i3wm/original/rofi.nix
new file mode 100644
index 0000000..9332efd
--- /dev/null
+++ b/modules/home/i3wm/original/rofi.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+{
+  programs.rofi = {
+      enable = true;
+      location = "center";
+      cycle = true;
+      theme = "purple";
+      terminal = "${pkgs.kitty}/bin/kitty";
+      modes = [ "drun" "ssh" "emoji" "calc" ];
+      plugins = with pkgs; [ rofi-emoji rofi-calc ];
+    };
+}
\ No newline at end of file
diff --git a/modules/home/i3wm/original/xdg.nix b/modules/home/i3wm/original/xdg.nix
new file mode 100644
index 0000000..7590ea8
--- /dev/null
+++ b/modules/home/i3wm/original/xdg.nix
@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+
+{
+  xdg = {
+    enable = true;
+
+    mimeApps = {
+      enable = true;
+      defaultApplications = {
+        "text/plain" = [ "nvim.desktop" ];
+        "text/markdown" = [ "nvim.desktop" ];
+        "text/x-markdown" = [ "nvim.desktop" ];
+      };
+    };
+  };
+}
\ No newline at end of file
diff --git a/mun.nix b/mun.nix
index cdfa8e9..acf593b 100755
--- a/mun.nix
+++ b/mun.nix
@@ -27,18 +27,7 @@
   };
 
 
-  xdg = {
-    enable = true;
-
-    mimeApps = {
-      enable = true;
-      defaultApplications = {
-        "text/plain" = [ "nvim.desktop" ];
-        "text/markdown" = [ "nvim.desktop" ];
-        "text/x-markdown" = [ "nvim.desktop" ];
-      };
-    };
-  };
+  
 
   programs = {
     ssh = {
@@ -70,132 +59,11 @@
         fastfetch
       '';
     };
-
-    rofi = {
-      enable = true;
-      location = "center";
-      cycle = true;
-      theme = "purple";
-      terminal = "${pkgs.kitty}/bin/kitty";
-      modes = [ "drun" "ssh" "emoji" "calc" ];
-      plugins = with pkgs; [ rofi-emoji rofi-calc ];
-    };
-
-    nnn = {
-      enable = true;
-      package = pkgs.nnn.override { withNerdIcons = true; };
-    };
-
-    neovim = {
-      enable = true;
-      defaultEditor = true;
-      viAlias = true;
-      vimAlias = true;
-      withNodeJs = true;
-
-      # +ANT FIX 
-      plugins = []; # disable HM plugin processing
-
-      extraLuaConfig = ''
-        -- LazyVim bootstrap
-        local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-        if not vim.loop.fs_stat(lazypath) then
-          vim.fn.system({
-            "git", "clone", "--filter=blob:none",
-            "https://github.com/folke/lazy.nvim.git",
-            "--branch=stable", lazypath,
-          })
-        end
-        vim.opt.rtp:prepend(lazypath)
-
-        require("lazy").setup({
-          spec = {
-            { "LazyVim/LazyVim", import = "lazyvim.plugins" },
-            { import = "lazyvim.plugins.extras.lang.tex" },
-            { import = "lazyvim.plugins.extras.lang.markdown" },
-            { import = "lazyvim.plugins.extras.ui.mini-animate" },
-            { import = "lazyvim.plugins.extras.lang.typescript" },
-            { import = "lazyvim.plugins.extras.lang.python" },
-            { import = "lazyvim.plugins.extras.lang.rust" },
-            { import = "lazyvim.plugins.extras.lang.nix" },
-
-            {
-              "lervag/vimtex",
-              lazy = false,
-              init = function()
-                vim.g.vimtex_view_method = "zathura"
-              end
-            },
-
-            {
-              "MeanderingProgrammer/render-markdown.nvim",
-              opts = {
-                enabled = true,
-                file_types = { "markdown", "rmd" },
-                colorscheme = "default",
-              },
-              dependencies = {
-                "nvim-treesitter/nvim-treesitter",
-                "nvim-tree/nvim-web-devicons",
-              },
-            },
-
-            { "mracos/mermaid.vim", ft = { "mermaid" } },
-          },
-
-          defaults = { lazy = false, version = false },
-          checker = { enabled = true },
-
-          performance = {
-            rtp = {
-              disabled_plugins = {
-                "gzip", "tarPlugin", "tohtml",
-                "tutor", "zipPlugin",
-              },
-            },
-          },
-        })
-
-        -- LaTeX wrapping
-        vim.api.nvim_create_autocmd("FileType", {
-          pattern = "tex",
-          callback = function()
-            vim.opt_local.wrap = true
-            vim.opt_local.linebreak = true
-            vim.opt_local.breakindent = true
-            vim.opt_local.breakindentopt = "shift:2"
-            vim.opt_local.textwidth = 0
-          end,
-        })
-
-        -- Disable diagnostics in markdown
-        vim.api.nvim_create_autocmd("FileType", {
-          pattern = "markdown",
-          callback = function()
-            vim.diagnostic.disable(0)
-          end,
-        })
-
-        -- Nix LSP
-        local lspconfig = require("lspconfig")
-        lspconfig.nil_ls.setup({ cmd = { "nil" } })
-
-        vim.opt.clipboard = "unnamedplus"
-      '';
-    };
-
     
   };
 
-  
-
   services = {
     gnome-keyring.enable = true;
-  };
-    
-
-    
-
-    
+  };   
 }