From 53ed98e6c36cc57fd55a1f96d4d7e40eaed22614 Mon Sep 17 00:00:00 2001 From: Michael Thomson Date: Fri, 20 Sep 2024 17:20:46 -0400 Subject: [PATCH] kanagawa and bluetooth --- hosts/desktop/configuration.nix | 1 + hosts/desktop/home.nix | 2 ++ modules/home-manager/i3/config | 2 ++ .../neovim/nvim/lua/plugins/kanagawa.lua | 6 ++++++ .../neovim/nvim/lua/plugins/mini.lua | 14 ++++++------- modules/home-manager/wezterm/default.nix | 21 ++++++++++++++++++- modules/nixos/bluetooth.nix | 6 ++++++ modules/nixos/i3.nix | 2 +- 8 files changed, 45 insertions(+), 9 deletions(-) create mode 100644 modules/home-manager/neovim/nvim/lua/plugins/kanagawa.lua create mode 100644 modules/nixos/bluetooth.nix diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index ab09cbd..3095a07 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -8,6 +8,7 @@ ../../modules/nixos/bootloader.nix ../../modules/nixos/user.nix ../../modules/nixos/ssh.nix + ../../modules/nixos/bluetooth.nix ../../modules/nixos/nvidia.nix ../../modules/nixos/i3.nix ../../modules/nixos/nm.nix diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 7a5a1be..ab7587c 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -28,6 +28,8 @@ }; }; + services.blueman-applet.enable = true; + home.packages = with pkgs; [ firefox gcc diff --git a/modules/home-manager/i3/config b/modules/home-manager/i3/config index 4f1420e..a58a394 100644 --- a/modules/home-manager/i3/config +++ b/modules/home-manager/i3/config @@ -254,3 +254,5 @@ exec_always --no-startup-id dunst exec_always --no-startup-id pasystray exec_always --no-startup-id syncthing + +exec_always --no-startup-id blueman-applet diff --git a/modules/home-manager/neovim/nvim/lua/plugins/kanagawa.lua b/modules/home-manager/neovim/nvim/lua/plugins/kanagawa.lua new file mode 100644 index 0000000..a38c4b2 --- /dev/null +++ b/modules/home-manager/neovim/nvim/lua/plugins/kanagawa.lua @@ -0,0 +1,6 @@ +return { + "rebelot/kanagawa.nvim", + config = function () + vim.cmd.colorscheme "kanagawa" + end +} diff --git a/modules/home-manager/neovim/nvim/lua/plugins/mini.lua b/modules/home-manager/neovim/nvim/lua/plugins/mini.lua index 7c8aab0..8350897 100644 --- a/modules/home-manager/neovim/nvim/lua/plugins/mini.lua +++ b/modules/home-manager/neovim/nvim/lua/plugins/mini.lua @@ -99,13 +99,13 @@ return { -- Collection of various small independent plugins/modules -- } -- }) -- - require('mini.hues').setup({ - foreground = '#ffffff', - background = '#000000', - n_hues = 0, - accent = 'orange', - saturation = 'high' - }) + -- require('mini.hues').setup({ + -- foreground = '#ffffff', + -- background = '#000000', + -- n_hues = 0, + -- accent = 'orange', + -- saturation = 'high' + -- }) require('mini.splitjoin').setup() diff --git a/modules/home-manager/wezterm/default.nix b/modules/home-manager/wezterm/default.nix index 5fa9976..3e59853 100644 --- a/modules/home-manager/wezterm/default.nix +++ b/modules/home-manager/wezterm/default.nix @@ -5,7 +5,7 @@ enable = true; extraConfig = '' return { - color_scheme = 'Ayu Dark (Gogh)', + -- color_scheme = 'Ayu Dark (Gogh)', font = wezterm.font('Iosevka Nerd Font'), font_size = 16, use_fancy_tab_bar = false, @@ -30,6 +30,25 @@ window_background_opacity = 1, macos_window_background_blur = 0, front_end = "WebGpu", + force_reverse_video_cursor = true, + colors = { + foreground = "#dcd7ba", + background = "#1f1f28", + + cursor_bg = "#c8c093", + cursor_fg = "#c8c093", + cursor_border = "#c8c093", + + selection_fg = "#c8c093", + selection_bg = "#2d4f67", + + scrollbar_thumb = "#16161d", + split = "#16161d", + + ansi = { "#090618", "#c34043", "#76946a", "#c0a36e", "#7e9cd8", "#957fb8", "#6a9589", "#c8c093" }, + brights = { "#727169", "#e82424", "#98bb6c", "#e6c384", "#7fb4ca", "#938aa9", "#7aa89f", "#dcd7ba" }, + indexed = { [16] = "#ffa066", [17] = "#ff5d62" }, + }, } ''; }; diff --git a/modules/nixos/bluetooth.nix b/modules/nixos/bluetooth.nix new file mode 100644 index 0000000..77ef058 --- /dev/null +++ b/modules/nixos/bluetooth.nix @@ -0,0 +1,6 @@ +{ + hardware.bluetooth.enable = true; # enables support for Bluetooth + hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot + services.blueman.enable = true; +} + diff --git a/modules/nixos/i3.nix b/modules/nixos/i3.nix index 3d50828..88e7973 100644 --- a/modules/nixos/i3.nix +++ b/modules/nixos/i3.nix @@ -3,7 +3,7 @@ { environment.pathsToLink = [ "/libexec" ]; services.xserver = { - enable = true; + enable = true; desktopManager = { xterm.enable = false;