diff --git a/flake.lock b/flake.lock index e711f66..8ea73a0 100644 --- a/flake.lock +++ b/flake.lock @@ -57,6 +57,30 @@ "type": "github" } }, + "beautysh": { + "inputs": { + "nixpkgs": [ + "neovim-config", + "nixvim", + "nixpkgs" + ], + "poetry2nix": "poetry2nix", + "utils": "utils" + }, + "locked": { + "lastModified": 1680308980, + "narHash": "sha256-aUEHV0jk2qIFP3jlsWYWhBbm+w/N9gzH3e4I5DcdB5s=", + "owner": "lovesegfault", + "repo": "beautysh", + "rev": "9845efc3ea3e86cc0d41465d720a47f521b2799c", + "type": "github" + }, + "original": { + "owner": "lovesegfault", + "repo": "beautysh", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -89,11 +113,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1697058441, - "narHash": "sha256-gjtW+nkM9suMsjyid63HPmt6WZQEvuVqA5cOAf4lLM0=", + "lastModified": 1698243190, + "narHash": "sha256-n+SbyNQRhUcaZoU00d+7wi17HJpw/kAUrXOL4zRcqE8=", "owner": "cachix", "repo": "devenv", - "rev": "55294461a62d90c8626feca22f52b0d3d0e18e39", + "rev": "86f476f7edb86159fd20764489ab4e4df6edb4b6", "type": "github" }, "original": { @@ -119,6 +143,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -155,6 +195,60 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -177,6 +271,29 @@ "type": "github" } }, + "gitignore_2": { + "inputs": { + "nixpkgs": [ + "neovim-config", + "nixvim", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "gtk-nix": { "inputs": { "banner": "banner", @@ -225,11 +342,11 @@ ] }, "locked": { - "lastModified": 1696940889, - "narHash": "sha256-p2Wic74A1tZpFcld1wSEbFQQbrZ/tPDuLieCnspamQo=", + "lastModified": 1699025595, + "narHash": "sha256-e+o4PoSu2Z6Ww8y/AVUmMU200rNZoRK+p2opQ7Db8Rg=", "owner": "nix-community", "repo": "home-manager", - "rev": "6bba64781e4b7c1f91a733583defbd3e46b49408", + "rev": "8765d4e38aa0be53cdeee26f7386173e6c65618d", "type": "github" }, "original": { @@ -249,11 +366,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1697151905, - "narHash": "sha256-sfuiRn7D5D2NzDkXXN/DUUcs2d1ddlf3VmzDBzDO2Tk=", + "lastModified": 1699051632, + "narHash": "sha256-6qRgDR/DwEIFBCdQambBaSzekm/r5flLCVTpsjpY6MQ=", "owner": "vaxerski", "repo": "Hyprland", - "rev": "3a61350286de842c7f1566c38e2b42821080ddf4", + "rev": "200cccdd3bbb3e093164d6cce61eedfe527f74da", "type": "github" }, "original": { @@ -303,6 +420,26 @@ "type": "github" } }, + "neovim-config": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_3", + "nixvim": "nixvim" + }, + "locked": { + "lastModified": 1699076669, + "narHash": "sha256-177pBuQKgoBmB9hdB0XYfDOHcvixMMC+9I2/NhVc0R8=", + "owner": "gwg313", + "repo": "nvim-nix", + "rev": "8587eab05e5623605407aef63b8976e07f7ba791", + "type": "github" + }, + "original": { + "owner": "gwg313", + "repo": "nvim-nix", + "type": "github" + } + }, "nix": { "inputs": { "lowdown-src": "lowdown-src", @@ -353,11 +490,11 @@ ] }, "locked": { - "lastModified": 1696736548, - "narHash": "sha256-Dg0gJ9xVXud55sAbXspMapFYZOpVAldQQo7MFp91Vb0=", + "lastModified": 1698550809, + "narHash": "sha256-Um8+Wi6EAH5dCgfgl7OqaVd4wFJn6FKLafcP5QPr/98=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "2902dc66f64f733bfb45754e984e958e9fe7faf9", + "rev": "1f0981f5baeb78e3c89a8980ff1a39f06876fa8c", "type": "github" }, "original": { @@ -429,13 +566,29 @@ "type": "github" } }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { - "lastModified": 1697009197, - "narHash": "sha256-viVRhBTFT8fPJTb1N3brQIpFZnttmwo3JVKNuWRVc3s=", + "lastModified": 1699034771, + "narHash": "sha256-S0iAvl1oETS6cVFP7aVNodY9eMnbaTtuypi0XiGXiLg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "01441e14af5e29c9d27ace398e6dd0b293e25a54", + "rev": "27ead4fec31f241baed776d046b1dcac431a5919", "type": "github" }, "original": { @@ -462,11 +615,41 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1697059129, - "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", + "lastModified": 1699034771, + "narHash": "sha256-S0iAvl1oETS6cVFP7aVNodY9eMnbaTtuypi0XiGXiLg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "27ead4fec31f241baed776d046b1dcac431a5919", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1698318101, + "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1698924604, + "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", + "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", "type": "github" }, "original": { @@ -476,6 +659,56 @@ "type": "github" } }, + "nixvim": { + "inputs": { + "beautysh": "beautysh", + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_4", + "pre-commit-hooks": "pre-commit-hooks_2" + }, + "locked": { + "lastModified": 1699022904, + "narHash": "sha256-Qc0zMAsRU7gyqHmkc9QUP/FHCNKNkoYGoojnMAUcUQg=", + "owner": "pta2002", + "repo": "nixvim", + "rev": "76291156fa182a7d3fdfa9233a7bcbe116c50b68", + "type": "github" + }, + "original": { + "owner": "pta2002", + "repo": "nixvim", + "type": "github" + } + }, + "poetry2nix": { + "inputs": { + "flake-utils": [ + "neovim-config", + "nixvim", + "beautysh", + "utils" + ], + "nixpkgs": [ + "neovim-config", + "nixvim", + "beautysh", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1658665240, + "narHash": "sha256-/wkx7D7enyBPRjIkK0w7QxLQhzEkb3UxNQnjyc3FTUI=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "8b8edc85d24661d5a6d0d71d6a7011f3e699780f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": [ @@ -504,6 +737,32 @@ "type": "github" } }, + "pre-commit-hooks_2": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_5", + "gitignore": "gitignore_2", + "nixpkgs": [ + "neovim-config", + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2" + }, + "locked": { + "lastModified": 1698227354, + "narHash": "sha256-Fi5H9jbaQLmLw9qBi/mkR33CoFjNbobo5xWdX4tKz1Q=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "bd38df3d508dfcdff52cd243d297f218ed2257bf", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -511,9 +770,10 @@ "gtk-nix": "gtk-nix", "home-manager": "home-manager_2", "hyprland": "hyprland", + "neovim-config": "neovim-config", "nix-colors": "nix-colors", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_5", "nixpkgs-unstable": "nixpkgs-unstable" } }, @@ -562,22 +822,82 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "utils": { + "locked": { + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "wlroots": { "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1696410538, - "narHash": "sha256-ecDhdYLXWHsxMv+EWG36mCNDvzRbu9qfjH7dLxL7aGM=", + "lastModified": 1697909146, + "narHash": "sha256-jU0I6FoCKnj4zIBL4daosFWh81U1fM719Z6cae8PxSY=", "owner": "wlroots", "repo": "wlroots", - "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", + "rev": "47bf87ade2bd32395615a385ebde1fefbcdf79a2", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", + "rev": "47bf87ade2bd32395615a385ebde1fefbcdf79a2", "type": "gitlab" } }, @@ -597,11 +917,11 @@ ] }, "locked": { - "lastModified": 1694628480, - "narHash": "sha256-Qg9hstRw0pvjGu5hStkr2UX1D73RYcQ9Ns/KnZMIm9w=", + "lastModified": 1697981233, + "narHash": "sha256-y8q4XUwx+gVK7i2eLjfR32lVo7TYvEslyzrmzYEaPZU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "8f45a6435069b9e24ebd3160eda736d7a391cbf2", + "rev": "22e7a65ff9633e1dedfa5317fdffc49f68de2ff2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a507117..7a6a642 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,8 @@ nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; agenix.url = "github:ryantm/agenix"; + + neovim-config.url = "github:gwg313/nvim-nix"; }; outputs = { self, nixpkgs, ... }@inputs: @@ -43,6 +45,9 @@ in { + # Your custom packages and modifications, exported as overlays + overlays = import ./overlays { inherit inputs; }; + nixosConfigurations = ( import ./hosts { inherit (nixpkgs) lib; diff --git a/hosts/home.nix b/hosts/home.nix index 5773458..00b3fa6 100644 --- a/hosts/home.nix +++ b/hosts/home.nix @@ -4,12 +4,10 @@ imports = # Home Manager Modules [ (import ../modules/shell/git/home.nix) ] ++ [ (import ../modules/programs/wofi.nix) ] ++ - [ (import ../modules/editors/nvim/home.nix) ] ++ [ (import ../modules/programs/devenv/home.nix) ] ++ [ (import ../modules/programs/kitty.nix) ] ++ [ (import ../modules/shell/tmux/home.nix) ] ++ [ (import ../modules/shell/ranger/home.nix) ] ++ - [ (import ../modules/editors/lvim/home.nix) ] ++ [ (import ../modules/themes/home.nix) ] ++ [ (import ../modules/programs/mako.nix) ] ++ [ (import ../modules/programs/alacritty.nix) ] ++ @@ -28,6 +26,7 @@ homeDirectory = "/home/${user}"; packages = with pkgs; [ + inputs.neovim-config.packages.${system}.default kicad devbox nix-prefetch-git diff --git a/modules/editors/lvim/home.nix b/modules/editors/lvim/home.nix deleted file mode 100644 index daa2931..0000000 --- a/modules/editors/lvim/home.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs, ... }: - -{ - home.file."/home/glen/.config/lvim" = { - source = ./lvim; - recursive = true; - }; - - home.packages = with pkgs; [ - - ]; - -} diff --git a/modules/editors/lvim/lvim/config.lua b/modules/editors/lvim/lvim/config.lua deleted file mode 100644 index 148c3aa..0000000 --- a/modules/editors/lvim/lvim/config.lua +++ /dev/null @@ -1,5 +0,0 @@ -reload "user.plugins" -reload "user.surround" -reload "user.dial" -reload "user.oil" -reload "user.keymaps" diff --git a/modules/editors/lvim/lvim/lua/user/dial.lua b/modules/editors/lvim/lvim/lua/user/dial.lua deleted file mode 100644 index 15da12e..0000000 --- a/modules/editors/lvim/lvim/lua/user/dial.lua +++ /dev/null @@ -1,70 +0,0 @@ -local status_ok, dial_config = pcall(require, "dial.config") -if not status_ok then - return -end - -local augend = require "dial.augend" -dial_config.augends:register_group { - default = { - augend.integer.alias.decimal, - augend.integer.alias.hex, - augend.date.alias["%Y/%m/%d"], - }, - typescript = { - augend.integer.alias.decimal, - augend.integer.alias.hex, - augend.constant.new { elements = { "let", "const" } }, - }, - visual = { - augend.integer.alias.decimal, - augend.integer.alias.hex, - augend.date.alias["%Y/%m/%d"], - augend.constant.alias.alpha, - augend.constant.alias.Alpha, - }, - mygroup = { - augend.constant.new { - elements = { "and", "or" }, - word = true, -- if false, "sand" is incremented into "sor", "doctor" into "doctand", etc. - cyclic = true, -- "or" is incremented into "and". - }, - augend.constant.new { - elements = { "True", "False" }, - word = true, - cyclic = true, - }, - augend.constant.new { - elements = { "public", "private" }, - word = true, - cyclic = true, - }, - augend.constant.new { - elements = { "sad", "sad" }, - word = true, - cyclic = true, - }, - augend.constant.new { - elements = { "&&", "||" }, - word = false, - cyclic = true, - }, - augend.date.alias["%m/%d/%Y"], -- date (02/19/2022, etc.) - augend.constant.alias.bool, -- boolean value (true <-> false) - augend.integer.alias.decimal, - augend.integer.alias.hex, - augend.semver.alias.semver - }, -} - -local map = require "dial.map" - --- change augends in VISUAL mode -vim.api.nvim_set_keymap("n", "", map.inc_normal "mygroup", { noremap = true }) -vim.api.nvim_set_keymap("n", "", map.dec_normal "mygroup", { noremap = true }) -vim.api.nvim_set_keymap("v", "", map.inc_normal "visual", { noremap = true }) -vim.api.nvim_set_keymap("v", "", map.dec_normal "visual", { noremap = true }) - -vim.cmd [[ - " enable only for specific FileType - autocmd FileType typescript,javascript lua vim.api.nvim_buf_set_keymap(0, "n", "", require("dial.map").inc_normal("typescript"), {noremap = true}) -]] diff --git a/modules/editors/lvim/lvim/lua/user/keymaps.lua b/modules/editors/lvim/lvim/lua/user/keymaps.lua deleted file mode 100644 index dfdfe67..0000000 --- a/modules/editors/lvim/lvim/lua/user/keymaps.lua +++ /dev/null @@ -1 +0,0 @@ -vim.keymap.set("n", "-", require("oil").open, { desc = "Open parent directory" }) diff --git a/modules/editors/lvim/lvim/lua/user/oil.lua b/modules/editors/lvim/lvim/lua/user/oil.lua deleted file mode 100644 index 2e5ec56..0000000 --- a/modules/editors/lvim/lvim/lua/user/oil.lua +++ /dev/null @@ -1,127 +0,0 @@ -require("oil").setup({ - -- Id is automatically added at the beginning, and name at the end - -- See :help oil-columns - columns = { - "icon", - -- "permissions", - -- "size", - -- "mtime", - }, - -- Buffer-local options to use for oil buffers - buf_options = { - buflisted = false, - bufhidden = "hide", - }, - -- Window-local options to use for oil buffers - win_options = { - wrap = false, - signcolumn = "no", - cursorcolumn = false, - foldcolumn = "0", - spell = false, - list = false, - conceallevel = 3, - concealcursor = "n", - }, - -- Oil will take over directory buffers (e.g. `vim .` or `:e src/` - default_file_explorer = true, - -- Restore window options to previous values when leaving an oil buffer - restore_win_options = true, - -- Skip the confirmation popup for simple operations - skip_confirm_for_simple_edits = false, - -- Deleted files will be removed with the trash_command (below). - delete_to_trash = false, - -- Change this to customize the command used when deleting to trash - trash_command = "trash-put", - -- Selecting a new/moved/renamed file or directory will prompt you to save changes first - prompt_save_on_select_new_entry = true, - -- Keymaps in oil buffer. Can be any value that `vim.keymap.set` accepts OR a table of keymap - -- options with a `callback` (e.g. { callback = function() ... end, desc = "", nowait = true }) - -- Additionally, if it is a string that matches "actions.", - -- it will use the mapping at require("oil.actions"). - -- Set to `false` to remove a keymap - -- See :help oil-actions for a list of all available actions - keymaps = { - ["g?"] = "actions.show_help", - [""] = "actions.select", - [""] = "actions.select_vsplit", - [""] = "actions.select_split", - [""] = "actions.select_tab", - [""] = "actions.preview", - [""] = "actions.close", - [""] = "actions.refresh", - ["-"] = "actions.parent", - ["_"] = "actions.open_cwd", - ["`"] = "actions.cd", - ["~"] = "actions.tcd", - ["g."] = "actions.toggle_hidden", - }, - -- Set to false to disable all of the above keymaps - use_default_keymaps = true, - view_options = { - -- Show files and directories that start with "." - show_hidden = false, - -- This function defines what is considered a "hidden" file - is_hidden_file = function(name, bufnr) - return vim.startswith(name, ".") - end, - -- This function defines what will never be shown, even when `show_hidden` is set - is_always_hidden = function(name, bufnr) - return false - end, - }, - -- Configuration for the floating window in oil.open_float - float = { - -- Padding around the floating window - padding = 2, - max_width = 0, - max_height = 0, - border = "rounded", - win_options = { - winblend = 10, - }, - -- This is the config that will be passed to nvim_open_win. - -- Change values here to customize the layout - override = function(conf) - return conf - end, - }, - -- Configuration for the actions floating preview window - preview = { - -- Width dimensions can be integers or a float between 0 and 1 (e.g. 0.4 for 40%) - -- min_width and max_width can be a single value or a list of mixed integer/float types. - -- max_width = {100, 0.8} means "the lesser of 100 columns or 80% of total" - max_width = 0.9, - -- min_width = {40, 0.4} means "the greater of 40 columns or 40% of total" - min_width = { 40, 0.4 }, - -- optionally define an integer/float for the exact width of the preview window - width = nil, - -- Height dimensions can be integers or a float between 0 and 1 (e.g. 0.4 for 40%) - -- min_height and max_height can be a single value or a list of mixed integer/float types. - -- max_height = {80, 0.9} means "the lesser of 80 columns or 90% of total" - max_height = 0.9, - -- min_height = {5, 0.1} means "the greater of 5 columns or 10% of total" - min_height = { 5, 0.1 }, - -- optionally define an integer/float for the exact height of the preview window - height = nil, - border = "rounded", - win_options = { - winblend = 0, - }, - }, - -- Configuration for the floating progress window - progress = { - max_width = 0.9, - min_width = { 40, 0.4 }, - width = nil, - max_height = { 10, 0.9 }, - min_height = { 5, 0.1 }, - height = nil, - border = "rounded", - minimized_border = "none", - win_options = { - winblend = 0, - }, - }, -}) - diff --git a/modules/editors/lvim/lvim/lua/user/plugins.lua b/modules/editors/lvim/lvim/lua/user/plugins.lua deleted file mode 100644 index 0952469..0000000 --- a/modules/editors/lvim/lvim/lua/user/plugins.lua +++ /dev/null @@ -1,29 +0,0 @@ --- Additional Plugins -lvim.plugins = { - "kylechui/nvim-surround", - "monaqa/dial.nvim", -{ - "cbochs/grapple.nvim", - dependencies = { "nvim-lua/plenary.nvim" }, -}, -{ - 'stevearc/oil.nvim', - opts = {}, - -- Optional dependencies - dependencies = { "nvim-tree/nvim-web-devicons" }, -}, -{ - "folke/flash.nvim", - event = "VeryLazy", - ---@type Flash.Config - opts = {}, - -- stylua: ignore - keys = { - { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" }, - { "S", mode = { "n", "o", "x" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" }, - { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" }, - { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" }, - { "", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, - }, -}, -} diff --git a/modules/editors/lvim/lvim/lua/user/surround.lua b/modules/editors/lvim/lvim/lua/user/surround.lua deleted file mode 100644 index bc7807c..0000000 --- a/modules/editors/lvim/lvim/lua/user/surround.lua +++ /dev/null @@ -1,21 +0,0 @@ -local status_ok, surround = pcall(require, "nvim-surround") -if not status_ok then - return -end - -surround.setup { - keymaps = { -- vim-surround style keymaps - insert = "s", - insert_line = "S", - normal = "s", - normal_cur = "ss", - normal_line = "S", - normal_cur_line = "SS", - visual = "s", - visual_line = "gS", - delete = "ds", - change = "cs", - }, -} - -vim.cmd [[nmap ' siw']] diff --git a/modules/editors/nvim/config/init.lua b/modules/editors/nvim/config/init.lua deleted file mode 100644 index 5ed8344..0000000 --- a/modules/editors/nvim/config/init.lua +++ /dev/null @@ -1,16 +0,0 @@ -vim.opt.expandtab = true -vim.opt.hidden = true -vim.opt.incsearch = true -vim.opt.mouse = "a" -vim.opt.relativenumber = true -vim.opt.shiftwidth = 2 -vim.opt.splitbelow = true -vim.opt.splitright = true -vim.opt.signcolumn = "yes:3" -vim.opt.tabstop = 2 -vim.opt.timeoutlen = 0 -vim.wo.wrap = false -vim.opt.exrc = true -vim.cmd("syntax on") - -vim.opt.clipboard = "unnamedplus" diff --git a/modules/editors/nvim/config/lspconfig.lua b/modules/editors/nvim/config/lspconfig.lua deleted file mode 100644 index 428282b..0000000 --- a/modules/editors/nvim/config/lspconfig.lua +++ /dev/null @@ -1,28 +0,0 @@ -local lspc = require'lspconfig' - -lspc.nil_ls.setup{} -lspc.clangd.setup{} - -local buf_map = function(bufnr, mode, lhs, rhs, opts) - vim.api.nvim_buf_set_keymap(bufnr, mode, lhs, rhs, opts or { - silent = true, - }) -end - -lspc.tsserver.setup({ - on_attach = function(client, bufnr) - client.resolved_capabilities.document_formatting = false - client.resolved_capabilities.document_range_formatting = false - - local ts_utils = require("nvim-lsp-ts-utils") - ts_utils.setup({}) - ts_utils.setup_client(client) - - buf_map(bufnr, "n", "gs", ":TSLspOrganize") - buf_map(bufnr, "n", "gi", ":TSLspRenameFile") - buf_map(bufnr, "n", "go", ":TSLspImportAll") - - on_attach(client, bufnr) - end, -}) - diff --git a/modules/editors/nvim/config/nvim-cmp.lua b/modules/editors/nvim/config/nvim-cmp.lua deleted file mode 100644 index 13bff54..0000000 --- a/modules/editors/nvim/config/nvim-cmp.lua +++ /dev/null @@ -1,73 +0,0 @@ -local has_words_before = function() - local line, col = unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil -end - -local feedkey = function(key, mode) - vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, true, true), mode, true) -end - -local cmp = require("cmp") -local lspkind = require("lspkind") - -cmp.setup({ - sources = { - { name = "nvim_lsp" }, - { name = "cmp_tabnine" }, - { name = "treesitter" }, - { name = "buffer" }, - { name = "path" }, - { name = "vsnip" }, - -- { name = "copilot" }, - }, - - snippet = { - expand = function(args) - vim.fn["vsnip#anonymous"](args.body) - end, - }, - - formatting = { - format = lspkind.cmp_format({ - with_text = true, - menu = { - buffer = "[Buf]", - nvim_lsp = "[LSP]", - nvim_lua = "[Lua]", - latex_symbols = "[Latex]", - treesitter = "[TS]", - cmp_tabnine = "[TN]", - vsnip = "[Snip]", - }, - }), - }, - - mapping = { - [""] = cmp.mapping.confirm({ select = true }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif vim.fn["vsnip#available"](1) == 1 then - feedkey("(vsnip-expand-or-jump)", "") - elseif has_words_before() then - cmp.complete() - else - fallback() - end - end, { - "i", - "s", - }), - - [""] = cmp.mapping(function() - if cmp.visible() then - cmp.select_prev_item() - elseif vim.fn["vsnip#jumpable"](-1) == 1 then - feedkey("(vsnip-jump-prev)", "") - end - end, { - "i", - "s", - }), - }, -}) diff --git a/modules/editors/nvim/config/theming.lua b/modules/editors/nvim/config/theming.lua deleted file mode 100644 index 091687e..0000000 --- a/modules/editors/nvim/config/theming.lua +++ /dev/null @@ -1,20 +0,0 @@ --- set colorscheme -vim.cmd 'set termguicolors' - -vim.g.catppuccin_flavour = "mocha" - -require("catppuccin").setup() - -vim.cmd [[colorscheme catppuccin]] - --- enable colorizer -require'colorizer'.setup() - --- set sign -vim.cmd 'sign define DiagnosticSignError text= linehl= texthl=DiagnosticSignError numhl=' -vim.cmd 'sign define DiagnosticSignHint text= linehl= texthl=DiagnosticSignHint numhl=' -vim.cmd 'sign define DiagnosticSignInfo text= linehl= texthl=DiagnosticSignInfo numhl=' -vim.cmd 'sign define DiagnosticSignWarn text= linehl= texthl=DiagnosticSignWarn numhl=' - --- set lightline theme to horizon -vim.g.lightline = { colorscheme = "catppuccin" } diff --git a/modules/editors/nvim/config/treesitter-textobjects.lua b/modules/editors/nvim/config/treesitter-textobjects.lua deleted file mode 100644 index 8f2c6d6..0000000 --- a/modules/editors/nvim/config/treesitter-textobjects.lua +++ /dev/null @@ -1,14 +0,0 @@ -require'nvim-treesitter.configs'.setup { - textobjects = { - select = { - enable = true, - keymaps = { - -- You can use the capture groups defined in textobjects.scm - ["af"] = "@function.outer", - ["if"] = "@function.inner", - ["ac"] = "@class.outer", - ["ic"] = "@class.inner", - }, - }, - }, -} diff --git a/modules/editors/nvim/config/treesitter.lua b/modules/editors/nvim/config/treesitter.lua deleted file mode 100644 index 1f33ef0..0000000 --- a/modules/editors/nvim/config/treesitter.lua +++ /dev/null @@ -1,30 +0,0 @@ -require("nvim-treesitter.configs").setup({ - highlight = { - enable = true, - disable = {}, - }, - rainbow = { - enable = true, - extended_mode = true, - }, - autotag = { - enable = true, - }, - context_commentstring = { - enable = true, - }, - incremental_selection = { - enable = true, - keymaps = { - init_selection = "gnn", - node_incremental = "grn", - scope_incremental = "grc", - node_decremental = "grm", - }, - }, -}) - --- breaks highlight --- vim.cmd([[set foldmethod=expr]]) --- vim.cmd([[set foldlevel=10]]) --- vim.cmd([[set foldexpr=nvim_treesitter#foldexpr()]]) \ No newline at end of file diff --git a/modules/editors/nvim/config/utils.lua b/modules/editors/nvim/config/utils.lua deleted file mode 100644 index e1a264c..0000000 --- a/modules/editors/nvim/config/utils.lua +++ /dev/null @@ -1,29 +0,0 @@ --- telescope -require('telescope').load_extension('fzy_native') - --- null-ls -local nb = require('null-ls').builtins - -require('null-ls').setup({ - sources = { - nb.formatting.alejandra, - nb.code_actions.statix, - nb.diagnostics.cppcheck, - nb.diagnostics.deadnix, - nb.diagnostics.statix, - nb.diagnostics.eslint, - nb.completion.spell, - }, -}) - -require("gitsigns").setup() - --- autopairs -require('nvim-autopairs').setup{} - --- copy to system clipboard -vim.api.nvim_set_keymap( 'v', 'y', '"+y', {noremap = true}) -vim.api.nvim_set_keymap( 'n', 'y', ':%+y', {noremap = true}) - --- paste from system clipboard -vim.api.nvim_set_keymap( 'n', 'p', '"+p', {noremap = true}) diff --git a/modules/editors/nvim/config/which-key.lua b/modules/editors/nvim/config/which-key.lua deleted file mode 100644 index ba3bc32..0000000 --- a/modules/editors/nvim/config/which-key.lua +++ /dev/null @@ -1,39 +0,0 @@ -vim.g.mapleader = " " - -local wk = require("which-key") - -wk.setup({}) - -wk.register({ - [""] = { - b = { "Telescope buffers", "Buffers" }, - ["/"] = { "Telescope live_grep", "Live Grep" }, - f = { "Telescope find_files", "Find File" }, - g = { - name = "Git / VCS", - i = { "lua require('telescope').extensions.gh.issues()", "Github Issues" }, - p = { "lua require('telescope').extensions.gh.pull_request()", "Github PRs" }, - b = { "ToggleBlameLine", "Toggle BlameLine" }, - c = { "Neogit commit", "Commit" }, - s = { "Neogit kind=split", "Staging" }, - }, - a = { "lua require('telescope.builtin').lsp_code_actions()", "Code Actions" }, - d = { "lua require('telescope.builtin').lsp_document_diagnostics()", "LSP Diagnostics" }, - k = { "lua vim.lsp.buf.signature_help()", "Signature Help" }, - l = { - name = "LSP", - f = { "lua vim.lsp.buf.formatting_sync()", "Format file"}, - q = { "lua vim.lsp.diagnostic.set_loclist()", "Set Loclist" }, - e = { "lua vim.lsp.diagnostic.show_line_diagnostics()", "Show Line Diagnostics" }, - }, - p = { "\"+p", "Paste from clipboard" }, - P = { "\"+P", "Paste from clipboard before cursor" }, - y = { "\"+y", "Yank to clipboard" }, - }, - g = { - l = { "$", "Line end" }, - h = { "0", "Line start" }, - s = { "^", "First non-blank in line" }, - e = { "G", "Bottom" }, - }, -}) diff --git a/modules/editors/nvim/home.nix b/modules/editors/nvim/home.nix deleted file mode 100644 index 7c1f643..0000000 --- a/modules/editors/nvim/home.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ pkgs, ... }: { - programs.neovim = { - enable = true; - - vimAlias = true; - viAlias = true; - vimdiffAlias = true; - - plugins = with pkgs.vimPlugins; [ - catppuccin-nvim - cmp-buffer - cmp-nvim-lsp - cmp-path - cmp-spell - cmp-treesitter - cmp-vsnip - friendly-snippets - gitsigns-nvim - lightline-vim - lspkind-nvim - neogit - null-ls-nvim - nvim-autopairs - nvim-cmp - nvim-colorizer-lua - nvim-lspconfig - nvim-tree-lua - nvim-ts-rainbow - nvim-treesitter.withAllGrammars - plenary-nvim - telescope-fzy-native-nvim - telescope-nvim - telescope-github-nvim - vim-floaterm - vim-sneak - vim-vsnip - which-key-nvim - ]; - - extraPackages = with pkgs; [ gcc ripgrep fd deadnix ]; - - extraConfig = - let - luaRequire = module: - builtins.readFile (builtins.toString - ./config - + "/${module}.lua"); - luaConfig = builtins.concatStringsSep "\n" (map luaRequire [ - "init" - "lspconfig" - "nvim-cmp" - "theming" - "treesitter" - "treesitter-textobjects" - "utils" - "which-key" - ]); - in - '' - lua <<  - ${luaConfig} -  - ''; - }; -} diff --git a/modules/programs/alacritty.nix b/modules/programs/alacritty.nix index 28352cc..7f66364 100644 --- a/modules/programs/alacritty.nix +++ b/modules/programs/alacritty.nix @@ -3,6 +3,7 @@ { programs.alacritty.enable = true; programs.alacritty.settings = { + env = { TERM = "xterm-256color"; }; colors = with config.colorScheme.colors; { bright = { black = "0x${base03}"; diff --git a/modules/shell/tmux/home.nix b/modules/shell/tmux/home.nix index 5a65302..992292a 100644 --- a/modules/shell/tmux/home.nix +++ b/modules/shell/tmux/home.nix @@ -18,206 +18,128 @@ ]; extraConfig = '' - bind -n M-r source-file ~/.config/tmux/tmux.conf + bind -n M-r source-file ~/.config/tmux/tmux.conf - set -g mouse on + set -ag terminal-overrides ",xterm-256color:RGB" - set-option -g status-position top - bind-key g display-popup -h 95% -w 95% -E 'lazygit' - bind-key t display-popup -h 95% -w 95% -E "${pkgs.htop}/bin/htop" - bind C-g display-popup -E "tat ~/gallery" + set -g detach-on-destroy off # don't exit from tmux when closing a session - bind -n M-g display-popup -E "tmux new-session -A -s scratch" + # New Theme + set -g status-interval 3 # update the status bar every 3 seconds + set -g status-left "#[fg=blue,bold,bg=#${config.colorScheme.colors.base00}] #S  " + set -g status-right "#[fg=#${config.colorScheme.colors.base07},bold,bg=#${config.colorScheme.colors.base00}]%a %Y-%m-%d 󱑒 %l:%M %p" + set -ga status-right "#($HOME/.config/tmux/scripts/cal.sh)" + set -g status-justify left + set -g status-left-length 200 # increase length (from 10) + set -g status-right-length 200 # increase length (from 10) + set -g status-position top # macOS / darwin style + set -g status-style 'bg=#${config.colorScheme.colors.base00}' # transparent + set -g window-status-current-format '#[fg=magenta,bg=#${config.colorScheme.colors.base00}]*#I #W#{?window_zoomed_flag,(),} ' + set -g window-status-format '#[fg=gray,bg=#${config.colorScheme.colors.base00}] #I #W' + set -g window-status-last-style 'fg=white,bg=black' + set -g message-command-style bg=default,fg=yellow + set -g message-style bg=default,fg=yellow + set -g mode-style bg=default,fg=yellow + set -g pane-active-border-style 'fg=magenta,bg=default' + set -g pane-border-style 'fg=brightblack,bg=default' + set -g @tmux-last-prompt-pattern ' ' + set -g @tmux-nerd-font-window-name-shell-icon '' + set -g @tmux-nerd-font-window-name-show-name false - bind -n M-b switch-client -l - bind -n M-p previous-window - bind -n M-n next-window - bind -n M-P switch-client -p - bind -n M-N switch-client -n - unbind f - bind f resize-pane -Z - # create session - bind C-c new-session + set -g mouse on - # split current window horizontally - bind - split-window -v - # split current window vertically - bind _ split-window -h + set-option -g status-position top - # Select Layouts - #――――――――――――――――― - bind -n M-a select-layout main-vertical - bind -n M-A select-layout main-horizontal - bind -n M-E select-layout even-vertical - bind -n M-V select-layout even-horizontal + bind-key g display-popup -h 95% -w 95% -E 'lazygit' + bind-key t display-popup -h 95% -w 95% -E "${pkgs.htop}/bin/htop" - # pane navigation - bind -r h select-pane -L # move left - bind -r j select-pane -D # move down - bind -r k select-pane -U # move up - bind -r l select-pane -R # move right - bind > swap-pane -D # swap current pane with the next one - bind < swap-pane -U # swap current pane with the previous one + bind C-g display-popup -E "tat ~/gallery" - # pane resizing - bind -r H resize-pane -L 2 - bind -r J resize-pane -D 2 - bind -r K resize-pane -U 2 - bind -r L resize-pane -R 2 - bind -r c-f resize-pane -Z + bind -n M-g display-popup -E "tmux new-session -A -s scratch" - # window navigation - unbind n - unbind p + bind -n M-b switch-client -l + bind -n M-p previous-window + bind -n M-n next-window + bind -n M-P switch-client -p + bind -n M-N switch-client -n - setw -g mode-keys vi + unbind f + bind f resize-pane -Z - bind Enter copy-mode # enter copy mode + # create session + bind C-c new-session - bind -T copy-mode-vi v send -X begin-selection - bind -T copy-mode-vi C-v send -X rectangle-toggle - bind -T copy-mode-vi y send -X copy-selection-and-cancel - bind -T copy-mode-vi Escape send -X cancel - bind -T copy-mode-vi H send -X start-of-line - bind -T copy-mode-vi L send -X end-of-line + # split current window horizontally + bind - split-window -v + # split current window vertically + bind _ split-window -h - # -- buffers ------------------------------------------------------------------- + # Select Layouts + #――――――――――――――――― + bind -n M-a select-layout main-vertical + bind -n M-A select-layout main-horizontal + bind -n M-E select-layout even-vertical + bind -n M-V select-layout even-horizontal - bind b list-buffers # list paste buffers - bind p paste-buffer -p # paste from the top paste buffer - bind P choose-buffer # choose which buffer to paste from + # pane navigation + bind -r h select-pane -L # move left + bind -r j select-pane -D # move down + bind -r k select-pane -U # move up + bind -r l select-pane -R # move right + bind > swap-pane -D # swap current pane with the next one + bind < swap-pane -U # swap current pane with the previous one - # -- display ------------------------------------------------------------------- + # pane resizing + bind -r H resize-pane -L 2 + bind -r J resize-pane -D 2 + bind -r K resize-pane -U 2 + bind -r L resize-pane -R 2 + bind -r c-f resize-pane -Z - set -g base-index 1 # start windows numbering at 1 - setw -g pane-base-index 1 # make pane numbering consistent with windows - set -g renumber-windows on # renumber windows when a window is closed + # window navigation + unbind n + unbind p - bind k display-popup -E "\ - tmux list-sessions -F '#{?session_attached,,#{session_name}}' |\ - fzf --reverse -m --header=kill-session |\ - xargs -I {} tmux kill-session -t {}" + setw -g mode-keys vi - bind C-j display-popup -E "\ - tmux list-sessions -F '#{?session_attached,,#{session_name}}' |\ - sed '/^$/d' |\ - fzf --reverse --header jump-to-session --preview 'tmux capture-pane -pt {}' |\ - xargs tmux switch-client -t" + bind Enter copy-mode # enter copy mode - # THEME + bind -T copy-mode-vi v send -X begin-selection + bind -T copy-mode-vi C-v send -X rectangle-toggle + bind -T copy-mode-vi y send -X copy-selection-and-cancel + bind -T copy-mode-vi Escape send -X cancel + bind -T copy-mode-vi H send -X start-of-line + bind -T copy-mode-vi L send -X end-of-line - right_arrow_icon='' - left_arrow_icon='' - upload_speed_icon='' - download_speed_icon='' - session_icon='' - user_icon='' - time_icon='' - date_icon='' - time_format='%T' - date_format='%F' + # -- buffers ------------------------------------------------------------------- - # short for Theme-Colour - TC="#${config.colorScheme.colors.base09}" + bind b list-buffers # list paste buffers + bind p paste-buffer -p # paste from the top paste buffer + bind P choose-buffer # choose which buffer to paste from - G01=#080808 #232 - G02=#121212 #233 - G03=#1c1c1c #234 - #G04=#262626 #235 - G04=#${config.colorScheme.colors.base00} #235 - G05=#303030 #236 - #G06=#3a3a3a #237 - G06=#${config.colorScheme.colors.base02} #237 - G07=#444444 #238 - G08=#4e4e4e #239 - G09=#585858 #240 - G10=#626262 #241 - G11=#6c6c6c #242 - G12=#767676 #243 + # -- display ------------------------------------------------------------------- - FG="#${config.colorScheme.colors.base03}" - BG="#${config.colorScheme.colors.base00}" + set -g base-index 1 # start windows numbering at 1 + setw -g pane-base-index 1 # make pane numbering consistent with windows + set -g renumber-windows on # renumber windows when a window is closed - # Status options - set-option -gq status-interval 1 - set-option -gq status on + bind k display-popup -E "\ + tmux list-sessions -F '#{?session_attached,,#{session_name}}' |\ + fzf --reverse -m --header=kill-session |\ + xargs -I {} tmux kill-session -t {}" - # Basic status bar colors - set-option -gq status-fg "$FG" - set-option -gq status-bg "$BG" - set-option -gq status-attr none + bind C-j display-popup -E "\ + tmux list-sessions -F '#{?session_attached,,#{session_name}}' |\ + sed '/^$/d' |\ + fzf --reverse --header jump-to-session --preview 'tmux capture-pane -pt {}' |\ + xargs tmux switch-client -t" - # tmux-prefix-highlight - set-option -gq @prefix_highlight_fg "$BG" - set-option -gq @prefix_highlight_bg "$FG" - set-option -gq @prefix_highlight_show_copy_mode 'on' - set-option -gq @prefix_highlight_copy_mode_attr "fg=$TC,bg=$BG,bold" - set-option -gq @prefix_highlight_output_prefix "#[fg=$TC]#[bg=$BG]$left_arrow_icon#[bg=$TC]#[fg=$BG]" - set-option -gq @prefix_highlight_output_suffix "#[fg=$TC]#[bg=$BG]$right_arrow_icon" - #      - # Left side of status bar - set-option -gq status-left-bg "$G04" - set-option -gq status-left-fg "G12" - set-option -gq status-left-length 150 - user=${user} - LS="#[fg=$G04,bg=$TC,bold] $user_icon $user@#h #[fg=$TC,bg=$G06,nobold]$right_arrow_icon#[fg=$TC,bg=$G06] $session_icon #S " - LS="$LS#[fg=$G06,bg=$BG]$right_arrow_icon" - LS="$LS#{prefix_highlight}" - - set-option -gq status-left "$LS" - - # Right side of status bar - set-option -gq status-right-bg "$BG" - set-option -gq status-right-fg "G12" - set-option -gq status-right-length 150 - RS="#[fg=$G06]$left_arrow_icon#[fg=$TC,bg=$G06] $time_icon $time_format #[fg=$TC,bg=$G06]$left_arrow_icon#[fg=$G04,bg=$TC] $date_icon $date_format " - - set-option -gq status-right "$RS" - - # Window status - set-option -gq window-status-format " #I:#W#F " - set-option -gq window-status-current-format "#[fg=$BG,bg=$G06]$right_arrow_icon#[fg=$TC,bold] #I:#W#F #[fg=$G06,bg=$BG,nobold]$right_arrow_icon" - - # Window separator - set-option -gq window-status-separator "" - - # Window status alignment - set-option -gq status-justify centre - - # Current window status - set-option -gq window-status-current-statys "fg=$TC,bg=$BG" - - # Pane border - set-option -gq pane-border-style "fg=$G07,bg=default" - - # Active pane border - set-option -gq pane-active-border-style "fg=$TC,bg=$BG" - - # Pane number indicator - set-option -gq display-panes-colour "$G07" - set-option -gq display-panes-active-colour "$TC" - - # Clock mode - set-option -gq clock-mode-colour "$TC" - set-option -gq clock-mode-style 24 - - # Message - set-option -gq message-style "fg=$TC,bg=$BG" - - # Command message - set-option -gq message-command-style "fg=$TC,bg=$BG" - - # Copy mode highlight - set-option -gq mode-style "bg=$TC,fg=$FG" - - # vim: set ft=tmux tw=0 nowrap: - - ''; + ''; }; programs.tmate = { diff --git a/modules/shell/tmux/ta.sh b/modules/shell/tmux/ta.sh index 59c666d..be17bd3 100644 --- a/modules/shell/tmux/ta.sh +++ b/modules/shell/tmux/ta.sh @@ -50,7 +50,7 @@ create_detached_session() { (TMUX='' tmux new-session -Ad -s "$session_name" -c "$path_name" tmux split-window -vb -t "$session_name" -c "$path_name" -p 70 - tmux send-keys -t "$session_name" "/home/glen/.local/bin/lvim '+Telescope find_files'" Enter + tmux send-keys -t "$session_name" "nvim '+Telescope find_files'" Enter ) fi } diff --git a/modules/shell/zsh/home.nix b/modules/shell/zsh/home.nix index 795ea00..12693e7 100644 --- a/modules/shell/zsh/home.nix +++ b/modules/shell/zsh/home.nix @@ -3,6 +3,8 @@ programs.zsh = { enable = true; shellAliases = { + + vim = "nvim"; update = "sudo nixos-rebuild switch"; clean = "nix-collect-garbage -d"; reload = "source ~/.zshrc"; @@ -12,11 +14,11 @@ "..." = "cd ../../../"; "...." = "cd ../../../../"; - ls = "eza --icons"; - l = "eza -al --icons"; - la = "eza -a --color=always --group-directories-first --icons"; # all files and dirs - ll = "eza -l --color=always --group-directories-first --icons"; # long format - lt = "eza -aT --color=always --group-directories-first --icons"; # tree listing + ls = "eza --icons=always"; + l = "eza -al --icons=always"; + la = "eza -a --color=always --group-directories-first --icons=always"; # all files and dirs + ll = "eza -l --color=always --group-directories-first --icons=always"; # long format + lt = "eza -aT --color=always --group-directories-first --icons=always"; # tree listing cat = "bat"; ps = "procs"; @@ -51,9 +53,6 @@ clock = "sudo ntpd -gq"; octal = "stat -c '%a %n'"; - v = "nix run ~/Projects/nixvim --"; - lvim = "/home/glen/.local/bin/lvim"; - }; zplug = { diff --git a/modules/themes/home.nix b/modules/themes/home.nix index 8633916..ed723ca 100644 --- a/modules/themes/home.nix +++ b/modules/themes/home.nix @@ -3,7 +3,7 @@ { imports = [ inputs.nix-colors.homeManagerModules.default ]; # choose a theme from here https://github.com/tinted-theming/base16-schemes/tree/main - colorScheme = inputs.nix-colors.colorSchemes.everforest; + colorScheme = inputs.nix-colors.colorSchemes.tokyo-night-terminal-storm; diff --git a/overlays/defualt.nix b/overlays/defualt.nix new file mode 100644 index 0000000..2c21f95 --- /dev/null +++ b/overlays/defualt.nix @@ -0,0 +1,23 @@ +# This file defines overlays +{ inputs, ... }: { + # This one brings our custom packages from the 'pkgs' directory + additions = final: _prev: import ../pkgs { pkgs = final; }; + + # This one contains whatever you want to overlay + # You can change versions, add patches, set compilation flags, anything really. + # https://nixos.wiki/wiki/Overlays + modifications = final: prev: { + # example = prev.example.overrideAttrs (oldAttrs: rec { + # ... + # }); + }; + + # When applied, the unstable nixpkgs set (declared in the flake inputs) will + # be accessible through 'pkgs.unstable' + unstable-packages = final: _prev: { + unstable = import inputs.nixpkgs-unstable { + system = final.system; + config.allowUnfree = true; + }; + }; +}