diff --git a/configuration.example.nix b/configuration.example.nix index f464111..23d4cb1 100644 --- a/configuration.example.nix +++ b/configuration.example.nix @@ -1,9 +1,8 @@ # NixOS config entry point # import the hardware and configuration files specific to your machine { - imports = - [ - ./machines/MacBookPro12.1-hardware-configuration.nix - ./machines/MacBookPro12.1-configuration.nix - ]; -} \ No newline at end of file + imports = [ + ./machines/MacBookPro12.1-hardware-configuration.nix + ./machines/MacBookPro12.1-configuration.nix + ]; +} diff --git a/dotfiles/nvim/lua/mappings.lua b/dotfiles/nvim/lua/mappings.lua index 3d51d1d..9bfc33e 100644 --- a/dotfiles/nvim/lua/mappings.lua +++ b/dotfiles/nvim/lua/mappings.lua @@ -1,44 +1,46 @@ require "nvchad.mappings" -local map = vim.keymap.set -local nomap = vim.keymap.set +-- remove nvchad shell mappings +vim.keymap.del("n", "h") +vim.keymap.del("n", "v") + +local map = vim.keymap.set -nomap({ "i", "x", "n", "s" }, "h") map("n", ";", ":", { desc = "CMD enter command mode" }) map("i", "jk", "") -map({ "i", "x", "n", "s" }, "", function() - require("harpoon"):list():select(1) -end, { desc = "Harpoon file 1" }) - -map({ "i", "x", "n", "s" }, "", function() - require("harpoon"):list():select(2) -end, { desc = "Harpoon file 2" }) - -map({ "i", "x", "n", "s" }, "", function() - require("harpoon"):list():select(3) -end, { desc = "Harpoon file 3" }) - -map({ "i", "x", "n", "s" }, "", function() - require("harpoon"):list():select(4) -end, { desc = "Harpoon file 4" }) - -map({ "i", "x", "n", "s" }, "", function() - require("harpoon"):list():select(5) -end, { desc = "Harpoon file 5" }) - -map({ "i", "x", "n", "s" }, "", function() - require("harpoon"):list():select(6) -end, { desc = "Harpoon file 6" }) - -map({ "i", "x", "n", "s" }, "", function() - require("harpoon"):list():select(7) -end, { desc = "Harpoon file 7" }) - -map({ "i", "x", "n", "s" }, "", function() - require("harpoon"):list():select(8) -end, { desc = "Harpoon file 8" }) - +-- map({ "i", "x", "n", "s" }, "", function() +-- require("harpoon"):list():select(1) +-- end, { desc = "Harpoon file 1" }) +-- +-- map({ "i", "x", "n", "s" }, "", function() +-- require("harpoon"):list():select(2) +-- end, { desc = "Harpoon file 2" }) +-- +-- map({ "i", "x", "n", "s" }, "", function() +-- require("harpoon"):list():select(3) +-- end, { desc = "Harpoon file 3" }) +-- +-- map({ "i", "x", "n", "s" }, "", function() +-- require("harpoon"):list():select(4) +-- end, { desc = "Harpoon file 4" }) +-- +-- map({ "i", "x", "n", "s" }, "", function() +-- require("harpoon"):list():select(5) +-- end, { desc = "Harpoon file 5" }) +-- +-- map({ "i", "x", "n", "s" }, "", function() +-- require("harpoon"):list():select(6) +-- end, { desc = "Harpoon file 6" }) +-- +-- map({ "i", "x", "n", "s" }, "", function() +-- require("harpoon"):list():select(7) +-- end, { desc = "Harpoon file 7" }) +-- +-- map({ "i", "x", "n", "s" }, "", function() +-- require("harpoon"):list():select(8) +-- end, { desc = "Harpoon file 8" }) +-- map({ "x", "n", "s" }, "/", "Telescope live_grep", { desc = "telescope live grep" }) map( { "x", "n", "s" }, diff --git a/dotfiles/nvim/lua/plugins/init.lua b/dotfiles/nvim/lua/plugins/init.lua index 6181d31..7c680c7 100644 --- a/dotfiles/nvim/lua/plugins/init.lua +++ b/dotfiles/nvim/lua/plugins/init.lua @@ -11,7 +11,10 @@ return { require "configs.lspconfig" end, }, - + { + "NvChad/nvterm", + enabled = false + }, { "kdheepak/lazygit.nvim", lazy = true, diff --git a/machines/ace/home.nix b/machines/ace/home.nix index 65bb2e5..26c8144 100644 --- a/machines/ace/home.nix +++ b/machines/ace/home.nix @@ -9,8 +9,8 @@ atuin bat btop -# bruno -# bruno-cli + # bruno + # bruno-cli cargo catnip cmatrix @@ -45,7 +45,7 @@ neovim ollama pandoc -# pass + # pass pciutils pinentry-all presenterm @@ -71,7 +71,7 @@ # dev tools dart-sass -# dbeaver-bin + # dbeaver-bin docker-compose eris-go gcc @@ -87,15 +87,15 @@ nodePackages.prettier php84 php84Packages.composer -# php84Packages.php-cs-fixer + # php84Packages.php-cs-fixer python3 python311Packages.virtualenv -# rpi-imager -# ruff-lsp + # rpi-imager + # ruff-lsp stylelint symfony-cli -# tcl-9_0 -# tk-9_0 + # tcl-9_0 + # tk-9_0 tree-sitter virt-manager wireguard-tools @@ -297,7 +297,7 @@ vim = "$HOME/.nix-profile/bin/nvim"; yeswiki-updater = "cd /home/mrflos/Code/yeswiki-installer/ && sudo php yeswiki-updater.php"; }; - initExtra = '' + initContent = '' export BUN_INSTALL="$HOME/.bun" export PHP_CS_FIXER_IGNORE_ENV=1 export PATH="$HOME/.local/bin:$BUN_INSTALL/bin:$PATH"