diff --git a/flake.lock b/flake.lock index 46bc58f..9839dc2 100644 --- a/flake.lock +++ b/flake.lock @@ -146,6 +146,23 @@ "type": "github" } }, + "nomodoro": { + "flake": false, + "locked": { + "lastModified": 1716340390, + "narHash": "sha256-suGTjP5dROISQMd96GispnRk624sA5BVoLYz6xqwO6o=", + "owner": "dbinagi", + "repo": "nomodoro", + "rev": "104583311eb6f39fedcd2e1759c75fbfccb5aec6", + "type": "github" + }, + "original": { + "owner": "dbinagi", + "ref": "main", + "repo": "nomodoro", + "type": "github" + } + }, "root": { "inputs": { "NixOS-WSL": "NixOS-WSL", @@ -154,6 +171,7 @@ "homeManager-23-11": "homeManager-23-11", "nixpkgs": "nixpkgs", "nixpkgs-23-11": "nixpkgs-23-11", + "nomodoro": "nomodoro", "spaceport-nvim": "spaceport-nvim" } }, diff --git a/flake.nix b/flake.nix index 28ef6b1..b113080 100644 --- a/flake.nix +++ b/flake.nix @@ -29,11 +29,15 @@ url = "github:CWood-sdf/spaceport.nvim/main"; flake = false; }; + nomodoro = { + url = "github:dbinagi/nomodoro/main"; + flake = false; + }; }; - outputs = { self, nixpkgs, homeManager, NixOS-WSL, nixpkgs-23-11, homeManager-23-11, cmp-vimtex, spaceport-nvim, ...}@inputs: + outputs = { self, nixpkgs, homeManager, NixOS-WSL, nixpkgs-23-11, homeManager-23-11, cmp-vimtex, spaceport-nvim, nomodoro, ...}@inputs: let - customPackageOverlay = (import ./overlays/default.nix { inherit cmp-vimtex; inherit spaceport-nvim; }).overlay; + customPackageOverlay = (import ./overlays/default.nix { inherit cmp-vimtex; inherit spaceport-nvim; inherit nomodoro; }).overlay; in { nixosConfigurations = ( diff --git a/home/deepak/home.nix b/home/deepak/home.nix index 539b08c..7879583 100644 --- a/home/deepak/home.nix +++ b/home/deepak/home.nix @@ -89,7 +89,7 @@ wiki-vim vim-markdown cmp-buffer - vim-airline + # vim-airline vim-fugitive flash-nvim gitsigns-nvim @@ -100,8 +100,10 @@ overseer-nvim # prettiness + lualine-nvim goyo-vim limelight-vim + nui-nvim # color schemes rose-pine @@ -110,6 +112,7 @@ # custom plugins from flakes pkgs.customVimPlugins.cmp-vimtex pkgs.customVimPlugins.spaceport-nvim + pkgs.customVimPlugins.nomodoro # syntax highlighting vim-just diff --git a/home/deepak/neovim/init-vim.nix b/home/deepak/neovim/init-vim.nix index 51facb9..a9b85ee 100644 --- a/home/deepak/neovim/init-vim.nix +++ b/home/deepak/neovim/init-vim.nix @@ -15,13 +15,25 @@ vim.opt.foldlevelstart = 99 vim.opt.number = true vim.opt.relativenumber = true -vim.keymap.set("n", "n", "R") +vim.keymap.set("n", "N", "R") -- ctrlp setup vim.g.ctrlp_custom_ignore = { file = '\\v\\.(aux|bbl|blg|bcf|fdb_latexmk|fls|run.xml|tdo|toc|log|pdf)$' } +require('lualine').setup({ + extensions = {"fugitive", "overseer"}, + sections = { + lualine_c = { + "filename", require("nomodoro").status + }, + lualine_x = { + "encoding", {"fileformat", icons_enabled = false}, "filetype" + } + } +}) + ${builtins.readFile ./spaceport.lua} require('gitsigns').setup() @@ -44,5 +56,10 @@ require("overseer").setup() vim.api.nvim_set_keymap('n', 'oo', 'OverseerToggle', { noremap = true}) vim.api.nvim_set_keymap('n', 'or', 'OverseerRun', { noremap = true}) +require("nomodoro").setup({}) +vim.api.nvim_set_keymap("n", "nw", "NomoWork", { noremap = true}) +vim.api.nvim_set_keymap("n", "nb", "NomoBreak", { noremap = true}) +vim.api.nvim_set_keymap("n", "ns", "NomoStop", { noremap = true}) + EOF '' diff --git a/overlays/default.nix b/overlays/default.nix index 077be85..71b6784 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,20 +1,25 @@ -{ cmp-vimtex, spaceport-nvim }: +{ cmp-vimtex, spaceport-nvim, nomodoro }: { - overlay = final: prev: - let - cmpVimtexPlugin = prev.vimUtils.buildVimPlugin { - src = cmp-vimtex; - name = "cmp-vimtex"; - }; - spaceportNvimPlugin = prev.vimUtils.buildVimPlugin { - src = spaceport-nvim; - name = "spaceport-nvim"; - }; - in - { - customVimPlugins = { - cmp-vimtex = cmpVimtexPlugin; - spaceport-nvim = spaceportNvimPlugin; - }; - }; + overlay = final: prev: + let + cmpVimtexPlugin = prev.vimUtils.buildVimPlugin { + src = cmp-vimtex; + name = "cmp-vimtex"; + }; + spaceportNvimPlugin = prev.vimUtils.buildVimPlugin { + src = spaceport-nvim; + name = "spaceport-nvim"; + }; + nomodoroNvimPlugin = prev.vimUtils.buildVimPlugin { + src = nomodoro; + name = "nomodoro"; + }; + in + { + customVimPlugins = { + cmp-vimtex = cmpVimtexPlugin; + spaceport-nvim = spaceportNvimPlugin; + nomodoro = nomodoroNvimPlugin; + }; + }; }