Compare commits

...

2 Commits

Author SHA1 Message Date
Dave Gallant
57e670ce7a nix flake update: 2024-04-07 01:57:43 UTC
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/fe4295b9ecd88764c1abf6179e03b1a828ca0e9a' (2024-04-06)
  → 'github:NixOS/nixpkgs/9e7f26f82acb057498335362905fde6fea4ca50a' (2024-04-06)
2024-04-06 21:57:43 -04:00
Dave Gallant
3bf680a14d Change neovim and alacritty theme to tokyonight and fix tmux true colours issue 2024-04-06 21:50:07 -04:00
2 changed files with 41 additions and 28 deletions

6
flake.lock generated
View File

@@ -187,11 +187,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1712388808, "lastModified": 1712420723,
"narHash": "sha256-9ogU4c3vUmuMDoRlbQCeq3OKx0XJmgHcLZ4XywJNYWI=", "narHash": "sha256-VnG0Eu394Ga2FCe8Q66m6OEQF8iAqjDYsjmtl+N2omk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fe4295b9ecd88764c1abf6179e03b1a828ca0e9a", "rev": "9e7f26f82acb057498335362905fde6fea4ca50a",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -215,30 +215,33 @@ in
}; };
colors = { colors = {
primary.background = "0x282828"; primary.background = "#1a1b26";
primary.foreground = "0xebdbb2"; primary.foreground = "#a9b1d6";
normal = { normal =
black = "0x282828"; {
red = "0xcc241d"; black = "#32344a";
green = "0x98971a"; red = "#f7768e";
yellow = "0xd79921"; green = "#9ece6a";
blue = "0x458588"; yellow = "#e0af68";
magenta = "0xb16286"; blue = "#7aa2f7";
cyan = "0x689d6a"; magenta = "#ad8ee6";
white = "0xa89984"; cyan = "#449dab";
}; white = "#787c99";
};
bright =
{
black = "#444b6a";
red = "#ff7a93";
green = "#b9f27c";
yellow = "#ff9e64";
blue = "#7da6ff";
magenta = "#bb9af7";
cyan = "#0db9d7";
white = "#acb0d0";
};
bright = {
black = "0x928374";
red = "0xfb4934";
green = "0xb8bb26";
yellow = "0xfabd2f";
blue = "0x83a598";
magenta = "0xd3869b";
cyan = "0x8ec07c";
white = "0xebdbb2";
};
key_bindings = [ key_bindings = [
{ {
@@ -268,7 +271,7 @@ in
tmux = { tmux = {
enable = true; enable = true;
clock24 = true; clock24 = true;
terminal = "xterm-256color"; terminal = "tmux-256color";
customPaneNavigationAndResize = true; customPaneNavigationAndResize = true;
plugins = with pkgs.tmuxPlugins; [ plugins = with pkgs.tmuxPlugins; [
{ {
@@ -316,6 +319,13 @@ in
set-window-option -g automatic-rename on set-window-option -g automatic-rename on
set-option -g set-titles on set-option -g set-titles on
# Proper colors
set-option -sa terminal-features ',alacritty:RGB'
# Undercurl
set-option -g default-terminal "tmux-256color"
set-option -ga terminal-features ",alacritty:usstyle"
set -g mouse on set -g mouse on
set -g status-left-length 30 set -g status-left-length 30
@@ -359,7 +369,10 @@ in
enable = true; enable = true;
viAlias = true; viAlias = true;
vimAlias = true; vimAlias = true;
colorschemes.gruvbox.enable = true; colorschemes.tokyonight = {
enable = true;
style = "night";
};
keymaps = [ keymaps = [
{ {
key = "<C-n>"; key = "<C-n>";
@@ -397,7 +410,7 @@ in
]; ];
plugins = { plugins = {
auto-save.enable = true; auto-save.enable = false;
copilot-vim.enable = true; copilot-vim.enable = true;
cmp-path.enable = true; cmp-path.enable = true;
cmp-treesitter.enable = true; cmp-treesitter.enable = true;