peritia/NixOS-95
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge Dev with main #21

Merged
Peritia-System merged 57 commits from Dev into main 2026-02-07 10:56:52 +01:00
Conversation 1 Commits 57 Files changed 54 +218 -138
7 changed files with 218 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ddcb125ee3 - Show all commits

19
nixos95/dotfiles/battery.rc Normal file
View file

@ -0,0 +1,19 @@
display_label=false
display_icon=true
display_power=false
display_percentage=false
display_bar=false
display_time=false
tooltip_display_percentage=true
tooltip_display_time=false
low_percentage=30
critical_percentage=20
action_on_low=1
action_on_critical=1
hide_when_full=0
colorA=rgb(119,118,123)
colorH=rgb(143,240,164)
colorL=rgb(248,228,92)
colorC=rgb(237,51,59)
command_on_low=
command_on_critical=

10
nixos95/dotfiles/launcher-13/brave.desktop
View file

@ -1,10 +0,0 @@
[Desktop Entry]
Version=1.0
Type=Application
Name=Brave
GenericName=Web Browser
Comment=Browse the Web
Exec=brave
Icon=world
Terminal=false
Categories=Network;WebBrowser;

11
nixos95/dotfiles/launcher-14/signal.desktop
View file

@ -1,11 +0,0 @@
[Desktop Entry]
Version=1.0
Type=Application
Name=Signal
Comment=Private Messenger
Exec=signal-desktop %U
Icon=signal-desktop
Terminal=false
Categories=Network;InstantMessaging;

10
nixos95/dotfiles/launcher-15/obsidian.desktop
View file

@ -1,10 +0,0 @@
[Desktop Entry]
Version=1.0
Type=Application
Name=Obsidian
Comment=Markdown Editor
Exec=obsidian %u
Icon=obsidian
Terminal=false
Categories=Office;Utility;

10
nixos95/dotfiles/launcher-16/spotify.desktop
View file

@ -1,10 +0,0 @@
[Desktop Entry]
Version=1.0
Type=Application
Name=Spotify
Comment=Spotify Music
Exec=spotify %U
Icon=spotify
Terminal=false
Categories=AudioVideo;Player;

81
nixos95/dotfiles/xfce4-panel.xml
View file

@ -1,81 +0,0 @@
<?xml version="1.1" encoding="UTF-8"?>
<channel name="xfce4-panel" version="1.0">
<property name="configver" type="int" value="2"/>
<property name="panels" type="array">
<value type="int" value="1"/>
<property name="dark-mode" type="bool" value="true"/>
<property name="panel-1" type="empty">
<property name="position" type="string" value="p=8;x=1368;y=1810"/>
<property name="length" type="double" value="100"/>
<property name="position-locked" type="bool" value="true"/>
<property name="icon-size" type="uint" value="0"/>
<property name="size" type="uint" value="36"/>
<property name="plugin-ids" type="array">
<value type="int" value="1"/>
<value type="int" value="13"/>
<value type="int" value="14"/>
<value type="int" value="15"/>
<value type="int" value="16"/>
<value type="int" value="2"/>
<value type="int" value="5"/>
<value type="int" value="6"/>
<value type="int" value="8"/>
<value type="int" value="10"/>
</property>
<property name="mode" type="uint" value="0"/>
<property name="background-style" type="uint" value="0"/>
</property>
</property>
<property name="plugins" type="empty">
<property name="plugin-1" type="string" value="whiskermenu">
<property name="button-icon" type="string" value="whisker-menu-button"/>
<property name="recent" type="array">
<value type="string" value="codium.desktop"/>
</property>
</property>
<property name="plugin-2" type="string" value="tasklist">
<property name="grouping" type="uint" value="1"/>
</property>
<property name="plugin-6" type="string" value="systray">
<property name="square-icons" type="bool" value="true"/>
<property name="known-legacy-items" type="array">
<value type="string" value="networkmanager applet"/>
</property>
</property>
<property name="plugin-8" type="string" value="clock">
<property name="mode" type="uint" value="2"/>
<property name="digital-layout" type="uint" value="3"/>
<property name="digital-time-font" type="string" value="Sans 12"/>
</property>
<property name="plugin-10" type="string" value="actions"/>
<property name="plugin-13" type="string" value="launcher">
<property name="show-label" type="bool" value="false"/>
<property name="items" type="array">
<value type="string" value="brave.desktop"/>
</property>
</property>
<property name="plugin-14" type="string" value="launcher">
<property name="show-label" type="bool" value="false"/>
<property name="items" type="array">
<value type="string" value="signal.desktop"/>
</property>
</property>
<property name="plugin-15" type="string" value="launcher">
<property name="show-label" type="bool" value="false"/>
<property name="items" type="array">
<value type="string" value="obsidian.desktop"/>
</property>
</property>
<property name="plugin-16" type="string" value="launcher">
<property name="show-label" type="bool" value="false"/>
<property name="items" type="array">
<value type="string" value="spotify.desktop"/>
</property>
</property>
<property name="plugin-5" type="string" value="separator">
<property name="expand" type="bool" value="true"/>
<property name="style" type="uint" value="0"/>
</property>
</property>
</channel>

215
nixos95/taskbar.nix
View file

@ -3,28 +3,211 @@
* This can be improved by allowing users to define there own task bar config
*/
{ config, lib, pkgs, ... }: let
cfg = config.nixos95;
in lib.mkIf cfg.enable {
cfg = config.nixos95.taskbar;
user = config.nixos95.user;
t = lib.types;
in {
environment.systemPackages = [
pkgs.xfce.xfce4-whiskermenu-plugin
];
options.nixos95.taskbar = {
home-manager.users.${cfg.user} = {
xdg.configFile = {
"xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml" = {
force = true;
source = ./dotfiles/xfce4-panel.xml;
homeIcon = lib.mkOption {
description = ''
Home icon used in the lefter corner of the taskbar
Can be either a `path` to an icon to use,
or the name (string) of an icon in the current theme.
This will be the `Win95_plus` theme by default.
You can check for existing icons inside `/Ressources/Icons/Win95_plus`.
'';
default = "whisker-menu-button";
type = t.either t.str t.path;
example = "world";
};
battery-plugin = {
enable = lib.mkOption {
description = ''
Enable the battery plugin in the taskbar.
This will show the charging status in the right corner.
On hover it will show the excat percentage.
'';
default = true;
example = false;
type = t.bool;
};
};
# Panel:
"xfce4/panel/launcher-13/brave.desktop".source = ./dotfiles/launcher-13/brave.desktop;
"xfce4/panel/launcher-14/signal.desktop".source = ./dotfiles/launcher-14/signal.desktop;
"xfce4/panel/launcher-15/obsidian.desktop".source = ./dotfiles/launcher-15/obsidian.desktop;
"xfce4/panel/launcher-16/spotify.desktop".source = ./dotfiles/launcher-16/spotify.desktop;
applications = lib.mkOption {
description = ''
(in order) list of applications to pin in the taskbar.
Applications must be defined as a set each with the following name-value paris:
{
enable = bool; [optional; default = true]
name = string; [application name shown on hover; optional]
description = string; [text shown on hover; optional]
icon = string | path; [icon shown in the task bar]
terminal = bool; [start the program inside a terminal; optional; default = false]
[either pkg or exe must be defined]
pkg = package; [use mainProgramm of a nix package; e.g. pkgs.firefox]
exe = string; [provide a program name directly; e.g. firefox]
}
The `icon` can be specified as an icon name (in the current Iocn pack)
or as a `path` to an image directly.
See `/Ressources/Icons/Win95_plus` for the default icons.
'';
default = [
{
name = "Files";
description = "View and manage local files";
icon = "folder_open";
exe = "exo-open --launch FileManager";
}
{
name = "Terminal";
description = "Run commands";
icon = "xfce4-terminal";
pkg = pkgs.xfce.xfce4-terminal;
}
{
name = "Browser";
description = "Access the world wide web";
icon = "firefox";
exe = "exo-open --launch WebBrowser";
}
];
type = t.listOf t.attrs;
};
};
config = lib.mkIf config.nixos95.enable {
environment.systemPackages = [
pkgs.xfce.xfce4-whiskermenu-plugin
(lib.mkIf cfg.battery-plugin.enable pkgs.xfce.xfce4-battery-plugin)
];
home-manager.users.${user} = {
xdg.configFile = {
"xfce4/panel/battery-7.rc" = {
force = true;
enable = cfg.battery-plugin.enable;
source = ./dotfiles/battery.rc;
};
"xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml" = let
ifBattery = str : if cfg.battery-plugin.enable then str else "";
battery_id = ifBattery '' <value type="int" value="7" /> '';
battery_xml = ifBattery '' <property name="plugin-7" type="string" value="battery" /> '';
applications_cfg = cfg.applications
|> lib.filter ( elm : !( lib.hasAttr "enable" elm) || elm.enable )
|> lib.imap0 ( ptr : elm : rec {
# we start IDs in the 20 range to not get confilics with other plugins
plugin_id = "2" + builtins.toString ptr;
plugin_desktop = let
desc = if elm ? description then elm.description else "";
term = if elm ? term && elm.term then "true" else "false";
exec = if elm ? pkg then lib.getExe elm.pkg else elm.exe;
in pkgs.writeTextFile {
name = "${elm.name}.desktop";
text = ''
[Desktop Entry]
Version=1.0
Type=Application
Name=${elm.name}
Icon=${elm.icon}
Exec=${exec}
Comment=${desc}
Terminal=${term}
'';
};
plugin_xml = ''
<property name="plugin-${plugin_id}" type="string" value="launcher">
<property name="show-label" type="bool" value="false" />
<property name="items" type="array">
<value type="string" value="${plugin_desktop}" />
</property>
</property>
'';
});
app_ids = applications_cfg
|> lib.map ( elm : '' <value type="int" value="${elm.plugin_id}"/> '' )
|> lib.concatStringsSep "\n";
app_xml = applications_cfg
|> lib.map ( elm : elm.plugin_xml )
|> lib.concatStringsSep "\n";
in {
force = true;
text = ''
<?xml version="1.1" encoding="UTF-8"?>
<channel name="xfce4-panel" version="1.0">
<property name="configver" type="int" value="2"/>
<property name="panels" type="array">
<value type="int" value="1"/>
<property name="dark-mode" type="bool" value="true"/>
<property name="panel-1" type="empty">
<property name="position" type="string" value="p=8;x=1368;y=1810"/>
<property name="length" type="double" value="100"/>
<property name="position-locked" type="bool" value="true"/>
<property name="icon-size" type="uint" value="0"/>
<property name="size" type="uint" value="42"/>
<property name="plugin-ids" type="array">
<value type="int" value="1"/>
${app_ids}
<value type="int" value="3"/>
<value type="int" value="4"/>
<value type="int" value="5"/>
<value type="int" value="6"/>
${battery_id}
</property>
<property name="mode" type="uint" value="0"/>
<property name="background-style" type="uint" value="0"/>
</property>
</property>
<property name="plugins" type="empty">
<property name="plugin-1" type="string" value="whiskermenu">
<property name="button-icon" type="string" value="${cfg.homeIcon}"/>
<property name="recent" type="array">
</property>
</property>
${app_xml}
<property name="plugin-3" type="string" value="tasklist">
<property name="grouping" type="uint" value="1"/>
</property>
<property name="plugin-4" type="string" value="separator">
<property name="expand" type="bool" value="true"/>
<property name="style" type="uint" value="0"/>
</property>
<property name="plugin-5" type="string" value="systray">
<property name="square-icons" type="bool" value="true"/>
<property name="known-legacy-items" type="array">
<value type="string" value="networkmanager applet"/>
</property>
</property>
<property name="plugin-6" type="string" value="clock">
<property name="mode" type="uint" value="2"/>
<property name="digital-layout" type="uint" value="3"/>
<property name="digital-time-font" type="string" value="Sans 12"/>
</property>
${battery_xml}
</property>
</channel>
'';
};
};
};
};
}