Shinonome/omarchy-nix
1
0
Fork 1
mirror of https://github.com/henrysipp/omarchy-nix.git synced 2026-06-05 18:29:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor for wallpers, keybinds, add weeb tokyo-light theme

Browse Source
This commit is contained in:
Henry Sipp
2025-07-22 21:08:27 -05:00
parent e2d116c28a
commit 1fed2b5d59
14 changed files with 84 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/omarchy-show-keybindings
+1 -1
View File
@@ -37,4 +37,4 @@ grep -h '^[[:space:]]*bind' "$USER_HYPRLAND_CONF" |
printf "%-35s → %s\n", key_combo, action;
}
}' |
flock --nonblock /tmp/.wofi.lock -c "wofi -dmenu -i --width 30% --height 40% -p 'Hyprland Keybindings' -O alphabetical"
flock --nonblock /tmp/.wofi.lock -c "wofi -dmenu -i --width 50% --height 40% -p 'Hyprland Keybindings' -O alphabetical"
config.nix
+1
View File
@@ -11,6 +11,7 @@ lib: {
theme = lib.mkOption {
type = lib.types.enum [
"tokyo-night"
"tokyo-night-light"
"kanagawa"
"everforest"
"catppuccin"
config/themes/wallpapers/tokyo-night-light-1.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 MiB

lib/selected-wallpaper.nix
+30
View File
@@ -0,0 +1,30 @@
config: let
cfg = config.omarchy;
wallpapers = {
"tokyo-night" = [
"1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg"
];
"tokyo-night-light" = [
"tokyo-night-light-1.jpg"
];
"kanagawa" = [
"kanagawa-1.png"
];
"everforest" = [
"1-everforest.jpg"
];
"nord" = [
"nord-1.png"
];
"gruvbox" = [
"gruvbox-1.jpg"
];
"gruvbox-light" = [
"gruvbox-1.jpg"
];
};
selected_wallpaper = builtins.elemAt (wallpapers.${cfg.theme}) 0;
in {
wallpaper_path = "~/Pictures/Wallpapers/${selected_wallpaper}";
}
modules/home-manager/default.nix
+2 -2
View File
@@ -20,7 +20,7 @@ in {
(import ./mako.nix)
(import ./starship.nix)
(import ./vscode.nix)
(import ./waybar.nix)
(import ./waybar.nix inputs)
(import ./wofi.nix)
(import ./zoxide.nix)
(import ./zsh.nix)
@@ -50,6 +50,6 @@ in {
};
};
# TODO: Add an actual nvim config
# TODO: Add an actual nvim config
programs.neovim.enable = true;
}
modules/home-manager/hyprland.nix
-1
View File
@@ -9,5 +9,4 @@ inputs: {
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
};
services.hyprpolkitagent.enable = true;
}
modules/home-manager/hyprland/bindings.nix
-1
View File
@@ -23,7 +23,6 @@ in {
"SUPER SHIFT CTRL, ESCAPE, exec, systemctl poweroff"
"SUPER, K, exec, ~/.local/share/omarchy/bin/omarchy-show-keybindings"
# Control tiling
"SUPER, J, togglesplit, # dwindle"
"SUPER, P, pseudo, # dwindle"
modules/home-manager/hyprland/envs.nix
+30 -30
View File
@@ -4,8 +4,7 @@
pkgs,
osConfig ? {},
...
}:
let
}: let
cfg = config.omarchy;
hasNvidiaDrivers = builtins.elem "nvidia" osConfig.services.xserver.videoDrivers;
nvidiaEnv = [
@@ -13,41 +12,42 @@ let
"LIBVA_DRIVER_NAME,nvidia"
"__GLX_VENDOR_LIBRARY_NAME,nvidia"
];
in
{
in {
wayland.windowManager.hyprland.settings = {
# Environment variables
env = (lib.optionals hasNvidiaDrivers nvidiaEnv) ++ [
"GDK_SCALE,${toString cfg.scale}"
# Cursor size
"XCURSOR_SIZE,24"
"HYPRCURSOR_SIZE,24"
env =
(lib.optionals hasNvidiaDrivers nvidiaEnv)
++ [
"GDK_SCALE,${toString cfg.scale}"
# Cursor theme
"XCURSOR_THEME,Bibata-Modern-Classic"
"HYPRCURSOR_THEME,Bibata-Modern-Classic"
# Cursor size
"XCURSOR_SIZE,24"
"HYPRCURSOR_SIZE,24"
# Force all apps to use Wayland
"GDK_BACKEND,wayland"
"QT_QPA_PLATFORM,wayland"
"QT_STYLE_OVERRIDE,kvantum"
"SDL_VIDEODRIVER,wayland"
"MOZ_ENABLE_WAYLAND,1"
"ELECTRON_OZONE_PLATFORM_HINT,wayland"
"OZONE_PLATFORM,wayland"
# Cursor theme
"XCURSOR_THEME,Bibata-Modern-Classic"
"HYPRCURSOR_THEME,Bibata-Modern-Classic"
# Make Chromium use XCompose and all Wayland
"CHROMIUM_FLAGS,\"--enable-features=UseOzonePlatform --ozone-platform=wayland --gtk-version=4\""
# Force all apps to use Wayland
"GDK_BACKEND,wayland"
"QT_QPA_PLATFORM,wayland"
"QT_STYLE_OVERRIDE,kvantum"
"SDL_VIDEODRIVER,wayland"
"MOZ_ENABLE_WAYLAND,1"
"ELECTRON_OZONE_PLATFORM_HINT,wayland"
"OZONE_PLATFORM,wayland"
# Make .desktop files available for wofi
"XDG_DATA_DIRS,$XDG_DATA_DIRS:$HOME/.nix-profile/share:/nix/var/nix/profiles/default/share"
# Make Chromium use XCompose and all Wayland
"CHROMIUM_FLAGS,\"--enable-features=UseOzonePlatform --ozone-platform=wayland --gtk-version=4\""
# Use XCompose file
"XCOMPOSEFILE,~/.XCompose"
"EDITOR,nvim"
# "DOCKER_HOST,unix://$XDG_RUNTIME_DIR/podman/podman.sock"
];
# Make .desktop files available for wofi
"XDG_DATA_DIRS,$XDG_DATA_DIRS:$HOME/.nix-profile/share:/nix/var/nix/profiles/default/share"
# Use XCompose file
"XCOMPOSEFILE,~/.XCompose"
"EDITOR,nvim"
# "DOCKER_HOST,unix://$XDG_RUNTIME_DIR/podman/podman.sock"
];
xwayland = {
force_zero_scaling = true;
modules/home-manager/hyprland/windows.nix
+1
View File
@@ -40,6 +40,7 @@
layerrule = [
# Proper background blur for wofi
"blur,wofi"
"blur,waybar"
];
};
}
modules/home-manager/hyprlock.nix
+5 -5
View File
@@ -6,6 +6,7 @@ inputs: {
}: let
palette = config.colorScheme.palette;
convert = inputs.nix-colors.lib.conversions.hexToRGBString;
selected_wallpaper_path = (import ../../lib/selected-wallpaper.nix config).wallpaper_path;
backgroundRgb = "rgba(${convert ", " palette.base00}, 0.8)";
surfaceRgb = "rgb(${convert ", " palette.base02})";
@@ -24,9 +25,9 @@ in {
};
background = {
monitor = "";
path = "screenshot";
blur_passes = 3;
brightness = 0.5;
path = selected_wallpaper_path;
# blur_passes = 3;
# brightness = 0.5;
};
input-field = {
@@ -45,7 +46,6 @@ in {
font_color = foregroundRgb;
placeholder_color = foregroundMutedRgb;
# placeholder_text = "Enter Password";
placeholder_text = "  Enter Password 󰈷 ";
check_color = "rgba(131, 192, 146, 1.0)";
fail_text = "Wrong";
@@ -60,7 +60,7 @@ in {
text = "\$FPRINTPROMPT";
text_align = "center";
color = "rgb(211, 198, 170)";
font_size = 24;
font_size = 24;
font_family = "CaskaydiaMono Nerd Font";
position = "0, -100";
halign = "center";
modules/home-manager/hyprpaper.nix
+1 -24
View File
@@ -3,30 +3,7 @@
pkgs,
...
}: let
cfg = config.omarchy;
wallpapers = {
"tokyo-night" = [
"1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg"
];
"kanagawa" = [
"kanagawa-1.png"
];
"everforest" = [
"1-everforest.jpg"
];
"nord" = [
"nord-1.png"
];
"gruvbox" = [
"gruvbox-1.jpg"
];
"gruvbox-light" = [
"gruvbox-1.jpg"
];
};
selected_wallpaper = builtins.elemAt (wallpapers.${cfg.theme}) 0;
selected_wallpaper_path = "~/Pictures/Wallpapers/${selected_wallpaper}";
selected_wallpaper_path = (import ../../lib/selected-wallpaper.nix config).wallpaper_path;
in {
home.file = {
"Pictures/Wallpapers" = {
modules/home-manager/waybar.nix
+9 -3
View File
@@ -1,8 +1,13 @@
{
inputs: {
config,
pkgs,
...
}: {
}:
let
palette = config.colorScheme.palette;
convert = inputs.nix-colors.lib.conversions.hexToRGBString;
backgroundRgb = "rgba(${convert ", " palette.base00}, 0.25)";
in {
home.file = {
".config/waybar/" = {
source = ../../config/waybar;
@@ -12,7 +17,8 @@
text = ''
* {
color: #${config.colorScheme.palette.base05};
background-color: #${config.colorScheme.palette.base00};
background-color: ${backgroundRgb};
}
'';
};
modules/nixos/hyprland.nix
-2
View File
@@ -3,12 +3,10 @@ inputs: {
pkgs,
...
}: {
programs.hyprland = {
enable = true;
# package = inputs.hyprland.packages.${pkgs.system}.hyprland;
package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
};
}
modules/themes.nix
+4
View File
@@ -3,6 +3,10 @@
base16-theme = "tokyo-night-dark";
vscode-theme = "Tokyo Night";
};
"tokyo-night-light" = {
base16-theme = "tokyo-night-light";
vscode-theme = "Tokyo Night Light";
};
"catppuccin-macchiato" = {
vscode-theme = "Catppuccin Macchiato";