1

Compare commits

...

3 Commits

8 changed files with 62 additions and 27 deletions

View File

@ -185,7 +185,7 @@
}
];
transparent-opacity = "0.8";
transparent-opacity = "0.75";
transparent = [
"kitty"

View File

@ -21,8 +21,11 @@
fcitx.enable = true;
hyprland = {
kb-layout = "us";
kb-variant = "altgr-intl";
keyboard = {
layout = "us";
variant = "altgr-intl";
option = "nodeadkeys";
};
monitors = {
"HDMI-A-1" = {

View File

@ -7,10 +7,11 @@
config = {
modules = {
hyprland = {
# kb-layout = "de";
# kb-variant = "nodeadkeys";
kb-layout = "us";
kb-variant = "altgr-intl";
keyboard = {
layout = "us";
variant = "altgr-intl";
option = "nodeadkeys";
};
monitors = {
"eDP-1" = {

View File

@ -102,7 +102,7 @@
"hyprsunset --identity"
# HACK: Hyprland doesn't set the xwayland/x11 keymap correctly
"setxkbmap -layout ${hyprland.kb-layout} -variant ${hyprland.kb-variant} -model pc104"
"setxkbmap -layout ${hyprland.keyboard.layout} -variant ${hyprland.keyboard.variant} -option ${hyprland.keyboard.option} -model pc104"
# HACK: Flatpak doesn't find applications in the system PATH
"systemctl --user import-environment PATH && systemctl --user restart xdg-desktop-portal.service"
@ -419,10 +419,10 @@ in {
};
input = {
kb_layout = "${hyprland.kb-layout}";
kb_variant = "${hyprland.kb-variant}";
kb_layout = hyprland.keyboard.layout;
kb_variant = hyprland.keyboard.variant;
kb_options = hyprland.keyboard.option;
kb_model = "pc104";
kb_options = "";
kb_rules = "";
follow_mouse = true;

View File

@ -5,16 +5,24 @@
}: rec {
enable = lib.mkEnableOption "Hyprland Window Manager + Compositor";
kb-layout = lib.mkOption {
type = lib.types.str;
example = "us";
description = "Keyboard layout to use";
};
keyboard = {
layout = lib.mkOption {
type = lib.types.str;
example = "us";
description = "Keyboard layout to use";
};
kb-variant = lib.mkOption {
type = lib.types.str;
example = "altgr-intl";
description = "Keyboard layout variant";
variant = lib.mkOption {
type = lib.types.str;
example = "altgr-intl";
description = "Keyboard layout variant";
};
option = lib.mkOption {
type = lib.types.str;
example = "nodeadkeys";
description = "Keyboard layout options";
};
};
dunst.enable = lib.mkEnableOption "Enable dunst notification daemon";

View File

@ -83,7 +83,7 @@ in {
"theme.bar.margin_bottom" = "0px";
"theme.bar.margin_sides" = "10px";
"theme.bar.margin_top" = "10px";
"theme.bar.opacity" = 80;
"theme.bar.opacity" = 75;
"theme.bar.outer_spacing" = "0px"; # NOTE: Left/Right bar padding
"theme.bar.transparent" = false;

View File

@ -41,9 +41,6 @@ in {
inherit (config.lib.formats.rasi) mkLiteral;
trans = "rgba(0, 0, 0, 0)";
paddingInner = "5px";
paddingOuter = "10px";
in {
"element-text,element-icon,mode-switcher" = {
background-color = mkLiteral "inherit";
@ -56,7 +53,9 @@ in {
border = mkLiteral "2 solid 2 solid 2 solid 2 solid";
border-radius = 6;
border-color = mkLiteral color.hexS.accent;
background-color = mkLiteral "rgba(${color.rgbS.base}, 0.2)";
# This is not opacity but translucency
background-color = mkLiteral "rgba(${color.rgbS.base}, 0.25)";
};
"mainbox" = {

View File

@ -216,8 +216,32 @@ with mylib.networking; {
supportedLocales = ["en_US.UTF-8/UTF-8" "de_DE.UTF-8/UTF-8"];
};
# Configure console keymap
console.keyMap = "us-acentos";
console = {
earlySetup = true;
useXkbConfig = true;
packages = [pkgs.terminus_font];
font = "Lat2-Terminus16";
colors = let
color = config.home-manager.users.${username}.modules.color;
in [
color.hex.subtext1
color.hex.red
color.hex.green
color.hex.yellow
color.hex.blue
color.hex.pink
color.hex.teal
color.hex.subtext0
color.hex.surface2
color.hex.red
color.hex.green
color.hex.yellow
color.hex.blue
color.hex.pink
color.hex.teal
color.hex.surface1
];
};
# Define a user account. Password is set from sops-nix secrets automatically.
users.mutableUsers = false; # Users are always overridden by stuff defined here