6 files changed, 34 insertions, 37 deletions
diff --git a/artix/Makefile b/artix/Makefile
index 7948179..9ad4276 100644
--- a/artix/Makefile
+++ b/artix/Makefile
@@ -1,7 +1,7 @@
 .PHONY = all config stow unstow artix lsp pac
 
-COLORSCHEME = google
-FONT = monospace
+COLORSCHEME = tokyonight
+FONT = 0xProto Nerd Font
 
 all: config
 
diff --git a/artix/colorscheme/tokyonight.env b/artix/colorscheme/tokyonight.env
index a188b5d..12836fb 100644
--- a/artix/colorscheme/tokyonight.env
+++ b/artix/colorscheme/tokyonight.env
@@ -3,11 +3,11 @@ HEX_FOREGROUND=#c0caf5
 
 HEX_NORMAL_BLACK=#15161e
 HEX_NORMAL_RED=#f7768e
-HEX_NORMAL_GREEN=#9ece6a
+HEX_NORMAL_GREEN=#8dbd59
 HEX_NORMAL_YELLOW=#e0af68
 HEX_NORMAL_BLUE=#7aa2f7
 HEX_NORMAL_MAGENTA=#bb9af7
-HEX_NORMAL_CYAN=#7dcfff
+HEX_NORMAL_CYAN=#6cbeee
 HEX_NORMAL_WHITE=#a9b1d6
 
 HEX_BRIGHT_BLACK=#414868
diff --git a/artix/home/.config/hypr/hyprland.lua b/artix/home/.config/hypr/hyprland.lua
index 2db240a..361995a 100644
--- a/artix/home/.config/hypr/hyprland.lua
+++ b/artix/home/.config/hypr/hyprland.lua
@@ -1,4 +1,22 @@
-if 1 then
+hl.config({
+	input = {
+		kb_layout    = "fr",
+		kb_variant   = "",
+		kb_model     = "pc105",
+		kb_options   = "",
+		kb_rules     = "",
+
+		follow_mouse = 1,
+
+		sensitivity  = 0, -- -1.0 - 1.0, 0 means no modification.
+
+		touchpad     = {
+			natural_scroll = true,
+		},
+	},
+})
+
+if false then
 	hl.monitor({ output = "HDMI-A-1", mode = "2560x1440@100", position = "0x0", scale = "1", })
 else
 	hl.monitor({ output = "eDP-1", mode = "1920x1080@60", position = "0x0", scale = "1", })
@@ -59,26 +77,8 @@ hl.config({
 		force_default_wallpaper = 0,
 		disable_hyprland_logo = true,
 		disable_splash_rendering = true,
-		background_color = "#000000"
-	},
-})
-
-
-hl.config({
-	input = {
-		kb_layout    = "fr",
-		kb_variant   = "",
-		kb_model     = "pc105",
-		kb_options   = "",
-		kb_rules     = "",
-
-		follow_mouse = 1,
-
-		sensitivity  = 0, -- -1.0 - 1.0, 0 means no modification.
-
-		touchpad     = {
-			natural_scroll = true,
-		},
+		--background_color = "#000000"
+		background_color = "#1a1b26"
 	},
 })
 
diff --git a/artix/home/.config/nvim/init.lua b/artix/home/.config/nvim/init.lua
index c400bc3..ba4dbc2 100644
--- a/artix/home/.config/nvim/init.lua
+++ b/artix/home/.config/nvim/init.lua
@@ -1,10 +1,3 @@
--- COLORSCHEME
--- use terminal colors
-
-vim.o.termguicolors = false
-vim.cmd [[hi Normal guibg=NONE ctermbg=NONE]]
-vim.cmd [[hi EndOfBuffer guibg=NONE ctermbg=NONE]]
-
 -- GLOBALS
 
 vim.g.mapleader = " "
@@ -75,13 +68,17 @@ vim.pack.add({
 	{ src = "https://github.com/stevearc/oil.nvim" },
 	{ src = "https://github.com/sphamba/smear-cursor.nvim" },
 	{ src = "https://github.com/saghen/blink.cmp" },
-	{ src = "https://github.com/saghen/blink.lib" }
+	{ src = "https://github.com/saghen/blink.lib" },
+	{ src = "https://github.com/folke/tokyonight.nvim" },
+	{ src = "https://github.com/windwp/nvim-autopairs" }
 })
 
-require("blink.cmp").setup({ keymap = { preset = "enter" } })
+vim.cmd [[colorscheme tokyonight-night]]
 
-require('blink.cmp').build():wait(60000)
 
+require("blink.cmp").setup({ keymap = { preset = "enter" } })
+require('blink.cmp').build():wait(60000)
+require("nvim-autopairs").setup({})
 require("gitsigns").setup({})
 require("oil").setup({
 	default_file_explorer = true,
diff --git a/artix/home/.config/rofi/config.rasi b/artix/home/.config/rofi/config.rasi
index 785823b..03a46e6 100644
--- a/artix/home/.config/rofi/config.rasi
+++ b/artix/home/.config/rofi/config.rasi
@@ -1,4 +1,4 @@
-@theme "google.rasi"
+@theme "tokyonight.rasi"
 
 configuration {
 	modes: "window,drun,run,ssh";
diff --git a/artix/template/alacritty/alacritty.toml b/artix/template/alacritty/alacritty.toml
index 1ef4213..3c6b577 100644
--- a/artix/template/alacritty/alacritty.toml
+++ b/artix/template/alacritty/alacritty.toml
@@ -1,6 +1,6 @@
 [window]
 padding = { x = 10, y = 10 }
-opacity = 0.73
+#opacity = 0.73
 
 [font]
 normal = { family = "$FONT", style = "Regular" }