mirror of
https://github.com/basecamp/omarchy.git
synced 2025-07-27 04:09:23 +00:00
Compare commits
4 Commits
03f7403cdd
...
44d2dc21ab
Author | SHA1 | Date | |
---|---|---|---|
44d2dc21ab | |||
d435a650cc | |||
10d332e5d1 | |||
6ac1cd4bbe |
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
yay -S --noconfirm --needed fprintd usbutils
|
yay -S --noconfirm --needed fprintd usbutils
|
||||||
|
|
||||||
if ! lsusb | grep -iq fingerprint; then
|
if ! lsusb | grep -Eiq 'fingerprint|synaptics'; then
|
||||||
echo -e "\e[31m\nNo fingerprint sensor detected.\e[0m"
|
echo -e "\e[31m\nNo fingerprint sensor detected.\e[0m"
|
||||||
else
|
else
|
||||||
# Add fingerprint authentication as an option for sudo
|
# Add fingerprint authentication as an option for sudo
|
||||||
|
@ -44,6 +44,7 @@ bind = SUPER SHIFT, X, exec, $webapp="https://x.com/compose/post"
|
|||||||
# exec-once = dropbox-cli start
|
# exec-once = dropbox-cli start
|
||||||
|
|
||||||
# Extra env variables
|
# Extra env variables
|
||||||
|
# Note: You must relaunch Hyprland after changing envs (use Super+Esc, then Relaunch)
|
||||||
# env = MY_GLOBAL_ENV,setting
|
# env = MY_GLOBAL_ENV,setting
|
||||||
|
|
||||||
# Control your input devices
|
# Control your input devices
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
# Change to 1 if on a 1x display (then change last "auto" to 1 in monitor=)
|
# Change to 1 if on a 1x display (then change last "auto" to 1 in monitor=)
|
||||||
# Change to something like 1.75 for fractional scaling (can work well with 1.66667 monitor scaling)
|
# Change to something like 1.75 for fractional scaling (can work well with 1.66667 monitor scaling)
|
||||||
|
# Note: You must relaunch Hyprland after changing any env like this (use Super+Esc, then Relaunch)
|
||||||
env = GDK_SCALE,2
|
env = GDK_SCALE,2
|
||||||
|
|
||||||
# Use single default monitor (see all monitors with: hyprctl monitors)
|
# Use single default monitor (see all monitors with: hyprctl monitors)
|
||||||
|
@ -10,8 +10,8 @@ windowrule = size 800 600, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impal
|
|||||||
windowrule = center, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|org.gnome.NautilusPreviewer)$
|
windowrule = center, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|org.gnome.NautilusPreviewer)$
|
||||||
|
|
||||||
# Float and center file pickers
|
# Float and center file pickers
|
||||||
windowrule = float, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?)
|
windowrule = float, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?|Save)
|
||||||
windowrule = center, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?)
|
windowrule = center, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?|Save)
|
||||||
|
|
||||||
# Float Steam, fullscreen RetroArch
|
# Float Steam, fullscreen RetroArch
|
||||||
windowrule = float, class:^(steam)$
|
windowrule = float, class:^(steam)$
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# ────────────────────────────────────────────────────────────
|
# ────────────────────────────────────────────────────────────
|
||||||
# Matte Black Theme for Alacritty
|
# Omarchy Matte Black Theme for Alacritty
|
||||||
# By noiseRandom
|
# By tahayvr
|
||||||
# https://github.com/tahayvr
|
# https://github.com/tahayvr
|
||||||
# ────────────────────────────────────────────────────────────
|
# ────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
@ -17,47 +17,37 @@ size = 12.0
|
|||||||
[colors]
|
[colors]
|
||||||
[colors.primary]
|
[colors.primary]
|
||||||
background = "#121212"
|
background = "#121212"
|
||||||
foreground = "#eaeaea"
|
foreground = "#bebebe"
|
||||||
dim_foreground = "#a5abb6"
|
dim_foreground = "#8a8a8d"
|
||||||
|
|
||||||
[colors.cursor]
|
[colors.cursor]
|
||||||
text = "#121212"
|
text = "#121212"
|
||||||
cursor = "#eaeaea"
|
cursor = "#eaeaea"
|
||||||
|
|
||||||
[colors.vi_mode_cursor]
|
[colors.vi_mode_cursor]
|
||||||
text = "#2e3440"
|
text = "#121212"
|
||||||
cursor = "#d8dee9"
|
cursor = "#eaeaea"
|
||||||
|
|
||||||
[colors.selection]
|
[colors.selection]
|
||||||
text = "CellForeground"
|
text = "CellForeground"
|
||||||
background = "#333333" #charcoal
|
background = "#333333"
|
||||||
|
|
||||||
[colors.normal]
|
[colors.normal]
|
||||||
black = "#2c2c2c"
|
black = "#333333"
|
||||||
red = "#bf616a"
|
red = "#D35F5F"
|
||||||
green = "#a3be8c"
|
green = "#FFC107"
|
||||||
yellow = "#ebcb8b"
|
yellow = "#b91c1c"
|
||||||
blue = "#81a1c1"
|
blue = "#e68e0d"
|
||||||
magenta = "#b48ead"
|
magenta = "#D35F5F"
|
||||||
cyan = "#88c0d0"
|
cyan = "#bebebe"
|
||||||
white = "#e5e9f0"
|
white = "#bebebe"
|
||||||
|
|
||||||
[colors.bright]
|
[colors.bright]
|
||||||
black = "#8a8a8d"
|
black = "#8a8a8d"
|
||||||
red = "#bf616a"
|
red = "#B91C1C"
|
||||||
green = "#a3be8c"
|
green = "#FFC107"
|
||||||
yellow = "#ebcb8b"
|
yellow = "#b90a0a"
|
||||||
blue = "#81a1c1"
|
blue = "#f59e0b"
|
||||||
magenta = "#b48ead"
|
magenta = "#B91C1C"
|
||||||
cyan = "#8fbcbb"
|
cyan = "#eaeaea"
|
||||||
white = "#eceff4"
|
white = "#ffffff"
|
||||||
|
|
||||||
[colors.dim]
|
|
||||||
black = "#373e4d"
|
|
||||||
red = "#94545d"
|
|
||||||
green = "#809575"
|
|
||||||
yellow = "#b29e75"
|
|
||||||
blue = "#68809a"
|
|
||||||
magenta = "#8c738c"
|
|
||||||
cyan = "#6d96a5"
|
|
||||||
white = "#aeb3bb"
|
|
@ -1,6 +1,6 @@
|
|||||||
# ────────────────────────────────────────────────────────────
|
# ────────────────────────────────────────────────────────────
|
||||||
# Bashtop theme with Matte Black palette
|
# Bashtop theme - Omarchy Matte Black
|
||||||
# by noiseRandom
|
# by tahayvr
|
||||||
# https://github.com/tahayvr
|
# https://github.com/tahayvr
|
||||||
# ────────────────────────────────────────────────────────────
|
# ────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
@ -1,30 +1,190 @@
|
|||||||
return {
|
return {
|
||||||
{ "rebelot/kanagawa.nvim"},
|
"EdenEast/nightfox.nvim",
|
||||||
{ "EdenEast/nightfox.nvim" },
|
lazy = false,
|
||||||
{
|
priority = 1000,
|
||||||
"LazyVim/LazyVim",
|
dependencies = {
|
||||||
opts = {
|
"folke/snacks.nvim",
|
||||||
colorscheme = "carbonfox",
|
"nvim-tree/nvim-web-devicons",
|
||||||
},
|
"nvim-lualine/lualine.nvim",
|
||||||
init = function()
|
},
|
||||||
-- Custom highlight groups for dashboard colors only
|
|
||||||
vim.api.nvim_create_autocmd("ColorScheme", {
|
config = function()
|
||||||
pattern = "*",
|
local nightfox = require('nightfox')
|
||||||
callback = function()
|
local Shade = require('nightfox.lib.shade')
|
||||||
vim.api.nvim_set_hl(0, "SnacksDashboardHeader", { fg = "#8a8a8d", bold = true })
|
local c = require('nightfox.lib.color')
|
||||||
vim.api.nvim_set_hl(0, "SnacksDashboardIcon", { fg = "#8a8a8d" })
|
|
||||||
vim.api.nvim_set_hl(0, "SnacksDashboardDir", { fg = "#8a8a8d" })
|
local matte_black_palette = {
|
||||||
vim.api.nvim_set_hl(0, "SnacksDashboardFile", { fg = "#8a8a8d" })
|
-- Base "Matte Black" Palette Overrides
|
||||||
vim.api.nvim_set_hl(0, "SnacksDashboardFooter", { fg = "#8a8a8d", italic = true })
|
bg0 = "#0D0D0D", bg1 = "#121212", bg2 = "#1E1E1E", bg3 = "#2C2C2C", bg4 = "#333333",
|
||||||
vim.api.nvim_set_hl(0, "SnacksDashboardKey", { fg = "#ffffff", bold = true })
|
fg0 = "#FFFFFF", fg1 = "#BEBEBE", fg2 = "#BEBEBE", fg3 = "#8A8A8D",
|
||||||
vim.api.nvim_set_hl(0, "SnacksDashboardDesc", { fg = "#ffffff" })
|
sel0 = "#2C2C2C",
|
||||||
vim.api.nvim_set_hl(0, "SnacksDashboardSpecial", { fg = "#ffffff", bold = true })
|
sel1 = c.from_hex("#2C2C2C"):blend(c.from_hex("#F59E0B"), 0.2):to_css(),
|
||||||
|
comment = "#333333",
|
||||||
|
red = Shade.new("#D35F5F", c.from_hex("#D35F5F"):lighten(8):to_css(), "#B91C1C"),
|
||||||
|
orange = Shade.new("#F59E0B", "#FFC107", c.from_hex("#F59E0B"):lighten(-8):to_css()),
|
||||||
|
yellow = Shade.new("#FFC107", c.from_hex("#FFC107"):lighten(10):to_css(), "#F59E0B"),
|
||||||
|
white = Shade.new("#EAEAEA", "#FFFFFF", "#BEBEBE"),
|
||||||
|
black = Shade.new("#333333", "#8A8A8D", "#1E1E1E"),
|
||||||
|
green = Shade.new("#8A9A7B", "#A5B799", "#6F7C62"),
|
||||||
|
cyan = Shade.new("#88AABB", "#A2C4D3", "#6E8A99"),
|
||||||
|
blue = Shade.new("#8A9FBE", "#A4BBDD", "#7084A1"),
|
||||||
|
magenta = Shade.new("#C1A1C1", "#D9B9D9", "#A989A9"),
|
||||||
|
pink = Shade.new("#D398A7", "#EBC0CB", "#B97E8D"),
|
||||||
|
|
||||||
|
-- Lualine Palette Extensions
|
||||||
|
lualine_normal_bg = "#F59E0B",
|
||||||
|
lualine_insert_bg = "#B91C1C",
|
||||||
|
lualine_visual_bg = "#C1A1C1",
|
||||||
|
lualine_command_bg = "#F59E0B",
|
||||||
|
lualine_inactive_bg = c.from_hex("#121212"):lighten(5):to_css(),
|
||||||
|
|
||||||
|
-- Treesitter Palette Extensions
|
||||||
|
ts_parameter = "#D398A7",
|
||||||
|
ts_property = "#EAEAEA",
|
||||||
|
}
|
||||||
|
|
||||||
|
local final_palettes = {
|
||||||
|
carbonfox = require('nightfox.lib.collect').deep_extend(
|
||||||
|
require('nightfox.palette').load('carbonfox'),
|
||||||
|
matte_black_palette
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
local specs = {
|
||||||
|
carbonfox = {
|
||||||
|
syntax = {
|
||||||
|
keyword = "red", -- "local", "function", "if"
|
||||||
|
conditional = "red",
|
||||||
|
statement = "red",
|
||||||
|
func = "orange",
|
||||||
|
string = "orange.dim",
|
||||||
|
number = "orange",
|
||||||
|
operator = "yellow",
|
||||||
|
variable = "white",
|
||||||
|
ident = "white.dim",
|
||||||
|
const = "white",
|
||||||
|
type = "white",
|
||||||
|
field = "white.dim",
|
||||||
|
comment = "comment",
|
||||||
|
},
|
||||||
|
diag = {
|
||||||
|
error = "red",
|
||||||
|
warn = "red",
|
||||||
|
info = "cyan",
|
||||||
|
hint = "magenta",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
local groups = {
|
||||||
|
all = {
|
||||||
|
-- Base Groups
|
||||||
|
Whitespace = { fg = "palette.black.bright" },
|
||||||
|
NonText = { fg = "palette.black.bright" },
|
||||||
|
IncSearch = { bg = "palette.sel1" },
|
||||||
|
|
||||||
|
-- Noice Cmdline Overrides
|
||||||
|
NoiceCmdlinePopupBorder = { fg = "palette.fg3" },
|
||||||
|
NoiceCmdlinePopupTitle = { fg = "palette.fg3", style = "bold" },
|
||||||
|
NoiceCmdlinePopupBorderSearch = { fg = "palette.fg3" },
|
||||||
|
NoiceCmdlinePopupTitleSearch = { fg = "palette.fg3", style = "bold" },
|
||||||
|
NoiceCmdLineIcon = { fg = "palette.red" },
|
||||||
|
|
||||||
|
-- Neo-tree overrides
|
||||||
|
NeoTreeNormal = { bg = "palette.bg0" },
|
||||||
|
NeoTreeNormalNC = { link = "NeoTreeNormal" },
|
||||||
|
NeoTreeDirectoryName = { fg = "palette.fg3" },
|
||||||
|
NeoTreeDirectoryIcon = { fg = "palette.fg3" },
|
||||||
|
NeoTreeRootName = { fg = "palette.orange", style = "bold" },
|
||||||
|
NeoTreeGitAdded = { fg = "palette.green" },
|
||||||
|
NeoTreeGitModified = { fg = "palette.yellow" },
|
||||||
|
NeoTreeGitDeleted = { fg = "palette.red" },
|
||||||
|
NeoTreeGitIgnored = { fg = "palette.comment" },
|
||||||
|
NeoTreeC = { fg = "palette.orange", bg = "palette.sel0" },
|
||||||
|
|
||||||
|
-- Dashboard overrides
|
||||||
|
SnacksDashboardHeader = { fg = "palette.fg3" },
|
||||||
|
SnacksDashboardIcon = { fg = "palette.fg1" },
|
||||||
|
SnacksDashboardDir = { fg = "palette.orange" },
|
||||||
|
SnacksDashboardFile = { fg = "palette.fg3" },
|
||||||
|
SnacksDashboardFooter = { fg = "palette.fg3" },
|
||||||
|
SnacksDashboardKey = { fg = "palette.orange" },
|
||||||
|
SnacksDashboardDesc = { fg = "palette.fg1" },
|
||||||
|
SnacksDashboardSpecial = { fg = "palette.fg1" },
|
||||||
|
|
||||||
|
-- Treesitter overrides
|
||||||
|
["@comment"] = { fg = "palette.comment", style = "italic" },
|
||||||
|
["@keyword"] = { fg = "palette.red", style = "bold" },
|
||||||
|
["@keyword.function"] = { fg = "palette.red", style = "bold" },
|
||||||
|
["@keyword.operator"] = { fg = "palette.red", style = "bold" },
|
||||||
|
["@function"] = { fg = "palette.orange", style = "bold" },
|
||||||
|
["@function.builtin"] = { fg = "palette.orange", style = "bold" },
|
||||||
|
["@function.call"] = { fg = "palette.orange" },
|
||||||
|
["@string"] = { fg = "palette.orange" },
|
||||||
|
["@number"] = { fg = "palette.orange" },
|
||||||
|
["@operator"] = { fg = "palette.yellow" },
|
||||||
|
["@variable"] = { fg = "palette.white" },
|
||||||
|
["@constant"] = { fg = "palette.white" },
|
||||||
|
["@type"] = { fg = "palette.white.dim" },
|
||||||
|
["@variable.parameter"] = { fg = "palette.ts_parameter", style = "italic" },
|
||||||
|
["@property"] = { fg = "palette.ts_property" },
|
||||||
|
["@field"] = { fg = "palette.ts_property" },
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
nightfox.setup({
|
||||||
|
options = {
|
||||||
|
style = "carbonfox",
|
||||||
|
terminal_colors = true,
|
||||||
|
dim_inactive = true,
|
||||||
|
styles = { comments = "italic", functions = "bold", keywords = "bold" },
|
||||||
|
modules = {
|
||||||
|
neotree = true,
|
||||||
|
treesitter = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
palettes = final_palettes,
|
||||||
|
specs = specs,
|
||||||
|
groups = groups
|
||||||
|
})
|
||||||
|
|
||||||
|
vim.cmd("colorscheme carbonfox")
|
||||||
|
|
||||||
|
-- Lualine overrides
|
||||||
|
local lualine_theme = {
|
||||||
|
normal = {
|
||||||
|
a = { fg = matte_black_palette.bg0, bg = matte_black_palette.lualine_normal_bg, gui = "bold" },
|
||||||
|
b = { fg = matte_black_palette.fg1, bg = matte_black_palette.lualine_inactive_bg },
|
||||||
|
c = { fg = matte_black_palette.fg2, bg = matte_black_palette.lualine_inactive_bg },
|
||||||
|
},
|
||||||
|
insert = {
|
||||||
|
a = { fg = matte_black_palette.bg0, bg = matte_black_palette.lualine_insert_bg, gui = "bold" },
|
||||||
|
b = { fg = matte_black_palette.fg1, bg = matte_black_palette.lualine_inactive_bg },
|
||||||
|
c = { fg = matte_black_palette.fg2, bg = matte_black_palette.lualine_inactive_bg },
|
||||||
|
},
|
||||||
|
visual = {
|
||||||
|
a = { fg = matte_black_palette.bg0, bg = matte_black_palette.lualine_visual_bg, gui = "bold" },
|
||||||
|
b = { fg = matte_black_palette.fg1, bg = matte_black_palette.lualine_inactive_bg },
|
||||||
|
c = { fg = matte_black_palette.fg2, bg = matte_black_palette.lualine_inactive_bg },
|
||||||
|
},
|
||||||
|
command = {
|
||||||
|
a = { fg = matte_black_palette.bg0, bg = matte_black_palette.lualine_command_bg, gui = "bold" },
|
||||||
|
b = { fg = matte_black_palette.fg1, bg = matte_black_palette.lualine_inactive_bg },
|
||||||
|
c = { fg = matte_black_palette.fg2, bg = matte_black_palette.lualine_inactive_bg },
|
||||||
|
},
|
||||||
|
inactive = {
|
||||||
|
a = { fg = matte_black_palette.fg3, bg = matte_black_palette.lualine_inactive_bg },
|
||||||
|
b = { fg = matte_black_palette.fg3, bg = matte_black_palette.lualine_inactive_bg },
|
||||||
|
c = { fg = matte_black_palette.comment, bg = matte_black_palette.lualine_inactive_bg },
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
require('lualine').setup({
|
||||||
|
options = {
|
||||||
|
theme = lualine_theme,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
end,
|
||||||
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
vim.schedule(function()
|
|
||||||
vim.cmd("doautocmd ColorScheme")
|
|
||||||
end)
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
}
|
}
|
Reference in New Issue
Block a user