many changes
This commit is contained in:
parent
f513a28414
commit
6641cfac30
GPG key ID:
00F325187C68651A
15 changed files with 527 additions and 515 deletions
|
|
@ -1,544 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
# Get the actual color palettes
|
||||
darkPalette = pkgs.catppuccin.${config.catppuccin.flavor};
|
||||
lightPalette = pkgs.catppuccin.latte;
|
||||
|
||||
# Create theme from palette
|
||||
mkTheme = palette: accent: {
|
||||
mPrimary = palette.${accent};
|
||||
mOnPrimary = palette.crust;
|
||||
mSecondary = palette.subtext0;
|
||||
mOnSecondary = palette.crust;
|
||||
mTertiary = palette.teal;
|
||||
mOnTertiary = palette.crust;
|
||||
mError = palette.red;
|
||||
mOnError = palette.crust;
|
||||
mSurface = palette.base;
|
||||
mOnSurface = palette.text;
|
||||
mSurfaceVariant = palette.surface0;
|
||||
mOnSurfaceVariant = palette.lavender;
|
||||
mOutline = palette.surface2;
|
||||
mShadow = palette.crust;
|
||||
mHover = palette.teal;
|
||||
mOnHover = palette.crust;
|
||||
};
|
||||
|
||||
# Build the complete color scheme
|
||||
customScheme = {
|
||||
dark = mkTheme darkPalette config.catppuccin.accent;
|
||||
light = mkTheme lightPalette config.catppuccin.accent;
|
||||
};
|
||||
|
||||
# Convert to JSON
|
||||
schemeJson = builtins.toJSON customScheme;
|
||||
|
||||
# Write to file - escape for shell
|
||||
schemeJsonEscaped = lib.escapeShellArg schemeJson;
|
||||
|
||||
customPackage = pkgs.noctalia-shell.overrideAttrs (oldAttrs: {
|
||||
pname = "noctalia-shell-custom";
|
||||
nativeBuildInputs = (oldAttrs.nativeBuildInputs or [ ]) ++ [ pkgs.jq ];
|
||||
|
||||
postPatch = (oldAttrs.postPatch or "") + ''
|
||||
echo "Patching noctalia-shell with Cat-Custom theme..."
|
||||
echo " Dark: ${config.catppuccin.flavor} / Light: latte"
|
||||
echo " Accent: ${config.catppuccin.accent}"
|
||||
|
||||
if [ -d Assets/ColorScheme/Catppuccin ]; then
|
||||
mkdir -p Assets/ColorScheme/Cat-Custom
|
||||
|
||||
# Write the JSON directly
|
||||
cat > Assets/ColorScheme/Cat-Custom/Cat-Custom.json << 'COLORSCHEME_EOF'
|
||||
${schemeJson}
|
||||
COLORSCHEME_EOF
|
||||
|
||||
echo "Created Cat-Custom color scheme:"
|
||||
${pkgs.jq}/bin/jq -C '.' Assets/ColorScheme/Cat-Custom/Cat-Custom.json || true
|
||||
|
||||
# Add translation entries
|
||||
for lang in en fr de es pt zh-CN; do
|
||||
if [ -f "Assets/Translations/$lang.json" ]; then
|
||||
${pkgs.jq}/bin/jq \
|
||||
'.["color-scheme"].predefined.schemes["Cat-Custom"] = "Cat-Custom"' \
|
||||
"Assets/Translations/$lang.json" > "Assets/Translations/$lang.json.tmp" \
|
||||
&& mv "Assets/Translations/$lang.json.tmp" "Assets/Translations/$lang.json"
|
||||
fi
|
||||
done
|
||||
else
|
||||
echo "ERROR: ColorScheme directory not found"
|
||||
exit 1
|
||||
fi
|
||||
'';
|
||||
|
||||
meta = oldAttrs.meta // {
|
||||
description = "${oldAttrs.meta.description} (Cat-Custom: ${config.catppuccin.flavor}/${config.catppuccin.accent})";
|
||||
};
|
||||
});
|
||||
in
|
||||
{
|
||||
programs.noctalia-shell = {
|
||||
enable = true;
|
||||
package = customPackage;
|
||||
settings = {
|
||||
settingsVersion = 0;
|
||||
bar = {
|
||||
position = "top";
|
||||
backgroundOpacity = 1;
|
||||
monitors = [ ];
|
||||
density = "comfortable";
|
||||
showCapsule = true;
|
||||
capsuleOpacity = 1;
|
||||
floating = false;
|
||||
marginVertical = 0.25;
|
||||
marginHorizontal = 0.25;
|
||||
outerCorners = true;
|
||||
exclusive = true;
|
||||
widgets = {
|
||||
left = [
|
||||
{
|
||||
icon = "rocket";
|
||||
id = "CustomButton";
|
||||
leftClickExec = "noctalia-shell ipc call launcher toggle";
|
||||
}
|
||||
{
|
||||
id = "Workspace";
|
||||
}
|
||||
{
|
||||
diskPath = "/";
|
||||
id = "SystemMonitor";
|
||||
showCpuTemp = false;
|
||||
showCpuUsage = true;
|
||||
showDiskUsage = true;
|
||||
showGpuTemp = false;
|
||||
showMemoryAsPercent = true;
|
||||
showMemoryUsage = true;
|
||||
showNetworkStats = false;
|
||||
usePrimaryColor = false;
|
||||
}
|
||||
{
|
||||
colorizeIcons = false;
|
||||
hideMode = "hidden";
|
||||
id = "ActiveWindow";
|
||||
maxWidth = 375;
|
||||
scrollingMode = "always";
|
||||
showIcon = true;
|
||||
useFixedWidth = false;
|
||||
}
|
||||
];
|
||||
center = [
|
||||
];
|
||||
right = [
|
||||
{
|
||||
hideMode = "hidden";
|
||||
hideWhenIdle = false;
|
||||
id = "MediaMini";
|
||||
maxWidth = 350;
|
||||
scrollingMode = "always";
|
||||
showAlbumArt = false;
|
||||
showArtistFirst = true;
|
||||
showProgressRing = true;
|
||||
showVisualizer = false;
|
||||
useFixedWidth = false;
|
||||
visualizerType = "linear";
|
||||
}
|
||||
{
|
||||
id = "ScreenRecorder";
|
||||
}
|
||||
{
|
||||
id = "Tray";
|
||||
}
|
||||
{
|
||||
id = "NotificationHistory";
|
||||
}
|
||||
{
|
||||
id = "Battery";
|
||||
}
|
||||
{
|
||||
id = "Volume";
|
||||
}
|
||||
{
|
||||
id = "Brightness";
|
||||
}
|
||||
{
|
||||
id = "ControlCenter";
|
||||
}
|
||||
{
|
||||
formatHorizontal = "ddd MMM dd yyyy @ h:mm AP";
|
||||
formatVertical = "HH mm - dd MM";
|
||||
id = "Clock";
|
||||
useCustomFont = false;
|
||||
usePrimaryColor = false;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
general = {
|
||||
avatarImage = "";
|
||||
dimmerOpacity = 0.6;
|
||||
showScreenCorners = true;
|
||||
forceBlackScreenCorners = true;
|
||||
scaleRatio = 1;
|
||||
radiusRatio = 1;
|
||||
iRadiusRatio = 1;
|
||||
boxRadiusRatio = 1;
|
||||
screenRadiusRatio = 1;
|
||||
animationSpeed = 1;
|
||||
animationDisabled = false;
|
||||
compactLockScreen = false;
|
||||
lockOnSuspend = true;
|
||||
showSessionButtonsOnLockScreen = true;
|
||||
showHibernateOnLockScreen = false;
|
||||
enableShadows = false;
|
||||
shadowDirection = "bottom_right";
|
||||
shadowOffsetX = 2;
|
||||
shadowOffsetY = 3;
|
||||
language = "";
|
||||
allowPanelsOnScreenWithoutBar = true;
|
||||
};
|
||||
ui = {
|
||||
fontDefault = "Noto Sans";
|
||||
fontFixed = "NotoSansM Nerd Font Mono";
|
||||
fontDefaultScale = 1;
|
||||
fontFixedScale = 1;
|
||||
tooltipsEnabled = true;
|
||||
panelBackgroundOpacity = 1;
|
||||
panelsAttachedToBar = true;
|
||||
settingsPanelMode = "attached";
|
||||
};
|
||||
location = {
|
||||
name = "Atlanta, US";
|
||||
weatherEnabled = true;
|
||||
weatherShowEffects = true;
|
||||
useFahrenheit = true;
|
||||
use12hourFormat = true;
|
||||
showWeekNumberInCalendar = true;
|
||||
showCalendarEvents = true;
|
||||
showCalendarWeather = true;
|
||||
analogClockInCalendar = false;
|
||||
firstDayOfWeek = -1;
|
||||
};
|
||||
calendar = {
|
||||
cards = [
|
||||
{
|
||||
enabled = true;
|
||||
id = "calendar-header-card";
|
||||
}
|
||||
{
|
||||
enabled = true;
|
||||
id = "calendar-month-card";
|
||||
}
|
||||
{
|
||||
enabled = true;
|
||||
id = "timer-card";
|
||||
}
|
||||
{
|
||||
enabled = true;
|
||||
id = "weather-card";
|
||||
}
|
||||
];
|
||||
};
|
||||
screenRecorder = {
|
||||
directory = "";
|
||||
frameRate = 60;
|
||||
audioCodec = "opus";
|
||||
videoCodec = "h264";
|
||||
quality = "very_high";
|
||||
colorRange = "limited";
|
||||
showCursor = true;
|
||||
audioSource = "default_output";
|
||||
videoSource = "portal";
|
||||
};
|
||||
wallpaper = {
|
||||
enabled = false;
|
||||
overviewEnabled = false;
|
||||
directory = "";
|
||||
monitorDirectories = [ ];
|
||||
enableMultiMonitorDirectories = false;
|
||||
recursiveSearch = false;
|
||||
setWallpaperOnAllMonitors = true;
|
||||
fillMode = "crop";
|
||||
fillColor = "#000000";
|
||||
randomEnabled = false;
|
||||
randomIntervalSec = 300;
|
||||
transitionDuration = 1500;
|
||||
transitionType = "random";
|
||||
transitionEdgeSmoothness = 0.05;
|
||||
panelPosition = "follow_bar";
|
||||
hideWallpaperFilenames = false;
|
||||
useWallhaven = false;
|
||||
wallhavenQuery = "";
|
||||
wallhavenSorting = "relevance";
|
||||
wallhavenOrder = "desc";
|
||||
wallhavenCategories = "111";
|
||||
wallhavenPurity = "100";
|
||||
wallhavenResolutionMode = "atleast";
|
||||
wallhavenResolutionWidth = "";
|
||||
wallhavenResolutionHeight = "";
|
||||
};
|
||||
appLauncher = {
|
||||
enableClipboardHistory = false;
|
||||
enableClipPreview = true;
|
||||
position = "center";
|
||||
pinnedExecs = [ ];
|
||||
useApp2Unit = false;
|
||||
sortByMostUsed = true;
|
||||
terminalCommand = "xterm -e";
|
||||
customLaunchPrefixEnabled = false;
|
||||
customLaunchPrefix = "";
|
||||
viewMode = "list";
|
||||
showCategories = true;
|
||||
};
|
||||
controlCenter = {
|
||||
position = "close_to_bar_button";
|
||||
shortcuts = {
|
||||
left = [
|
||||
{
|
||||
id = "WiFi";
|
||||
}
|
||||
{
|
||||
id = "Bluetooth";
|
||||
}
|
||||
{
|
||||
id = "ScreenRecorder";
|
||||
}
|
||||
{
|
||||
id = "WallpaperSelector";
|
||||
}
|
||||
];
|
||||
right = [
|
||||
{
|
||||
id = "Notifications";
|
||||
}
|
||||
{
|
||||
id = "PowerProfile";
|
||||
}
|
||||
{
|
||||
id = "KeepAwake";
|
||||
}
|
||||
{
|
||||
id = "NightLight";
|
||||
}
|
||||
];
|
||||
};
|
||||
cards = [
|
||||
{
|
||||
enabled = true;
|
||||
id = "profile-card";
|
||||
}
|
||||
{
|
||||
enabled = true;
|
||||
id = "shortcuts-card";
|
||||
}
|
||||
{
|
||||
enabled = true;
|
||||
id = "audio-card";
|
||||
}
|
||||
{
|
||||
enabled = true;
|
||||
id = "weather-card";
|
||||
}
|
||||
{
|
||||
enabled = true;
|
||||
id = "media-sysmon-card";
|
||||
}
|
||||
];
|
||||
};
|
||||
systemMonitor = {
|
||||
cpuWarningThreshold = 80;
|
||||
cpuCriticalThreshold = 90;
|
||||
tempWarningThreshold = 80;
|
||||
tempCriticalThreshold = 90;
|
||||
memWarningThreshold = 80;
|
||||
memCriticalThreshold = 90;
|
||||
diskWarningThreshold = 80;
|
||||
diskCriticalThreshold = 90;
|
||||
cpuPollingInterval = 3000;
|
||||
tempPollingInterval = 3000;
|
||||
memPollingInterval = 3000;
|
||||
diskPollingInterval = 3000;
|
||||
networkPollingInterval = 3000;
|
||||
useCustomColors = false;
|
||||
warningColor = "";
|
||||
criticalColor = "";
|
||||
};
|
||||
dock = {
|
||||
enabled = false;
|
||||
displayMode = "auto_hide";
|
||||
backgroundOpacity = 1;
|
||||
floatingRatio = 1;
|
||||
size = 1;
|
||||
onlySameOutput = true;
|
||||
monitors = [ ];
|
||||
pinnedApps = [ ];
|
||||
colorizeIcons = false;
|
||||
pinnedStatic = false;
|
||||
inactiveIndicators = false;
|
||||
deadOpacity = 0.6;
|
||||
};
|
||||
network = {
|
||||
wifiEnabled = true;
|
||||
};
|
||||
sessionMenu = {
|
||||
enableCountdown = true;
|
||||
countdownDuration = 10000;
|
||||
position = "center";
|
||||
showHeader = true;
|
||||
powerOptions = [
|
||||
{
|
||||
action = "lock";
|
||||
enabled = true;
|
||||
}
|
||||
{
|
||||
action = "suspend";
|
||||
enabled = true;
|
||||
}
|
||||
{
|
||||
action = "hibernate";
|
||||
enabled = true;
|
||||
}
|
||||
{
|
||||
action = "reboot";
|
||||
enabled = true;
|
||||
}
|
||||
{
|
||||
action = "logout";
|
||||
enabled = true;
|
||||
}
|
||||
{
|
||||
action = "shutdown";
|
||||
enabled = true;
|
||||
}
|
||||
];
|
||||
};
|
||||
notifications = {
|
||||
enabled = true;
|
||||
monitors = [ ];
|
||||
location = "top_right";
|
||||
overlayLayer = true;
|
||||
backgroundOpacity = 1;
|
||||
respectExpireTimeout = false;
|
||||
lowUrgencyDuration = 3;
|
||||
normalUrgencyDuration = 8;
|
||||
criticalUrgencyDuration = 15;
|
||||
enableKeyboardLayoutToast = true;
|
||||
sounds = {
|
||||
enabled = false;
|
||||
volume = 0.5;
|
||||
separateSounds = false;
|
||||
criticalSoundFile = "";
|
||||
normalSoundFile = "";
|
||||
lowSoundFile = "";
|
||||
excludedApps = "discord,firefox,chrome,chromium,edge";
|
||||
};
|
||||
};
|
||||
osd = {
|
||||
enabled = true;
|
||||
location = "top_right";
|
||||
autoHideMs = 2000;
|
||||
overlayLayer = true;
|
||||
backgroundOpacity = 1;
|
||||
enabledTypes = [
|
||||
0
|
||||
1
|
||||
2
|
||||
];
|
||||
monitors = [ ];
|
||||
};
|
||||
audio = {
|
||||
volumeStep = 5;
|
||||
volumeOverdrive = false;
|
||||
cavaFrameRate = 30;
|
||||
visualizerType = "linear";
|
||||
visualizerQuality = "high";
|
||||
mprisBlacklist = [ ];
|
||||
preferredPlayer = "";
|
||||
externalMixer = "pwvucontrol || pavucontrol";
|
||||
};
|
||||
brightness = {
|
||||
brightnessStep = 5;
|
||||
enforceMinimum = true;
|
||||
enableDdcSupport = true;
|
||||
};
|
||||
colorSchemes = {
|
||||
useWallpaperColors = false;
|
||||
predefinedScheme = "Cat-Custom";
|
||||
darkMode = true;
|
||||
schedulingMode = "off";
|
||||
manualSunrise = "06:30";
|
||||
manualSunset = "18:30";
|
||||
matugenSchemeType = "scheme-fruit-salad";
|
||||
generateTemplatesForPredefined = true;
|
||||
};
|
||||
templates = {
|
||||
gtk = false;
|
||||
qt = false;
|
||||
kcolorscheme = false;
|
||||
alacritty = false;
|
||||
kitty = false;
|
||||
ghostty = false;
|
||||
foot = false;
|
||||
wezterm = false;
|
||||
fuzzel = false;
|
||||
discord = false;
|
||||
pywalfox = false;
|
||||
vicinae = false;
|
||||
walker = false;
|
||||
code = false;
|
||||
spicetify = false;
|
||||
telegram = false;
|
||||
cava = false;
|
||||
yazi = false;
|
||||
emacs = false;
|
||||
niri = false;
|
||||
enableUserTemplates = false;
|
||||
};
|
||||
nightLight = {
|
||||
enabled = true;
|
||||
forced = false;
|
||||
autoSchedule = true;
|
||||
nightTemp = "4000";
|
||||
dayTemp = "6500";
|
||||
manualSunrise = "06:30";
|
||||
manualSunset = "18:30";
|
||||
};
|
||||
hooks = {
|
||||
enabled = false;
|
||||
wallpaperChange = "";
|
||||
darkModeChange = "";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
systemd.user.services.noctalia-shell = {
|
||||
Unit = {
|
||||
After = [ "niri.service" ];
|
||||
PartOf = [ "niri.service" ];
|
||||
Description = "Noctalia Shell - Wayland desktop shell";
|
||||
Documentation = "https://docs.noctalia.dev/docs";
|
||||
};
|
||||
|
||||
Service = {
|
||||
ExecStart = "${customPackage}/bin/noctalia-shell";
|
||||
Restart = "on-failure";
|
||||
Environment = [
|
||||
"LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale"
|
||||
"TZDIR=${pkgs.tzdata}/share/zoneinfo"
|
||||
"NOCTALIA_SETTINGS_FALLBACK=%h/.config/noctalia/gui-settings.json"
|
||||
"QT_QPA_PLATFORM=wayland"
|
||||
"QT_QPA_PLATFORMTHEME_5=qt5ct"
|
||||
"QT_QPA_PLATFORMTHEME=qt6ct"
|
||||
];
|
||||
};
|
||||
|
||||
Install = {
|
||||
WantedBy = [ "niri.service" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue