summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common/modules/dwm/default.nix25
-rw-r--r--common/modules/dwm/picom.nix84
-rw-r--r--common/modules/mango/default.nix3
-rw-r--r--common/modules/matugen/default.nix1
-rw-r--r--common/modules/matugen/templates/matugen-zen.nix4
-rw-r--r--common/programs/zenBrowser.nix34
-rw-r--r--flake.lock8
-rw-r--r--hosts/common.nix30
-rw-r--r--hosts/nixios/default.nix2
-rw-r--r--users/bee/default.nix4
10 files changed, 130 insertions, 65 deletions
diff --git a/common/modules/dwm/default.nix b/common/modules/dwm/default.nix
index 0236f1d..8aadbfb 100644
--- a/common/modules/dwm/default.nix
+++ b/common/modules/dwm/default.nix
@@ -56,9 +56,10 @@ in
autoRepeatDelay = 300;
autoRepeatInterval = 20;
excludePackages = with pkgs; [ xterm ];
- displayManager = {
- startx.enable = true;
- };
+ displayManager.sessionCommands = ''
+ ${pkgs.systemd}/bin/systemctl --user import-environment DISPLAY XAUTHORITY XDG_SESSION_TYPE
+ ${pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY XAUTHORITY XDG_SESSION_TYPE
+ '';
windowManager.dwm = {
enable = true;
package = inputs.mydwm.packages.${pkgs.stdenv.hostPlatform.system}.default;
@@ -82,28 +83,22 @@ in
text = ''
#!${pkgs.bash}/bin/bash
- dbus-update-activation-environment --systemd --all
- systemctl --user import-environment DISPLAY XAUTHORITY
-
gnome-keyring-daemon --start --components=secrets,ssh,pkcs11 &
${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1 &
- if [ -f ~/.fehbg ]; then
- sh ~/.fehbg
- fi
+ [ -f ~/.fehbg ] && sh ~/.fehbg
[ -f ~/.Xresources ] && xrdb -merge ~/.Xresources
dunst &
clipcatd &
-
${lib.optionalString (!cfg.picom.enable) ''
xrandr --output eDP --set TearFree on
''}
+ ${lib.optionalString (cfg.picom.enable) ''
+ systemctl --user restart picom.service
+ ''}
- systemctl --user restart xidlehook.service
- systemctl --user restart xautolock-session.service
- systemctl --user restart xss-lock.service
- systemctl --user restart clipcat.service
+ systemctl --user restart xidlehook.service xautolock-session.service xss-lock.service clipcat.service
${lib.optionalString (config.beeMods.mango.waybar) ''
systemctl --user stop waybar.service
''}
@@ -114,7 +109,7 @@ in
};
services.clipcat = {
- enable = cfg.enable;
+ enable = true;
daemonSettings = {
daemonize = false;
max_history = 50;
diff --git a/common/modules/dwm/picom.nix b/common/modules/dwm/picom.nix
index 962d3ea..34b31c2 100644
--- a/common/modules/dwm/picom.nix
+++ b/common/modules/dwm/picom.nix
@@ -3,56 +3,58 @@ let
cfg = config.beeMods.dwm.picom;
in
{
- services.picom = {
- enable = cfg.enable;
- backend = "glx";
- vSync = true;
+ config = lib.mkIf cfg.enable {
+ services.picom = {
+ enable = true;
+ backend = "glx";
+ vSync = true;
- activeOpacity = if cfg.window.blur.enable then 0.87 else cfg.window.opacity.active;
- inactiveOpacity = if cfg.window.blur.enable then 0.87 else cfg.window.opacity.inactive;
+ activeOpacity = if cfg.window.blur.enable then 0.87 else cfg.window.opacity.active;
+ inactiveOpacity = if cfg.window.blur.enable then 0.87 else cfg.window.opacity.inactive;
- opacityRules = [
- "100:fullscreen"
- "100:_NET_WM_STATE@:32a *= '_NET_WM_STATE_FULLSCREEN'"
- ];
- settings = {
- blur = {
- method = "dual_kawase";
- strength = cfg.window.blur.strength;
- size = cfg.window.blur.size;
- };
- blur-background = cfg.window.blur.enable;
- blur-background-exclude = [
- "window_type = 'dock'"
- "window_type = 'desktop'"
- "class_g = 'slop'"
- "class_g = 'dwm'"
- "_GTK_FRAME_EXTENTS@"
- "fullscreen"
- "_NET_WM_STATE@:32a *= '_NET_WM_STATE_FULLSCREEN'"
+ opacityRules = [
+ "100:fullscreen"
+ "100:_NET_WM_STATE@:32a *= '_NET_WM_STATE_FULLSCREEN'"
];
+ settings = {
+ blur = {
+ method = "dual_kawase";
+ strength = cfg.window.blur.strength;
+ size = cfg.window.blur.size;
+ };
+ blur-background = cfg.window.blur.enable;
+ blur-background-exclude = [
+ "window_type = 'dock'"
+ "window_type = 'desktop'"
+ "class_g = 'slop'"
+ "class_g = 'dwm'"
+ "_GTK_FRAME_EXTENTS@"
+ "fullscreen"
+ "_NET_WM_STATE@:32a *= '_NET_WM_STATE_FULLSCREEN'"
+ ];
- # xrender-sync-fence = true;
- use-damage = true;
+ # xrender-sync-fence = true;
+ use-damage = true;
- unredir-if-possible = true;
+ unredir-if-possible = true;
- detect-transient = true;
- detect-client-opacity = true;
- mark-wmwin-focused = true;
- mark-ovredir-focused = true;
- detect-rounded-corners = true;
+ detect-transient = true;
+ detect-client-opacity = true;
+ mark-wmwin-focused = true;
+ mark-ovredir-focused = true;
+ detect-rounded-corners = true;
- shadow = cfg.shadow;
- fading = false;
- animations = cfg.animations;
+ shadow = cfg.shadow;
+ fading = false;
+ animations = cfg.animations;
+ };
};
- };
- # systemd.user.services.picom.Install.wantedBy = lib.mkForce [ ];
- systemd.user.services.picom = lib.mkIf cfg.enable {
- Unit = {
- ConditionEnvironment = "XDG_SESSION_TYPE=x11";
+ # systemd.user.services.picom.Install.wantedBy = lib.mkForce [ ];
+ systemd.user.services.picom = {
+ Unit = {
+ ConditionEnvironment = "XDG_SESSION_TYPE=x11";
+ };
};
};
}
diff --git a/common/modules/mango/default.nix b/common/modules/mango/default.nix
index 4939824..b42146e 100644
--- a/common/modules/mango/default.nix
+++ b/common/modules/mango/default.nix
@@ -107,7 +107,6 @@ in
layer_shadows = 0
shadow_only_floating = 1
shadows_size = 10
- shadows_blur = 15
shadows_position_x = 0
shadows_position_y = 0
@@ -215,7 +214,7 @@ in
# need relogin to make it apply
mouse_natural_scrolling=0
- windowrule=tags:1,appid:^(foot|footclient|alacritty)$
+ windowrule=tags:1,appid:^(foot|footclient|alacritty|dev.zed.Zed)$
windowrule=tags:2,appid:^(zen|firefox|obsidian)$
windowrule=tags:3,appid:^(vesktop|discord|thunderbird|Element|equibop)$
windowrule=tags:4,appid:^steam$
diff --git a/common/modules/matugen/default.nix b/common/modules/matugen/default.nix
index f52414c..3238b3a 100644
--- a/common/modules/matugen/default.nix
+++ b/common/modules/matugen/default.nix
@@ -17,6 +17,7 @@ let
export PROFILE_DIR=$(find ~/.config/zen/ -maxdepth 1 -type d -name "*.Default Profile" | head -n 1)
mkdir -p "$PROFILE_DIR/chrome"
ln -sf ~/.cache/wallust/userChrome.css "$PROFILE_DIR/chrome/userChrome.css"
+ ln -sf ~/.config/userContent.css "$PROFILE_DIR/chrome/userContent.css"
'';
update_gtkcolors = pkgs.writeShellScript "update_gtkcolors" ''
dconf write /org/gnome/desktop/interface/color-scheme "'prefer-light'"
diff --git a/common/modules/matugen/templates/matugen-zen.nix b/common/modules/matugen/templates/matugen-zen.nix
index 142e5ff..179e72a 100644
--- a/common/modules/matugen/templates/matugen-zen.nix
+++ b/common/modules/matugen/templates/matugen-zen.nix
@@ -18,6 +18,10 @@
/* --zen-main-browser-background: {{colors.background.default.hex}} !important; */
}
+ * {
+ font-family: "JetBrainsMono Nerd Font", monospace !important;
+ }
+
.sidebar-placesTree {
background-color: {{colors.surface_container.default.hex}} !important;
}
diff --git a/common/programs/zenBrowser.nix b/common/programs/zenBrowser.nix
index 60a4ae3..8d9f08e 100644
--- a/common/programs/zenBrowser.nix
+++ b/common/programs/zenBrowser.nix
@@ -112,4 +112,38 @@ in
}
)
];
+
+ xdg.configFile = {
+ "userContent.css" = {
+ enable = true;
+ text =
+ # css
+ ''
+ img, canvas, video, .avatar,
+ [class*="avatar"],
+ [class*="ProfileAvatar"],
+ [style*="border-radius"] {
+ border-radius: 0 !important;
+ clip-path: none !important;
+ mask-image: none !important;
+ -webkit-mask-image: none !important;
+ }
+
+ /* 2. Reset standard rounding on all elements EXCEPT SVGs */
+ :not(svg):not(circle):not(ellipse):not(path) {
+ border-radius: 0 !important;
+ }
+
+ /* 3. Handle variables that usually affect containers/images */
+ :root {
+ --border-radius: 0px !important;
+ --radius: 0px !important;
+ --rounded-corner: 0px !important;
+ --avatar-radius: 0px !important;
+ --pfp-radius: 0px !important;
+ }
+ '';
+ };
+ };
+
}
diff --git a/flake.lock b/flake.lock
index 6caea90..05ddebe 100644
--- a/flake.lock
+++ b/flake.lock
@@ -287,11 +287,11 @@
]
},
"locked": {
- "lastModified": 1773229378,
- "narHash": "sha256-Q/v4/Y6X7k5c9VRyxAOQ/C4qr+sFB2jw3ASHoJ3rvRs=",
+ "lastModified": 1773387983,
+ "narHash": "sha256-ZUXltSwIbuF86dESCtfqpOwGv+gWlkUbqjncieuAK68=",
"ref": "refs/heads/main",
- "rev": "1b7373c48c016469d66a358cd49a7e1ea68329ad",
- "revCount": 4,
+ "rev": "083efacd7eb2a8b2f771155891d34878ba6937a2",
+ "revCount": 5,
"type": "git",
"url": "https://codeberg.org/brustybee/mydwm"
},
diff --git a/hosts/common.nix b/hosts/common.nix
index 3028f6d..035dbcf 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -27,6 +27,36 @@
flake = "/home/${user}/.config/beeSystems";
};
+ # programs.ssh.extraConfig = ''
+ # Host eu.nixbuild.net
+ # PubkeyAcceptedKeyTypes ssh-ed25519
+ # ServerAliveInterval 60
+ # IPQoS throughput
+ # IdentityFile /home/bee/my-nixbuild-key
+ # '';
+ #
+ # programs.ssh.knownHosts = {
+ # nixbuild = {
+ # hostNames = [ "eu.nixbuild.net" ];
+ # publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPIQCZc54poJ8vqawd8TraNryQeJnvH1eLpIDgbiqymM";
+ # };
+ # };
+ #
+ # nix = {
+ # distributedBuilds = true;
+ # buildMachines = [
+ # {
+ # hostName = "eu.nixbuild.net";
+ # system = "x86_64-linux";
+ # maxJobs = 100;
+ # supportedFeatures = [
+ # "benchmark"
+ # "big-parallel"
+ # ];
+ # }
+ # ];
+ # };
+
boot.loader = {
efi.canTouchEfiVariables = true;
timeout = 50;
diff --git a/hosts/nixios/default.nix b/hosts/nixios/default.nix
index 0ed1393..3e5f52f 100644
--- a/hosts/nixios/default.nix
+++ b/hosts/nixios/default.nix
@@ -45,7 +45,7 @@
beeMods = {
mango.enable = true;
- dwm.enable = false;
+ dwm.enable = true;
};
xdg.portal = lib.mkForce {
diff --git a/users/bee/default.nix b/users/bee/default.nix
index 6e2ecaf..a777b81 100644
--- a/users/bee/default.nix
+++ b/users/bee/default.nix
@@ -29,9 +29,9 @@
};
};
dwm = {
- enable = false;
+ enable = true;
picom = {
- enable = true;
+ enable = false;
window = {
blur.enable = true;
blur.strength = 6;
generated by cgit v1.3.1 (git 2.54.0) at 2026-09-02 15:11:05 +0000