summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common/modules/mango/default.nix7
-rw-r--r--common/modules/mango/scripts.nix12
-rw-r--r--common/modules/mango/swayidleNdLock.nix2
-rw-r--r--common/modules/matugen/default.nix20
-rw-r--r--common/modules/matugen/templates/matugen-rofi.nix35
-rw-r--r--common/modules/matugen/templates/matugen-terminal.nix4
-rw-r--r--common/modules/terminal/foot.nix2
-rw-r--r--common/modules/terminal/ghostty.nix2
-rw-r--r--common/programs/rofi.nix346
-rw-r--r--flake.lock2
-rw-r--r--flake.nix2
-rw-r--r--hosts/common.nix18
-rw-r--r--users/bee/default.nix6
-rw-r--r--users/common.nix7
14 files changed, 151 insertions, 314 deletions
diff --git a/common/modules/mango/default.nix b/common/modules/mango/default.nix
index 95066e3..41b1029 100644
--- a/common/modules/mango/default.nix
+++ b/common/modules/mango/default.nix
@@ -94,7 +94,7 @@ in
# Window effect
blur=${if cfg.window.blur.enable then "1" else "0"}
- blur_layer=0
+ blur_layer=1
blur_optimized=1
blur_params_num_passes = ${toString cfg.window.blur.passes}
blur_params_radius = ${toString cfg.window.blur.radius}
@@ -107,6 +107,7 @@ in
layer_shadows = 0
shadow_only_floating = 1
shadows_size = 10
+ shadows_blur = 10
shadows_position_x = 0
shadows_position_y = 0
@@ -116,8 +117,8 @@ in
${
if (cfg.window.blur.enable && cfg.window.opacity == 1.0) then
''
- focused_opacity=0.90
- unfocused_opacity=0.90
+ focused_opacity=0.82
+ unfocused_opacity=0.82
''
else
''
diff --git a/common/modules/mango/scripts.nix b/common/modules/mango/scripts.nix
index a21f300..cbe387f 100644
--- a/common/modules/mango/scripts.nix
+++ b/common/modules/mango/scripts.nix
@@ -1,4 +1,9 @@
-{ pkgs, ... }:
+{
+ pkgs,
+ config,
+ lib,
+ ...
+}:
let
volume-control = pkgs.writeShellScriptBin "volume-control" ''
TAG="audio-volume"
@@ -101,7 +106,10 @@ let
if [ -z "$WAYLAND_DISPLAY" ] && [ -n "$DISPLAY" ]; then
xrdb -merge "$HOME/.Xresources"
fi
- [ -f "$HOME/.config/sequences" ] && sh "$HOME/.config/sequences"
+
+ ${lib.optionalString (config.beeMods.terminal.default == "foot") ''
+ [ -f "$HOME/.config/sequences" ] && sh "$HOME/.config/sequences"
+ ''}
}
cmd_wall() {
diff --git a/common/modules/mango/swayidleNdLock.nix b/common/modules/mango/swayidleNdLock.nix
index ff2bde4..7a9cc1a 100644
--- a/common/modules/mango/swayidleNdLock.nix
+++ b/common/modules/mango/swayidleNdLock.nix
@@ -6,7 +6,7 @@
}:
let
cfg = config.beeMods.mango;
- swaylock_cmd = "${pkgs.swaylock}/bin/swaylock -f -C ~/.config/swaylock/swaylock-colors";
+ swaylock_cmd = "${pkgs.swaylock}/bin/swaylock -e -f -C ~/.config/swaylock/swaylock-colors";
in
{
config = lib.mkIf cfg.enable {
diff --git a/common/modules/matugen/default.nix b/common/modules/matugen/default.nix
index e9e9252..5ce3014 100644
--- a/common/modules/matugen/default.nix
+++ b/common/modules/matugen/default.nix
@@ -43,15 +43,15 @@ in
color_space = "salience";
check_contrast = true;
templates = {
- foot = {
+ foot = lib.mkIf config.beeMods.terminal.foot {
template = "foot-colors.ini";
target = "~/.config/foot/colors.ini";
};
- alacritty = {
+ alacritty = lib.mkIf config.beeMods.terminal.alacritty {
template = "alacritty-colors.toml";
target = "~/.config/alacritty/colors.toml";
};
- ghostty = {
+ ghostty = lib.mkIf config.beeMods.terminal.ghostty {
template = "ghostty-colors.conf";
target = "~/.config/ghostty/colors.conf";
};
@@ -59,11 +59,11 @@ in
template = "userChrome.css";
target = "~/.cache/wallust/userChrome.css";
};
- xresources = {
+ xresources = lib.mkIf config.beeMods.dwm.enable {
template = "colors-xresources";
target = "~/.config/x11/matugen.Xresources";
};
- sequences = {
+ sequences = lib.mkIf (config.beeMods.terminal.default == "foot") {
template = "sequences";
target = "~/.config/sequences";
};
@@ -180,14 +180,16 @@ in
output_path = "~/.config/matugen/neovim_matugen.json"
''}
+ ${lib.optionalString (config.beeMods.terminal.default == "foot") ''
+ [templates.sequences]
+ input_path = '~/.config/matugen/templates/sequences'
+ output_path = '~/.config/wallust/templates/sequences'
+ ''}
+
[templates.zed]
input_path = '~/.config/matugen/templates/zed.json'
output_path = '~/.config/zed/themes/matugen.json'
- [templates.sequences]
- input_path = '~/.config/matugen/templates/sequences'
- output_path = '~/.config/wallust/templates/sequences'
-
[templates.zen]
input_path = '~/.config/matugen/templates/zen.css'
output_path = '~/.config/wallust/templates/userChrome.css'
diff --git a/common/modules/matugen/templates/matugen-rofi.nix b/common/modules/matugen/templates/matugen-rofi.nix
index 2241c6d..60bf616 100644
--- a/common/modules/matugen/templates/matugen-rofi.nix
+++ b/common/modules/matugen/templates/matugen-rofi.nix
@@ -7,23 +7,24 @@
config = lib.mkIf config.programs.rofi.enable {
xdg.configFile = {
"matugen/templates/rofi-colors.rasi" = {
- text =
- # rasi
- ''
- * {
- <* if {{ is_dark_mode }} *>
- background: {{colors.surface.default.hex}};
- background-alt: {{colors.surface_container.default.hex}};
- <* else *>
- background: {{colors.surface_container.default.hex}};
- background-alt: {{colors.surface_container_high.default.hex}};
- <* endif *>
- foreground: {{colors.on_surface.default.hex}};
- selected: {{colors.primary.default.hex}};
- active: {{colors.secondary.default.hex}};
- urgent: {{colors.error.default.hex}};
- }
- '';
+ text = ''
+ * {
+ <* if {{ is_dark_mode }} *>
+ bg: {{colors.surface.default.hex}};
+ bg-alt: {{colors.surface_container.default.hex}};
+ <* else *>
+ bg: {{colors.surface_container.default.hex}};
+ bg-alt: {{colors.surface_container_highest.default.hex}};
+ <* endif *>
+ fg: {{colors.on_surface.default.hex}};
+ fg-dim: {{colors.on_surface_variant.default.hex}};
+ accent: {{colors.primary.default.hex}};
+ selected-bg: {{colors.primary.default.hex}};
+ selected-fg: {{colors.surface.default.hex}};
+ urgent: {{colors.error.default.hex}};
+ outline: {{colors.outline.default.hex}};
+ }
+ '';
};
};
};
diff --git a/common/modules/matugen/templates/matugen-terminal.nix b/common/modules/matugen/templates/matugen-terminal.nix
index 5ae9d86..c592226 100644
--- a/common/modules/matugen/templates/matugen-terminal.nix
+++ b/common/modules/matugen/templates/matugen-terminal.nix
@@ -87,9 +87,9 @@
xdg.configFile."matugen/templates/ghostty.conf" = {
text = ''
<* if {{ is_dark_mode }} *>
- background = '{{colors.background.default.hex}}'
+ background = {{colors.background.default.hex}}
<* else *>
- background = '{{colors.surface_container.default.hex}}'
+ background = {{colors.surface_container.default.hex}}
<* endif *>
foreground = {{colors.on_surface.default.hex}}
cursor-color = {{colors.primary.default.hex}}
diff --git a/common/modules/terminal/foot.nix b/common/modules/terminal/foot.nix
index a804815..4ad4c37 100644
--- a/common/modules/terminal/foot.nix
+++ b/common/modules/terminal/foot.nix
@@ -17,7 +17,7 @@ in
font = "${cfg.font.family}:size=${toString cfg.font.size}";
dpi-aware = "no";
- gamma-correct-blending = "yes";
+ # gamma-correct-blending = "yes";
bold-text-in-bright = if cfg.font.bright_color_is_bold then "yes" else "no";
};
cursor = {
diff --git a/common/modules/terminal/ghostty.nix b/common/modules/terminal/ghostty.nix
index 4a6277e..7ab94e6 100644
--- a/common/modules/terminal/ghostty.nix
+++ b/common/modules/terminal/ghostty.nix
@@ -15,7 +15,7 @@ in
font-family = cfg.font.family;
font-size = cfg.font.size;
- alpha-blending = "liner";
+ alpha-blending = "linear";
window-padding-x = cfg.window.padding-x;
window-padding-y = cfg.window.padding-y;
font-feature = [
diff --git a/common/programs/rofi.nix b/common/programs/rofi.nix
index 66ff00c..518bd77 100644
--- a/common/programs/rofi.nix
+++ b/common/programs/rofi.nix
@@ -7,9 +7,14 @@
{
programs.rofi = {
enable = true;
- font = "Lilex Nerd Font";
+ font = "JetBrainsMono Nerd Font";
plugins = with pkgs; [ rofi-emoji ];
theme = "~/.config/rofi/themes/config.rasi";
+ extraConfig = {
+ show-icons = true;
+ icon-theme = "Papirus";
+ drun-display-format = "{name}";
+ };
};
home.packages = [
@@ -17,315 +22,124 @@
];
xdg.configFile = {
- "rofi/shared/default-colors.rasi" = {
+ "rofi/shared/colors.rasi" = {
enable = !config.beeMods.matugen.enable;
text =
# rasi
''
* {
- background: #000000FF;
- background-alt: #101010FF;
- foreground: #FFFFFFFF;
- selected: #62AEEFFF;
- active: #98C379FF;
- urgent: #E06B74FF;
+ bg: #212121;
+ bg-alt: #2d2d2d;
+ fg: #ffffffdd;
+ fg-dim: #616161;
+ accent: #80cbc4;
+ selected-bg: #424242;
+ selected-fg: #80cbc4;
+ urgent: #ef9a9a;
+ outline: #424242;
}
'';
};
- };
- # Dont scroll its just rofi theme
- xdg.configFile = {
"rofi/themes/config.rasi" = {
enable = true;
text =
# rasi
''
- /**
- *
- * Author : Aditya Shakya (adi1090x)
- * Github : @adi1090x
- *
- * Rofi Theme File
- * Rofi Version: 1.7.3
- **/
-
- /*****----- Configuration -----*****/
- configuration {
- modi: "drun";
- show-icons: true;
- display-drun: "drun";
- display-run: "";
- display-filebrowser: "";
- display-window: "";
- font: "monospace 12";
- drun-display-format: "{name} [<span weight='light' size='small'><i>({generic})</i></span>]";
- window-format: "{w} · {c} · {t}";
- }
-
- /*****----- Global Properties -----*****/
- ${
- if config.beeMods.matugen.enable then
- ''@import "shared/colors.rasi"''
- else
- ''@import "shared/default-colors.rasi"''
- }
-
+ @import "shared/colors.rasi"
* {
- border-colour: var(selected);
- handle-colour: var(selected);
- background-colour: var(background);
- foreground-colour: var(foreground);
- alternate-background: var(background-alt);
- normal-background: var(background);
- normal-foreground: var(foreground);
- urgent-background: var(urgent);
- urgent-foreground: var(background);
- active-background: var(active);
- active-foreground: var(background);
- selected-normal-background: var(selected);
- selected-normal-foreground: var(background);
- selected-urgent-background: var(active);
- selected-urgent-foreground: var(background);
- selected-active-background: var(urgent);
- selected-active-foreground: var(background);
- alternate-normal-background: var(background);
- alternate-normal-foreground: var(foreground);
- alternate-urgent-background: var(urgent);
- alternate-urgent-foreground: var(background);
- alternate-active-background: var(active);
- alternate-active-foreground: var(background);
+ background-color: transparent;
+ text-color: @fg;
+ border: 0px;
+ margin: 0px;
+ padding: 0px;
+ spacing: 0px;
}
- /*****----- Main Window -----*****/
window {
- /* properties for window widget */
- transparency: "real";
- location: center;
- anchor: center;
- fullscreen: false;
- width: 600px;
- x-offset: 0px;
- y-offset: 0px;
-
- /* properties for all widgets */
- enabled: true;
- margin: 0px;
- padding: 0px;
- border: 0px solid;
- border-radius: 0px;
- border-color: @border-colour;
- cursor: "default";
- background-color: @background-colour;
+ background-color: @bg;
+ border-radius: 0px;
+ border: 2px;
+ border-color: @outline;
+ width: 680px;
+ padding: 10px;
}
- /*****----- Main Box -----*****/
mainbox {
- enabled: true;
- spacing: 0px;
- margin: 0px;
- padding: 0px;
- border: 0px solid;
- border-radius: 0px 0px 0px 0px;
- border-color: @border-colour;
- background-color: transparent;
- children: [ "inputbar", "listview" ];
+ background-color: transparent;
+ spacing: 8px;
}
- /*****----- Inputbar -----*****/
inputbar {
- enabled: true;
- spacing: 0px;
- margin: 0px;
- padding: 0px;
- border: 0px 0px 1px 0px;
- border-radius: 0px;
- border-color: @alternate-background;
- background-color: @background-colour;
- text-color: @foreground-colour;
- children: [ "prompt", "entry" ];
+ background-color: @bg-alt;
+ border-radius: 0px;
+ padding: 10px 12px;
+ spacing: 8px;
+ children: [entry];
}
- prompt {
- enabled: true;
- padding: 15px;
- border: 0px 1px 0px 0px;
- border-radius: 0px;
- border-color: @alternate-background;
- background-color: inherit;
- text-color: inherit;
- }
- textbox-prompt-colon {
- enabled: true;
- expand: false;
- str: "::";
- background-color: inherit;
- text-color: inherit;
- }
entry {
- enabled: true;
- padding: 15px;
- background-color: inherit;
- text-color: inherit;
- cursor: text;
- placeholder: "";
- placeholder-color: inherit;
+ background-color: transparent;
+ text-color: @fg;
+ placeholder-color: @fg-dim;
+ placeholder: "Search...";
+ cursor: text;
+ font: "JetBrainsMono Nerd Font Bold 13";
}
- /*****----- Listview -----*****/
listview {
- enabled: true;
- columns: 1;
- lines: 8;
- cycle: true;
- dynamic: true;
- scrollbar: false;
- layout: vertical;
- reverse: false;
- fixed-height: true;
- fixed-columns: true;
-
- spacing: 0px;
- margin: 0px;
- padding: 0px;
- border: 0px solid;
- border-radius: 0px;
- border-color: @border-colour;
- background-color: transparent;
- text-color: @foreground-colour;
- cursor: "default";
- }
- scrollbar {
- handle-width: 5px ;
- handle-color: @handle-colour;
- border-radius: 0px;
- background-color: @alternate-background;
+ background-color: transparent;
+ columns: 1;
+ lines: 5;
+ spacing: 2px;
+ scrollbar: false;
}
- /*****----- Elements -----*****/
element {
- enabled: true;
- spacing: 10px;
- margin: 0px;
- padding: 8px 15px;
- border: 0px 0px 1px 0px;
- border-radius: 0px;
- border-color: @alternate-background;
- background-color: transparent;
- text-color: @foreground-colour;
- cursor: pointer;
- }
- element normal.normal {
- background-color: var(normal-background);
- text-color: var(normal-foreground);
- }
- element normal.urgent {
- background-color: var(urgent-background);
- text-color: var(urgent-foreground);
- }
- element normal.active {
- background-color: var(active-background);
- text-color: var(active-foreground);
- }
- element selected.normal {
- background-color: var(alternate-background);
- text-color: var(foreground-colour);
+ background-color: transparent;
+ border-radius: 0px;
+ padding: 8px 12px;
+ spacing: 12px;
+ children: [element-icon, element-text];
}
- element selected.urgent {
- background-color: var(selected-urgent-background);
- text-color: var(selected-urgent-foreground);
- }
- element selected.active {
- background-color: var(selected-active-background);
- text-color: var(selected-active-foreground);
- }
- element alternate.normal {
- background-color: var(alternate-normal-background);
- text-color: var(alternate-normal-foreground);
- }
- element alternate.urgent {
- background-color: var(alternate-urgent-background);
- text-color: var(alternate-urgent-foreground);
- }
- element alternate.active {
- background-color: var(alternate-active-background);
- text-color: var(alternate-active-foreground);
- }
- element-icon {
- background-color: transparent;
- text-color: inherit;
- size: 32px;
- cursor: inherit;
- }
- element-text {
- background-color: transparent;
- text-color: inherit;
- highlight: inherit;
- cursor: inherit;
- vertical-align: 0.5;
- horizontal-align: 0.0;
+
+ element normal normal {
+ background-color: transparent;
+ text-color: @fg;
}
- /*****----- Mode Switcher -----*****/
- mode-switcher{
- enabled: true;
- spacing: 10px;
- margin: 0px;
- padding: 0px;
- border: 0px solid;
- border-radius: 0px;
- border-color: @border-colour;
- background-color: transparent;
- text-color: @foreground-colour;
+ element alternate normal {
+ background-color: transparent;
+ text-color: @fg;
}
- button {
- padding: 10px;
- border: 0px solid;
- border-radius: 0px;
- border-color: @border-colour;
- background-color: @alternate-background;
- text-color: inherit;
- cursor: pointer;
+
+ element selected normal {
+ background-color: @selected-bg;
+ text-color: @selected-fg;
}
- button selected {
- background-color: var(selected-normal-background);
- text-color: var(selected-normal-foreground);
+
+ element normal urgent {
+ text-color: @urgent;
}
- /*****----- Message -----*****/
- message {
- enabled: true;
- margin: 0px;
- padding: 0px;
- border: 0px solid;
- border-radius: 0px 0px 0px 0px;
- border-color: @border-colour;
- background-color: transparent;
- text-color: @foreground-colour;
+ element selected urgent {
+ background-color: @selected-bg;
+ text-color: @urgent;
}
- textbox {
- padding: 10px;
- border: 0px solid;
- border-radius: 0px;
- border-color: @border-colour;
- background-color: @alternate-background;
- text-color: @foreground-colour;
- vertical-align: 0.5;
- horizontal-align: 0.0;
- highlight: none;
- placeholder-color: @foreground-colour;
- blink: true;
- markup: true;
+
+ element-icon {
+ background-color: transparent;
+ size: 22px;
}
- error-message {
- padding: 0px;
- border: 0px solid;
- border-radius: 0px;
- border-color: @border-colour;
- background-color: @background-colour;
- text-color: @foreground-colour;
+
+ element-text {
+ background-color: transparent;
+ text-color: inherit;
+ vertical-align: 0.5;
+ font: "JetBrainsMono Nerd Font Bold 13";
}
'';
};
+
};
}
diff --git a/flake.lock b/flake.lock
index 61fff86..18bb132 100644
--- a/flake.lock
+++ b/flake.lock
@@ -528,10 +528,12 @@
"ref": "refs/heads/master",
"rev": "bcee71cbbb0282d84841ba9b8908773ab56decf2",
"revCount": 66,
+ "shallow": false,
"type": "git",
"url": "https://git.bwaaa.monster/omnisearch"
},
"original": {
+ "shallow": false,
"type": "git",
"url": "https://git.bwaaa.monster/omnisearch"
}
diff --git a/flake.nix b/flake.nix
index 494bf4e..b932e59 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
omnisearch = {
- url = "git+https://git.bwaaa.monster/omnisearch";
+ url = "git+https://git.bwaaa.monster/omnisearch?shallow=0";
inputs.nixpkgs.follows = "nixpkgs";
};
sops-nix = {
diff --git a/hosts/common.nix b/hosts/common.nix
index a595379..80e70d5 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -147,8 +147,8 @@
security.pam.services.login.enableGnomeKeyring = true;
nixpkgs.config.allowUnfree = true;
- # nix.registry.${user}.flake = inputs.self;
- # nix.registry.nixpkgs.flake = inputs.nixpkgs;
+ nix.registry.${user}.flake = inputs.self;
+ nix.registry.nixpkgs.flake = inputs.nixpkgs;
networking.networkmanager.wifi.powersave = false;
networking.networkmanager.enable = true;
@@ -182,6 +182,19 @@
security.rtkit.enable = true;
security.polkit.enable = true;
+ fonts.fontconfig = {
+ enable = true;
+ antialias = true;
+ hinting = {
+ enable = true;
+ style = "slight";
+ };
+ subpixel = {
+ rgba = "rgb";
+ lcdfilter = "default";
+ };
+ };
+
fonts.fontDir.enable = true;
fonts.packages = with pkgs; [
# ioskeley-mono
@@ -253,6 +266,7 @@
environment.systemPackages = with pkgs; [
android-tools
playerctl
+ pciutils
imagemagick
pavucontrol
bluetui
diff --git a/users/bee/default.nix b/users/bee/default.nix
index eedde86..9f0dff6 100644
--- a/users/bee/default.nix
+++ b/users/bee/default.nix
@@ -23,9 +23,8 @@
waybar = true;
window = {
blur.enable = true;
- blur.radius = 7;
- blur.passes = 2;
- opacity = 0.82;
+ blur.radius = 8;
+ blur.passes = 3;
shadows = true;
};
};
@@ -44,7 +43,6 @@
matugen.enable = true;
terminal = {
foot = true;
- # font.family = "JetBrainsMono Nerd Font Mono";
font.family = "IosevkaInput";
};
};
diff --git a/users/common.nix b/users/common.nix
index a2e8731..043592e 100644
--- a/users/common.nix
+++ b/users/common.nix
@@ -48,8 +48,8 @@
name = "adw-gtk3";
};
iconTheme = {
- name = "Adwaita";
- package = pkgs.adwaita-icon-theme;
+ name = "Papirus-Dark";
+ package = pkgs.papirus-icon-theme;
};
gtk3 = {
bookmarks = [
@@ -61,7 +61,6 @@
];
extraConfig = {
gtk-cursor-blink = false;
- gtk-recent-files-limit = 20;
gtk-decoration-layout = ":";
};
extraCss = ''
@@ -73,7 +72,6 @@
theme = config.gtk.theme;
extraConfig = {
gtk-cursor-blink = false;
- gtk-recent-files-limit = 20;
gtk-decoration-layout = ":";
};
extraCss = ''
@@ -103,7 +101,6 @@
papers
cava
element-desktop
- zed-editor-fhs
wlsunset
thunderbird
(pkgs.obsidian.override {
generated by cgit v1.3.1 (git 2.54.0) at 2026-09-02 15:07:32 +0000