Skip to content

Commit

Permalink
changes
Browse files Browse the repository at this point in the history
  • Loading branch information
vinnymeller committed Jun 10, 2024
1 parent a248fdc commit 4b41e0a
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 5 deletions.
3 changes: 2 additions & 1 deletion dotfiles/nvim/lua/keymappings.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
local map = vim.keymap.set

map({ "n", "v" }, "<Space>", "<Nop>", { silent = true })

-- handle wordwrap better
map("n", "k", "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
map("n", "j", "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
Expand Down Expand Up @@ -70,3 +69,5 @@ vim.api.nvim_create_user_command("LspFormat", lsp_format, { desc = "Format curre
map("n", "<leader>fm", "<cmd>LspFormat<CR>", { desc = "[F]ormat [M]anually" })
map("n", "<leader>;", ":<C-f>k", { desc = "Open command window" })
map("n", "<leader>.", "@:", { desc = "Repeat last command" })
map("n", "<leader>pp", "<cmd>lua require('precognition').toggle()<CR>", { desc = "[P]recognition Toggle" })

23 changes: 19 additions & 4 deletions dotfiles/twm/twm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ workspace_definitions:
- Pipfile
default_layout: basic

- name: node
- name: js
has_any_file:
- package.json
- yarn.lock
- .nvmrc
default_layout: basic
- node_modules
- tsconfig.json
default_layout: js-dev

- name: rust
has_any_file:
Expand All @@ -53,13 +53,28 @@ layouts:
commands:
- tmux new-window
- tmux select-window -t 0

- name: default
commands:
- tmux split-window -h
- tmux resize-pane -x 80
- tmux split-window -v
- tmux select-pane -t 0
- nv .

- name: thin-side-pane
commands:
- tmux split-window -h
- tmux resize-pane -x 80
- tmux select-pane -t 0

- name: js-dev
inherits:
- thin-side-pane
commands:
- tmux send-keys -t 1 'npm run dev' C-m
- nv

- name: rust-dev
commands:
- tmux split-window -h
Expand Down
17 changes: 17 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@
inputs.flake-utils.follows = "flake-utils";
};

plugins-precognition-nvim = {
url = "github:tris203/precognition.nvim";
flake = false;
};

neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";

twm = {
Expand Down
1 change: 1 addition & 0 deletions programs/ncvim/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ let
nvim-ts-autotag
nvim-web-devicons
oil-nvim
pkgs.neovimPlugins.precognition-nvim
plenary-nvim
rustaceanvim
sniprun
Expand Down

0 comments on commit 4b41e0a

Please sign in to comment.