emmet/nixos-config
0
1
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Building fixes

Browse Source
This commit is contained in:
Emmet
2025-06-28 11:15:13 -05:00
parent 5245994270
commit eb95e975e0
2 changed files with 86 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
modules/user/hyprland/ashell.patch
View File

@ -1,32 +1,39 @@
diff --git a/src/modules/workspaces.rs b/src/modules/workspaces.rs diff --git a/src/modules/workspaces.rs b/src/modules/workspaces.rs
index 806d499..3737a82 100644 index 1bafb6d..c448b02 100644
--- a/src/modules/workspaces.rs --- a/src/modules/workspaces.rs
+++ b/src/modules/workspaces.rs +++ b/src/modules/workspaces.rs
@@ -41,6 +41,7 @@ fn get_workspaces(enable_workspace_filling: bool) -> Vec<Workspace> { @@ -51,20 +51,20 @@ fn get_workspaces(config: &WorkspacesModuleConfig) -> Vec<Workspace> {
let mut workspaces = hyprland::data::Workspaces::get() let (special, normal): (Vec<_>, Vec<_>) = workspaces.into_iter().partition(|w| w.id < 0);
.map(|w| w.to_vec())
.unwrap_or_default();
+ workspaces.retain(|w| w.id > 0);
workspaces.sort_by_key(|w| w.id); // map special workspaces
- for w in special.iter() {
- result.push(Workspace {
- id: w.id,
- name: w
- .name
- .split(":")
- .last()
- .map_or_else(|| "".to_string(), |s| s.to_owned()),
- monitor_id: Some(w.monitor_id as usize),
- monitor: w.monitor.clone(),
- active: monitors.iter().any(|m| m.special_workspace.id == w.id),
- windows: w.windows,
- });
- }
+ //for w in special.iter() {
+ // result.push(Workspace {
+ // id: w.id,
+ // name: w
+ // .name
+ // .split(":")
+ // .last()
+ // .map_or_else(|| "".to_string(), |s| s.to_owned()),
+ // monitor_id: Some(w.monitor_id as usize),
+ // monitor: w.monitor.clone(),
+ // active: monitors.iter().any(|m| m.special_workspace.id == w.id),
+ // windows: w.windows,
+ // });
+ //}
diff --git a/src/outputs.rs b/src/outputs.rs // map normal workspaces
index adc616b..ce63b57 100644 for w in normal.iter() {
--- a/src/outputs.rs
+++ b/src/outputs.rs
@@ -58,6 +58,7 @@ impl Outputs {
id,
size: Some((None, Some(HEIGHT))),
layer: Layer::Bottom,
+ namespace: String::from("ashell"),
pointer_interactivity: true,
keyboard_interactivity: KeyboardInteractivity::None,
exclusive_zone: HEIGHT as i32,
@@ -77,6 +78,7 @@ impl Outputs {
id: menu_id,
size: Some((None, None)),
layer: Layer::Background,
+ namespace: String::from("ashell"),
pointer_interactivity: true,
keyboard_interactivity: KeyboardInteractivity::None,
output: wl_output.map_or(IcedOutput::Active, |wl_output| {

109
modules/user/hyprland/default.nix
View File

@ -361,18 +361,18 @@ in
layerrule = [ layerrule = [
"blur,waybar" "blur,waybar"
"blur,ashell" "blur,ashell-main-layer"
"blur,launcher # fuzzel" "blur,launcher # fuzzel"
"blur,~nwggrid" "blur,~nwggrid"
"blur,gtk-layer-shell" "blur,gtk-layer-shell"
"xray 1,waybar" "xray 1,waybar"
"xray 1,ashell" "xray 1,ashell-main-layer"
"xray 1,~nwggrid" "xray 1,~nwggrid"
"xray 1,gtk-layer-shell" "xray 1,gtk-layer-shell"
"ignorezero, gtk-layer-shell" "ignorezero, gtk-layer-shell"
"ignorezero, ashell" "ignorezero, ashell-main-layer"
"animation fade,~nwggrid" "animation fade,~nwggrid"
"animation popin 80%, ashell" "animation popin 80%, ashell-main-layer"
]; ];
blurls = [ blurls = [
@ -406,11 +406,11 @@ in
polkit_gnome polkit_gnome
(ashell.overrideAttrs (o: { (ashell.overrideAttrs (o: {
patches = (o.patches or [ ]) ++ [ patches = (o.patches or [ ]) ++ [
./ashell.patch ./ashell.patch
]; ];
})) }))
nwg-launchers nwg-launchers
papirus-icon-theme (lib.hiPrio papirus-icon-theme)
(pkgs.writeScriptBin "nwggrid-wrapper" '' (pkgs.writeScriptBin "nwggrid-wrapper" ''
#!/bin/sh #!/bin/sh
if pgrep -x "nwggrid-server" > /dev/null if pgrep -x "nwggrid-server" > /dev/null
@ -543,57 +543,52 @@ in
then echo "Shouldn't suspend"; sleep 10; else echo "Should suspend"; systemctl suspend; fi then echo "Shouldn't suspend"; sleep 10; else echo "Should suspend"; systemctl suspend; fi
'') '')
]); ]);
home.file.".config/ashell.yml".text = '' home.file.".config/ashell/config.toml".text = ''
outputs: All outputs = "All"
position: Top position = "Top"
modules: app_launcher_cmd = "nwggrid-wrapper"
left: truncate_title_after_length = 150
- [ AppLauncher, SystemInfo ] [modules]
center: left = [ "AppLauncher", "SystemInfo" ]
- Workspaces center = [ "Workspaces" ]
right: right = [ "Clock", "Settings", "Tray" ]
- [Clock, Settings, Tray] [workspaces]
appLauncherCmd: "nwggrid-wrapper" # optional, default None visibility_mode = "MonitorSpecific"
truncateTitleAfterLength: 150 # optional, default 150 enable_workspace_filling = true
workspaces: [system.cpu]
visibilityMode: MonitorSpecific # optional, default All warn_threshold = 80
enableWorkspaceFilling: true # optional, default false alert_threshold = 95
system: [system.mem]
cpuWarnThreshold: 80 # cpu indicator warning level (default 60) warn_threshold = 50
cpuAlertThreshold: 95 # cpu indicator alert level (default 80) alert_threshold = 75
memWarnThreshold: 50 # mem indicator warning level (default 70) [system.temp]
memAlertThreshold: 75 # mem indicator alert level (default 85) warn_threshold = 90
tempWarnThreshold: 90 # temperature indicator warning level (default 60) alert_threshold = 95
tempAlertThreshold: 95 # temperature indicator alert level (default 80) [clock]
clock: format = "%a %d %b %R"
format: "%a %d %b %R" # optional, default: %a %d %b %R [mediaPlayer]
mediaPlayer: max_title_length = 100
maxTitleLength: 100 # optional, default 100 [settings]
settings: lockCmd = "hyprlock &"
lockCmd: "hyprlock &" # optional, default None audio_sinks_more_cmd = "pavucontrol -t 3"
audioSinksMoreCmd: "pavucontrol -t 3" # optional default None audio_sources_more_cmd = "pavucontrol -t 4"
audioSourcesMoreCmd: "pavucontrol -t 4" # optional, default None wifi_more_cmd = "nm-connection-editor"
wifiMoreCmd: "nm-connection-editor" # optional, default None vpn_more_cmd = "nm-connection-editor"
vpnMoreCmd: "nm-connection-editor" # optional, default None bluetooth_more_cmd = "blueman-manager"
bluetoothMoreCmd: "blueman-manager" # optional, default None [appearance]
appearance: style = "Solid"
backgroundColor: "#${config.lib.stylix.colors.base00}88" # used as a base background color for header module button opacity = 0.7
primaryColor: "#${config.lib.stylix.colors.base0B}" # used as a accent color background_color = "#${config.lib.stylix.colors.base00}88"
secondaryColor: "#${config.lib.stylix.colors.base01}" # used for darker background color primary_color = "#${config.lib.stylix.colors.base0B}"
successColor: "#${config.lib.stylix.colors.base0A}" # used for success message or happy state secondary_color = "#${config.lib.stylix.colors.base01}"
dangerColor: "#${config.lib.stylix.colors.base08}" # used for danger message or danger state (the weak version is used for the warning state success_color = "#${config.lib.stylix.colors.base0A}"
textColor: "#${config.lib.stylix.colors.base07}" # base default text color danger_color = "#${config.lib.stylix.colors.base08}"
# this is a list of color that will be used in the workspace module (one color for each monitor) text_color = "#${config.lib.stylix.colors.base07}"
workspaceColors: workspace_colors = [ "#${config.lib.stylix.colors.base0B}", "#${config.lib.stylix.colors.base0B}" ]
- "#${config.lib.stylix.colors.base0B}" specialWorkspaceColors = [ "#${config.lib.stylix.colors.base0B}", "#${config.lib.stylix.colors.base0B}" ]
- "#${config.lib.stylix.colors.base0B}" [appearance.menu]
# this is a list of color that will be used in the workspace module opacity = 0.7
# for the special workspace (one color for each monitor) backdrop = 0.0
# optional, default None
# without a value the workspaceColors list will be used
specialWorkspaceColors:
- "#${config.lib.stylix.colors.base0B}"
- "#${config.lib.stylix.colors.base0B}"
''; '';
home.file.".config/hypr/hypridle.conf".text = '' home.file.".config/hypr/hypridle.conf".text = ''
general { general {