Compare commits
No commits in common. "a92c0d905eefc243e6a5977a3f6fc0c6e4cb6d79" and "ab36ee0f4c92083f2d6cb841be58e09bc03dd804" have entirely different histories.
a92c0d905e
...
ab36ee0f4c
3 changed files with 51 additions and 56 deletions
24
flake.lock
24
flake.lock
|
@ -7,11 +7,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725694918,
|
"lastModified": 1725180166,
|
||||||
"narHash": "sha256-+HsjshXpqNiJHLaJaK0JnIicJ/a1NquKcfn4YZ3ILgg=",
|
"narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "aaebdea769a5c10f1c6e50ebdf5924c1a13f0cda",
|
"rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -27,11 +27,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725628909,
|
"lastModified": 1725189302,
|
||||||
"narHash": "sha256-xI0OSqPHcs/c/utJsU0Zvcp1VhejMI9mgwr68uHHlPs=",
|
"narHash": "sha256-IhXok/kwQqtusPsoguQLCHA+h6gKvgdCrkhIaN+kByA=",
|
||||||
"owner": "LnL7",
|
"owner": "LnL7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "76559183801030451e200c90a1627c1d82bb4910",
|
"rev": "7c4b53a7d9f3a3df902b3fddf2ae245ef20ebcda",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -42,11 +42,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725634671,
|
"lastModified": 1725103162,
|
||||||
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
|
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
|
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -58,11 +58,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725727226,
|
"lastModified": 1725346708,
|
||||||
"narHash": "sha256-1OIoBxbdi0ubRSFZWntx1VmFxZP647RBobDzJ5fTdqE=",
|
"narHash": "sha256-rhLiFjrLBA+3Dc9NVsa3v3XDGB/Tn780dAttcNY1f9k=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nur",
|
"repo": "nur",
|
||||||
"rev": "22b3fd31d4b976ead0678ef88063b5b2b9dd7225",
|
"rev": "079d47b2fe664a1e8b16eac5eb32726bcb2774d1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
14
home.nix
14
home.nix
|
@ -33,8 +33,6 @@
|
||||||
jdk21
|
jdk21
|
||||||
any-nix-shell
|
any-nix-shell
|
||||||
aspell
|
aspell
|
||||||
basedpyright
|
|
||||||
bash-language-server
|
|
||||||
cachix
|
cachix
|
||||||
cmake
|
cmake
|
||||||
coursier
|
coursier
|
||||||
|
@ -53,11 +51,9 @@
|
||||||
gnupg
|
gnupg
|
||||||
go
|
go
|
||||||
graphviz
|
graphviz
|
||||||
jq-lsp
|
|
||||||
luajit
|
luajit
|
||||||
luajitPackages.luarocks
|
luajitPackages.luarocks
|
||||||
luajitPackages.luasocket
|
luajitPackages.luasocket
|
||||||
lua-language-server
|
|
||||||
marksman
|
marksman
|
||||||
maven
|
maven
|
||||||
metals
|
metals
|
||||||
|
@ -67,11 +63,14 @@
|
||||||
neovim
|
neovim
|
||||||
nil
|
nil
|
||||||
niv
|
niv
|
||||||
nixd
|
|
||||||
nix-index
|
nix-index
|
||||||
nixfmt-rfc-style
|
nixfmt-rfc-style
|
||||||
nix-prefetch-git
|
nix-prefetch-git
|
||||||
nodejs
|
nodejs
|
||||||
|
nodePackages.bash-language-server
|
||||||
|
nodePackages.typescript-language-server
|
||||||
|
nodePackages.vscode-json-languageserver
|
||||||
|
nodePackages.yaml-language-server
|
||||||
ollama
|
ollama
|
||||||
openssl
|
openssl
|
||||||
pandoc
|
pandoc
|
||||||
|
@ -102,13 +101,10 @@
|
||||||
tokei
|
tokei
|
||||||
tree
|
tree
|
||||||
tree-sitter
|
tree-sitter
|
||||||
typescript
|
|
||||||
typescript-language-server
|
|
||||||
wget
|
wget
|
||||||
vscode-langservers-extracted
|
vscode-langservers-extracted
|
||||||
xcodes
|
xcodes
|
||||||
xz
|
xz
|
||||||
yaml-language-server
|
|
||||||
yq
|
yq
|
||||||
zoom-us
|
zoom-us
|
||||||
];
|
];
|
||||||
|
@ -291,6 +287,6 @@
|
||||||
# Neovim Configuration
|
# Neovim Configuration
|
||||||
xdg.configFile."nvim".source = builtins.fetchGit {
|
xdg.configFile."nvim".source = builtins.fetchGit {
|
||||||
url = "https://code.softinio.com/softinio/nvim-config";
|
url = "https://code.softinio.com/softinio/nvim-config";
|
||||||
rev = "754a8bb8a7161e9f04596081a166722d3ec4a408";
|
rev = "f59b6eedae27085f7430e6d4237f7d3041377d0e";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,47 +9,47 @@ return {
|
||||||
adjust_window_size_when_changing_font_size = false,
|
adjust_window_size_when_changing_font_size = false,
|
||||||
check_for_updates = false,
|
check_for_updates = false,
|
||||||
-- color_scheme = "Gruvbox Light";
|
-- color_scheme = "Gruvbox Light";
|
||||||
color_scheme = 'tokyonight',
|
color_scheme = "tokyonight",
|
||||||
font = wezterm.font 'SF Mono',
|
font = wezterm.font("SF Mono"),
|
||||||
font_size = 16,
|
font_size = 16,
|
||||||
dpi = 144,
|
dpi = 144,
|
||||||
scrollback_lines = 50000,
|
scrollback_lines = 50000,
|
||||||
initial_cols = 400,
|
initial_cols = 400,
|
||||||
initial_rows = 80,
|
initial_rows = 80,
|
||||||
leader = { key = 'b', mods = 'SUPER', timeout_milliseconds = 1000 },
|
leader = { key="b", mods="SUPER", timeout_milliseconds = 1000 },
|
||||||
default_prog = { '/etc/profiles/per-user/salar/bin/fish' },
|
default_prog = { "/etc/profiles/per-user/salar/bin/fish" },
|
||||||
ssh_domains = {
|
ssh_domains = {
|
||||||
{
|
{
|
||||||
name = 'hcloud1',
|
name = "hcloud1",
|
||||||
remote_address = 'hcloud1.softinio.net',
|
remote_address = "hcloud1.softinio.net",
|
||||||
username = 'salar',
|
username = "salar",
|
||||||
remote_wezterm_path = '/run/current-system/sw/bin/wezterm',
|
remote_wezterm_path = "/run/current-system/sw/bin/wezterm"
|
||||||
},
|
}
|
||||||
},
|
},
|
||||||
keys = {
|
keys = {
|
||||||
{ key = '-', mods = 'LEADER', action = wezterm.action { SplitVertical = { domain = 'CurrentPaneDomain' } } },
|
{ key = "-", mods = "LEADER", action=wezterm.action{SplitVertical={domain="CurrentPaneDomain"}}},
|
||||||
{ key = "'", mods = 'LEADER', action = wezterm.action { SplitHorizontal = { domain = 'CurrentPaneDomain' } } },
|
{ key = "'", mods = "LEADER", action=wezterm.action{SplitHorizontal={domain="CurrentPaneDomain"}}},
|
||||||
{ key = 'k', mods = 'SUPER', action = act.TogglePaneZoomState },
|
{ key = "k", mods = "SUPER", action=act.TogglePaneZoomState },
|
||||||
{ key = 'c', mods = 'LEADER', action = wezterm.action { SpawnTab = 'CurrentPaneDomain' } },
|
{ key = "c", mods = "LEADER", action=wezterm.action{SpawnTab="CurrentPaneDomain"}},
|
||||||
{ key = 'h', mods = 'LEADER', action = wezterm.action { ActivatePaneDirection = 'Left' } },
|
{ key = "h", mods = "LEADER", action=wezterm.action{ActivatePaneDirection="Left"}},
|
||||||
{ key = 'j', mods = 'LEADER', action = wezterm.action { ActivatePaneDirection = 'Down' } },
|
{ key = "j", mods = "LEADER", action=wezterm.action{ActivatePaneDirection="Down"}},
|
||||||
{ key = 'k', mods = 'LEADER', action = wezterm.action { ActivatePaneDirection = 'Up' } },
|
{ key = "k", mods = "LEADER", action=wezterm.action{ActivatePaneDirection="Up"}},
|
||||||
{ key = 'l', mods = 'LEADER', action = wezterm.action { ActivatePaneDirection = 'Right' } },
|
{ key = "l", mods = "LEADER", action=wezterm.action{ActivatePaneDirection="Right"}},
|
||||||
{ key = 'H', mods = 'LEADER|SHIFT', action = wezterm.action { AdjustPaneSize = { 'Left', 5 } } },
|
{ key = "H", mods = "LEADER|SHIFT", action=wezterm.action{AdjustPaneSize={"Left", 5}}},
|
||||||
{ key = 'J', mods = 'LEADER|SHIFT', action = wezterm.action { AdjustPaneSize = { 'Down', 5 } } },
|
{ key = "J", mods = "LEADER|SHIFT", action=wezterm.action{AdjustPaneSize={"Down", 5}}},
|
||||||
{ key = 'K', mods = 'LEADER|SHIFT', action = wezterm.action { AdjustPaneSize = { 'Up', 5 } } },
|
{ key = "K", mods = "LEADER|SHIFT", action=wezterm.action{AdjustPaneSize={"Up", 5}}},
|
||||||
{ key = 'L', mods = 'LEADER|SHIFT', action = wezterm.action { AdjustPaneSize = { 'Right', 5 } } },
|
{ key = "L", mods = "LEADER|SHIFT", action=wezterm.action{AdjustPaneSize={"Right", 5}}},
|
||||||
{ key = '1', mods = 'LEADER', action = wezterm.action { ActivateTab = 0 } },
|
{ key = "1", mods = "LEADER", action=wezterm.action{ActivateTab=0}},
|
||||||
{ key = '2', mods = 'LEADER', action = wezterm.action { ActivateTab = 1 } },
|
{ key = "2", mods = "LEADER", action=wezterm.action{ActivateTab=1}},
|
||||||
{ key = '3', mods = 'LEADER', action = wezterm.action { ActivateTab = 2 } },
|
{ key = "3", mods = "LEADER", action=wezterm.action{ActivateTab=2}},
|
||||||
{ key = '4', mods = 'LEADER', action = wezterm.action { ActivateTab = 3 } },
|
{ key = "4", mods = "LEADER", action=wezterm.action{ActivateTab=3}},
|
||||||
{ key = '5', mods = 'LEADER', action = wezterm.action { ActivateTab = 4 } },
|
{ key = "5", mods = "LEADER", action=wezterm.action{ActivateTab=4}},
|
||||||
{ key = '6', mods = 'LEADER', action = wezterm.action { ActivateTab = 5 } },
|
{ key = "6", mods = "LEADER", action=wezterm.action{ActivateTab=5}},
|
||||||
{ key = '7', mods = 'LEADER', action = wezterm.action { ActivateTab = 6 } },
|
{ key = "7", mods = "LEADER", action=wezterm.action{ActivateTab=6}},
|
||||||
{ key = '8', mods = 'LEADER', action = wezterm.action { ActivateTab = 7 } },
|
{ key = "8", mods = "LEADER", action=wezterm.action{ActivateTab=7}},
|
||||||
{ key = '9', mods = 'LEADER', action = wezterm.action { ActivateTab = 8 } },
|
{ key = "9", mods = "LEADER", action=wezterm.action{ActivateTab=8}},
|
||||||
{ key = '&', mods = 'LEADER', action = wezterm.action { CloseCurrentTab = { confirm = true } } },
|
{ key = "&", mods = "LEADER", action=wezterm.action{CloseCurrentTab={confirm=true}}},
|
||||||
{ key = 'x', mods = 'LEADER', action = wezterm.action { CloseCurrentPane = { confirm = true } } },
|
{ key = "x", mods = "LEADER", action=wezterm.action{CloseCurrentPane={confirm=true}}},
|
||||||
{ key = 'Enter', mods = 'ALT', action = act.ToggleFullScreen },
|
{ key = 'Enter', mods = 'ALT', action = act.ToggleFullScreen },
|
||||||
{ key = 'c', mods = 'SUPER', action = act.CopyTo 'Clipboard' },
|
{ key = 'c', mods = 'SUPER', action = act.CopyTo 'Clipboard' },
|
||||||
{ key = 'v', mods = 'SUPER', action = act.PasteFrom 'Clipboard' },
|
{ key = 'v', mods = 'SUPER', action = act.PasteFrom 'Clipboard' },
|
||||||
|
@ -65,7 +65,6 @@ return {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{ key = 'Tab', mods = 'CTRL', action = wezterm.action.DisableDefaultAssignment },
|
{ key = 'Tab', mods = 'CTRL', action = wezterm.action.DisableDefaultAssignment },
|
||||||
},
|
}
|
||||||
-- temp fix
|
|
||||||
front_end = 'WebGpu',
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue