From 2cc86a5364073bae5d72fcfa1c4027ea9d3d445f Mon Sep 17 00:00:00 2001 From: Nate Anderson Date: Thu, 12 Feb 2026 23:32:26 -0700 Subject: [PATCH] add noctalia, fix plymouth builds with wrong imagedir replace directive --- frame12/desktop-configuration.nix | 8 +- frame12/modules/home-manager/home.nix | 807 ++++++++++++++++++++---- jaci/desktop-configuration.nix | 10 +- nate-work/modules/home-manager/home.nix | 1 - 4 files changed, 705 insertions(+), 121 deletions(-) diff --git a/frame12/desktop-configuration.nix b/frame12/desktop-configuration.nix index 7f8d2fe..6567af7 100644 --- a/frame12/desktop-configuration.nix +++ b/frame12/desktop-configuration.nix @@ -54,10 +54,10 @@ in # Stylix theming stylix = { enable = true; - image = ./wallpaper.png; + # image = ./wallpaper.png; # Check with `nix build nixpkgs#base16-schemes && ls result/share/themes` - base16Scheme = "${pkgs.base16-schemes}/share/themes/woodland.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/kimber.yaml"; polarity = "dark"; # System-wide cursor @@ -130,8 +130,8 @@ in cp -r ${./framework-plymouth-theme/framework}/* $out/share/plymouth/themes/framework/ substituteInPlace $out/share/plymouth/themes/framework/framework.plymouth \ --replace-fail "@IMAGEDIR@" "$out/share/plymouth/themes/framework" - substituteInPlace $out/share/plymouth/themes/framework/framework.script \ - --replace-fail "@IMAGEDIR@" "$out/share/plymouth/themes/framework" + # substituteInPlace $out/share/plymouth/themes/framework/framework.script \ + # --replace-fail "@IMAGEDIR@" "$out/share/plymouth/themes/framework" '') ]; }; diff --git a/frame12/modules/home-manager/home.nix b/frame12/modules/home-manager/home.nix index 4c6e312..186d255 100644 --- a/frame12/modules/home-manager/home.nix +++ b/frame12/modules/home-manager/home.nix @@ -1,21 +1,30 @@ -{ inputs, config, pkgs, lib, ... }: - let - userName = "nate"; - fullName = "Nate Anderson"; - email = "n8r@tuta.io"; - unstable = import inputs.nixpkgs-unstable { system = "x86_64-linux"; config.allowUnfree = true; }; - in +{ + inputs, + config, + pkgs, + lib, + ... +}: +let + userName = "nate"; + fullName = "Nate Anderson"; + email = "n8r@tuta.io"; + unstable = import inputs.nixpkgs-unstable { + system = "x86_64-linux"; + config.allowUnfree = true; + }; +in { imports = [ - ../../../shared/modules/apps/firefox/firefox.nix - ../../../shared/modules/apps/ghostty.nix - ../../../shared/modules/apps/helix.nix - ../../../shared/modules/home-manager/git-autosync.nix - ../../../shared/modules/home-manager/noctalia.nix - ../../../shared/modules/home-manager/json2nix.nix - ../../../shared/modules/home-manager/style-preview.nix - ../niri/niri_home.nix - ./programs.nix + ../../../shared/modules/apps/firefox/firefox.nix + ../../../shared/modules/apps/ghostty.nix + ../../../shared/modules/apps/helix.nix + ../../../shared/modules/home-manager/git-autosync.nix + ../../../shared/modules/home-manager/noctalia.nix + ../../../shared/modules/home-manager/json2nix.nix + ../../../shared/modules/home-manager/style-preview.nix + ../niri/niri_home.nix + ./programs.nix ]; home.username = userName; @@ -45,20 +54,6 @@ homePackages = [ ]; }; - # Enable Noctalia shell (replaces Waybar, SwayNC, SwayOSD, wlsunset) - noctaliaShell = { - enable = true; - settings = { - bar.position = "top"; - colorSchemes = { - darkMode = true; - predefinedScheme = "Noctalia (default)"; - }; - location.name = "Denver"; - general.avatarImage = "/home/${userName}/.face"; - }; - }; - # Additional user packages # Note: Programs with Stylix theming are in programs.nix home.packages = with pkgs; [ @@ -79,7 +74,6 @@ ### Misc usbutils fw-ectool # framework ectool for key remapping - # Colemak-DH EC remap scripts # Positions verified through testing on Framework 12 # Format: ectool raw 0x3E0C d1,d1,bROW,bCOL,wSCANCODE @@ -188,7 +182,7 @@ ripgrep tre-command gtop - htop # kept alongside btop in programs.nix + htop # kept alongside btop in programs.nix neofetch unzip nmap @@ -221,30 +215,44 @@ # # Dotfiles - # + # # Static symlinks home.file = lib.mkMerge [ # Shared dotfiles - (let - sharedDotfilesPath = ../../../shared/dotfiles; - in + ( + let + sharedDotfilesPath = ../../../shared/dotfiles; + in if builtins.pathExists sharedDotfilesPath then - builtins.listToAttrs (map (name: { - name = "${config.xdg.configHome}/${name}"; - value = { source = lib.mkDefault (sharedDotfilesPath + "/${name}"); }; - }) (builtins.attrNames (builtins.readDir sharedDotfilesPath))) - else {}) + builtins.listToAttrs ( + map (name: { + name = "${config.xdg.configHome}/${name}"; + value = { + source = lib.mkDefault (sharedDotfilesPath + "/${name}"); + }; + }) (builtins.attrNames (builtins.readDir sharedDotfilesPath)) + ) + else + { } + ) # Add local dotfiles, overriding from local over shared - (let - localDotfilesPath = ../../dotfiles; - in - if builtins.pathExists localDotfilesPath && builtins.readDir localDotfilesPath != {} then - builtins.listToAttrs (map (name: { - name = "${config.xdg.configHome}/${name}"; - value = { source = localDotfilesPath + "/${name}"; }; - }) (builtins.attrNames (builtins.readDir localDotfilesPath))) - else {}) + ( + let + localDotfilesPath = ../../dotfiles; + in + if builtins.pathExists localDotfilesPath && builtins.readDir localDotfilesPath != { } then + builtins.listToAttrs ( + map (name: { + name = "${config.xdg.configHome}/${name}"; + value = { + source = localDotfilesPath + "/${name}"; + }; + }) (builtins.attrNames (builtins.readDir localDotfilesPath)) + ) + else + { } + ) ]; # Active symlinks @@ -260,7 +268,10 @@ icon = "steam"; terminal = false; categories = [ "Game" ]; - mimeType = [ "x-scheme-handler/steam" "x-scheme-handler/steamlink" ]; + mimeType = [ + "x-scheme-handler/steam" + "x-scheme-handler/steamlink" + ]; }; home.sessionVariables = { @@ -275,10 +286,18 @@ settings = { user.name = fullName; user.email = email; - init = { defaultBranch = "main"; }; - pull = { ff = "only"; }; - merge = { conflictStyle="zdiff3"; }; - push = { autoSetupRemote="true"; }; + init = { + defaultBranch = "main"; + }; + pull = { + ff = "only"; + }; + merge = { + conflictStyle = "zdiff3"; + }; + push = { + autoSetupRemote = "true"; + }; }; }; @@ -298,60 +317,66 @@ # enable saving ssh secrets (needed for go mod installing private packages) services.gnome-keyring.enable = true; - services.gnome-keyring.components = [ "ssh" "secrets" ]; + services.gnome-keyring.components = [ + "ssh" + "secrets" + ]; # Zsh setup programs.zsh = { + enable = true; + oh-my-zsh = { enable = true; - oh-my-zsh = { - enable = true; - plugins = [ "git" ]; - theme = "half-life"; - }; - initContent = '' - # History - HISTSIZE=10000 - SAVEHIST=10000 - setopt SHARE_HISTORY - setopt APPEND_HISTORY + plugins = [ "git" ]; + theme = "half-life"; + }; + initContent = '' + # History + HISTSIZE=5000 + SAVEHIST=5000 + setopt SHARE_HISTORY + setopt APPEND_HISTORY - # integrate ssh-agent from gnome keyring - export SSH_AUTH_SOCK=/run/user/$UID/gcr/ssh + # integrate ssh-agent from gnome keyring + export SSH_AUTH_SOCK=/run/user/$UID/gcr/ssh - eval "$(direnv hook zsh)" + eval "$(direnv hook zsh)" - yt-audio() { - nix-shell -p yt-dlp --run "yt-dlp -x $1 --audio-format mp3" - } + yt-audio() { + nix-shell -p yt-dlp --run "yt-dlp -x $1 --audio-format mp3" + } - # Better Unix Aliases - alias ls="lsd" - alias l="lsd --almost-all --long" - alias llm="lsd --timesort --long" - alias lS="lsd --oneline --classic" - alias lt="lsd --tree --depth=2" - alias grep="rg" - alias cat="bat --paging=never" - alias rm="rm -i" - ''; - profileExtra = '' - export XDG_DATA_DIRS=$XDG_DATA_DIRS:/usr/share:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share - ''; - syntaxHighlighting = { - enable = true; - }; + # Better Unix Aliases + alias ls="lsd" + alias l="lsd --almost-all --long" + alias llm="lsd --timesort --long" + alias lS="lsd --oneline --classic" + alias lt="lsd --tree --depth=2" + alias grep="rg" + alias cat="bat --paging=never" + alias rm="rm -i" + ''; + shellAliases = { + ls = "lsd"; + l = "lsd --almost-all --long"; + llm = "lsd --timesort --long"; + lS = "lsd --oneline --classic"; + lt = "lsd --tree --depth=2"; + cat = "bat --paging=never"; + ccat = "cat"; + catp = "bat --paging=never -p"; + rm = "rm -i"; + }; + profileExtra = '' + export XDG_DATA_DIRS=$XDG_DATA_DIRS:/usr/share:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share + ''; + syntaxHighlighting = { + enable = true; + }; }; # Stylix handles Qt and GTK theming - # Noctalia has built-in night light, so wlsunset is disabled via noctalia module - # services.wlsunset = { - # enable = true; - # sunrise = "07:00"; - # sunset = "17:00"; - # temperature.night = 3500; - # }; - services.kdeconnect = { enable = true; indicator = true; @@ -360,20 +385,6 @@ # Enable bluetooth headphone controls services.mpris-proxy.enable = true; - # Noctalia replaces SwayOSD and SwayNC - disabled via noctalia module - # services.swayosd = { - # enable = true; - # topMargin = 0.9; - # }; - # services.swaync = { - # enable = true; - # settings = { - # positionX = "center"; - # positionY = "top"; - # notification-window-width = 800; - # }; - # }; - # Git autosync for star-command services.git-autosync = { enable = true; @@ -383,4 +394,578 @@ gitEmail = email; }; }; + + # Enable Noctalia shell (replaces Waybar, SwayNC, SwayOSD, wlsunset) + noctaliaShell = { + enable = true; + settings = { + settingsVersion = 51; + bar = { + barType = "simple"; + position = "top"; + monitors = [ ]; + density = "spacious"; + showOutline = false; + showCapsule = true; + capsuleOpacity = 1.0; + capsuleColorKey = "none"; + backgroundOpacity = 1.0; + useSeparateOpacity = false; + floating = false; + marginVertical = 4; + marginHorizontal = 4; + frameThickness = 8; + frameRadius = 12; + outerCorners = true; + hideOnOverview = false; + displayMode = "always_visible"; + autoHideDelay = 500; + autoShowDelay = 150; + widgets = { + left = [ + { + icon = "rocket"; + iconColor = "none"; + id = "Launcher"; + } + { + clockColor = "none"; + customFont = ""; + formatHorizontal = "HH:mm ddd, MMM dd"; + formatVertical = "HH mm - dd MM"; + id = "Clock"; + tooltipFormat = "HH:mm ddd, MMM dd"; + useCustomFont = false; + } + { id = "plugin:weekly-calendar"; } + { + compactMode = true; + diskPath = "/"; + iconColor = "none"; + id = "SystemMonitor"; + showCpuFreq = false; + showCpuTemp = true; + showCpuUsage = true; + showDiskAvailable = false; + showDiskUsage = false; + showDiskUsageAsPercent = false; + showGpuTemp = false; + showLoadAverage = false; + showMemoryAsPercent = false; + showMemoryUsage = true; + showNetworkStats = false; + showSwapUsage = false; + textColor = "none"; + useMonospaceFont = true; + } + { + colorizeIcons = false; + hideMode = "hidden"; + id = "ActiveWindow"; + maxWidth = 145; + scrollingMode = "hover"; + showIcon = true; + textColor = "none"; + useFixedWidth = false; + } + { + compactMode = false; + compactShowAlbumArt = true; + compactShowVisualizer = false; + hideMode = "hidden"; + hideWhenIdle = false; + id = "MediaMini"; + maxWidth = 145; + panelShowAlbumArt = true; + panelShowVisualizer = true; + scrollingMode = "hover"; + showAlbumArt = true; + showArtistFirst = true; + showProgressRing = true; + showVisualizer = false; + textColor = "none"; + useFixedWidth = false; + visualizerType = "linear"; + } + { + defaultSettings = { + refreshInterval = 5000; + }; + id = "plugin:mini-docker"; + } + ]; + center = [ + { + characterCount = 2; + colorizeIcons = false; + emptyColor = "secondary"; + enableScrollWheel = true; + focusedColor = "primary"; + followFocusedScreen = false; + groupedBorderOpacity = 1.0; + hideUnoccupied = false; + iconScale = 0.8; + id = "Workspace"; + labelMode = "index"; + occupiedColor = "secondary"; + pillSize = 0.6; + reverseScroll = false; + showApplications = false; + showBadge = true; + showLabelsOnlyWhenOccupied = true; + unfocusedIconsOpacity = 1.0; + } + ]; + right = [ + { + blacklist = [ ]; + chevronColor = "none"; + colorizeIcons = false; + drawerEnabled = true; + hidePassive = false; + id = "Tray"; + pinned = [ ]; + } + { + hideWhenZero = false; + hideWhenZeroUnread = false; + iconColor = "none"; + id = "NotificationHistory"; + showUnreadBadge = true; + unreadBadgeColor = "primary"; + } + { + deviceNativePath = "__default__"; + displayMode = "graphic-clean"; + hideIfIdle = false; + hideIfNotDetected = true; + id = "Battery"; + showNoctaliaPerformance = false; + showPowerProfiles = false; + } + { + displayMode = "onhover"; + iconColor = "none"; + id = "Volume"; + middleClickCommand = "pwvucontrol || pavucontrol"; + textColor = "none"; + } + { + displayMode = "onhover"; + iconColor = "none"; + id = "Brightness"; + textColor = "none"; + } + { + colorizeDistroLogo = false; + colorizeSystemIcon = "none"; + customIconPath = ""; + enableColorization = false; + icon = "noctalia"; + id = "ControlCenter"; + useDistroLogo = false; + } + ]; + }; + screenOverrides = [ ]; + }; + general = { + avatarImage = "/home/${userName}/.face"; + dimmerOpacity = 0.1; + showScreenCorners = false; + forceBlackScreenCorners = false; + scaleRatio = 1.1; + radiusRatio = 1; + iRadiusRatio = 1; + boxRadiusRatio = 1; + screenRadiusRatio = 1; + animationSpeed = 1; + animationDisabled = false; + compactLockScreen = false; + lockScreenAnimations = false; + lockOnSuspend = true; + showSessionButtonsOnLockScreen = true; + showHibernateOnLockScreen = false; + enableShadows = true; + shadowDirection = "bottom_right"; + shadowOffsetX = 2; + shadowOffsetY = 3; + language = ""; + allowPanelsOnScreenWithoutBar = true; + showChangelogOnStartup = true; + telemetryEnabled = false; + enableLockScreenCountdown = true; + lockScreenCountdownDuration = 10000; + autoStartAuth = false; + allowPasswordWithFprintd = false; + clockStyle = "custom"; + clockFormat = "hh\\nmm"; + lockScreenMonitors = [ ]; + lockScreenBlur = 0; + lockScreenTint = 0; + keybinds = { + keyUp = [ "Up" ]; + keyDown = [ "Down" ]; + keyLeft = [ "Left" ]; + keyRight = [ "Right" ]; + keyEnter = [ "Return" ]; + keyEscape = [ "Esc" ]; + }; + }; + ui = { + fontDefault = "Lato"; + fontFixed = "Maple Mono NF"; + fontDefaultScale = 1.25; + fontFixedScale = 1; + tooltipsEnabled = true; + panelBackgroundOpacity = 1.0; + panelsAttachedToBar = true; + settingsPanelMode = "attached"; + wifiDetailsViewMode = "grid"; + bluetoothDetailsViewMode = "grid"; + networkPanelView = "wifi"; + bluetoothHideUnnamedDevices = false; + boxBorderEnabled = false; + }; + location = { + name = "Saratoga Springs, UT"; + weatherEnabled = true; + weatherShowEffects = true; + useFahrenheit = true; + use12hourFormat = true; + showWeekNumberInCalendar = false; + showCalendarEvents = true; + showCalendarWeather = true; + analogClockInCalendar = false; + firstDayOfWeek = -1; + hideWeatherTimezone = false; + hideWeatherCityName = false; + }; + calendar = { + cards = [ + { + enabled = true; + id = "calendar-header-card"; + } + { + enabled = true; + id = "calendar-month-card"; + } + { + enabled = true; + id = "weather-card"; + } + ]; + }; + wallpaper = { + enabled = true; + overviewEnabled = false; + directory = "/home/${userName}/Pictures/Wallpapers"; + monitorDirectories = [ ]; + enableMultiMonitorDirectories = false; + showHiddenFiles = false; + viewMode = "single"; + setWallpaperOnAllMonitors = true; + fillMode = "crop"; + fillColor = "#000000"; + useSolidColor = false; + solidColor = "#1a1a2e"; + automationEnabled = false; + wallpaperChangeMode = "random"; + randomIntervalSec = 300; + transitionDuration = 1500; + transitionType = "random"; + transitionEdgeSmoothness = 0.05; + panelPosition = "follow_bar"; + hideWallpaperFilenames = false; + overviewBlur = 0.4; + overviewTint = 0.6; + useWallhaven = false; + wallhavenQuery = ""; + wallhavenSorting = "relevance"; + wallhavenOrder = "desc"; + wallhavenCategories = "111"; + wallhavenPurity = "100"; + wallhavenRatios = ""; + wallhavenApiKey = ""; + wallhavenResolutionMode = "atleast"; + wallhavenResolutionWidth = ""; + wallhavenResolutionHeight = ""; + sortOrder = "name"; + }; + appLauncher = { + enableClipboardHistory = false; + autoPasteClipboard = false; + enableClipPreview = true; + clipboardWrapText = true; + clipboardWatchTextCommand = "wl-paste --type text --watch cliphist store"; + clipboardWatchImageCommand = "wl-paste --type image --watch cliphist store"; + position = "center"; + pinnedApps = [ ]; + useApp2Unit = false; + sortByMostUsed = true; + terminalCommand = "ghostty -e"; + customLaunchPrefixEnabled = false; + customLaunchPrefix = ""; + viewMode = "list"; + showCategories = true; + iconMode = "tabler"; + showIconBackground = false; + enableSettingsSearch = true; + enableWindowsSearch = true; + ignoreMouseInput = false; + screenshotAnnotationTool = ""; + overviewLayer = false; + density = "default"; + }; + controlCenter = { + position = "close_to_bar_button"; + diskPath = "/"; + shortcuts = { + left = [ + { id = "Network"; } + { id = "Bluetooth"; } + { id = "WallpaperSelector"; } + { id = "NoctaliaPerformance"; } + ]; + 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 = false; + id = "brightness-card"; + } + { + enabled = true; + id = "weather-card"; + } + { + enabled = true; + id = "media-sysmon-card"; + } + ]; + }; + systemMonitor = { + cpuWarningThreshold = 80; + cpuCriticalThreshold = 90; + tempWarningThreshold = 80; + tempCriticalThreshold = 90; + gpuWarningThreshold = 80; + gpuCriticalThreshold = 90; + memWarningThreshold = 80; + memCriticalThreshold = 90; + swapWarningThreshold = 80; + swapCriticalThreshold = 90; + diskWarningThreshold = 80; + diskCriticalThreshold = 90; + diskAvailWarningThreshold = 20; + diskAvailCriticalThreshold = 10; + batteryWarningThreshold = 20; + batteryCriticalThreshold = 5; + cpuPollingInterval = 1000; + gpuPollingInterval = 3000; + enableDgpuMonitoring = false; + memPollingInterval = 1000; + diskPollingInterval = 30000; + networkPollingInterval = 1000; + loadAvgPollingInterval = 3000; + useCustomColors = false; + warningColor = ""; + criticalColor = ""; + externalMonitor = "resources || missioncenter || jdsystemmonitor || corestats || system-monitoring-center || gnome-system-monitor || plasma-systemmonitor || mate-system-monitor || ukui-system-monitor || deepin-system-monitor || pantheon-system-monitor"; + }; + dock = { + enabled = true; + position = "bottom"; + displayMode = "auto_hide"; + backgroundOpacity = 1.0; + floatingRatio = 1; + size = 1; + onlySameOutput = true; + monitors = [ ]; + pinnedApps = [ ]; + colorizeIcons = false; + pinnedStatic = false; + inactiveIndicators = false; + deadOpacity = 0.6; + animationSpeed = 1; + }; + network = { + wifiEnabled = true; + bluetoothRssiPollingEnabled = false; + bluetoothRssiPollIntervalMs = 10000; + wifiDetailsViewMode = "grid"; + bluetoothDetailsViewMode = "grid"; + bluetoothHideUnnamedDevices = false; + }; + sessionMenu = { + enableCountdown = true; + countdownDuration = 10000; + position = "center"; + showHeader = true; + largeButtonsStyle = true; + largeButtonsLayout = "single-row"; + showNumberLabels = true; + powerOptions = [ + { + action = "lock"; + command = ""; + countdownEnabled = true; + enabled = true; + keybind = ""; + } + { + action = "suspend"; + command = ""; + countdownEnabled = true; + enabled = true; + keybind = ""; + } + { + action = "hibernate"; + command = ""; + countdownEnabled = true; + enabled = true; + keybind = ""; + } + { + action = "reboot"; + command = ""; + countdownEnabled = true; + enabled = true; + keybind = ""; + } + { + action = "logout"; + command = ""; + countdownEnabled = true; + enabled = true; + keybind = ""; + } + { + action = "shutdown"; + command = ""; + countdownEnabled = true; + enabled = true; + keybind = ""; + } + ]; + }; + notifications = { + enabled = true; + monitors = [ ]; + location = "top"; + overlayLayer = true; + backgroundOpacity = 1.0; + respectExpireTimeout = false; + lowUrgencyDuration = 3; + normalUrgencyDuration = 8; + criticalUrgencyDuration = 15; + saveToHistory = { + low = true; + normal = true; + critical = true; + }; + sounds = { + enabled = false; + volume = 0.5; + separateSounds = false; + criticalSoundFile = ""; + normalSoundFile = ""; + lowSoundFile = ""; + excludedApps = "discord,firefox,chrome,chromium,edge"; + }; + enableMediaToast = false; + enableKeyboardLayoutToast = true; + enableBatteryToast = true; + }; + osd = { + enabled = true; + location = "bottom"; + autoHideMs = 2000; + overlayLayer = true; + backgroundOpacity = 1.0; + enabledTypes = [ + 0 + 1 + 2 + 3 + ]; + monitors = [ ]; + }; + audio = { + volumeStep = 5; + volumeOverdrive = false; + cavaFrameRate = 30; + visualizerType = "linear"; + mprisBlacklist = [ ]; + preferredPlayer = ""; + volumeFeedback = false; + }; + brightness = { + brightnessStep = 5; + enforceMinimum = true; + enableDdcSupport = false; + }; + colorSchemes = { + useWallpaperColors = false; + predefinedScheme = "Noctalia (default)"; + darkMode = true; + schedulingMode = "off"; + manualSunrise = "06:30"; + manualSunset = "18:30"; + generationMethod = "tonal-spot"; + monitorForColors = ""; + }; + templates = { + activeTemplates = [ ]; + enableUserTheming = false; + }; + nightLight = { + enabled = false; + forced = false; + autoSchedule = true; + nightTemp = "4000"; + dayTemp = "6500"; + manualSunrise = "06:30"; + manualSunset = "18:30"; + }; + hooks = { + enabled = false; + wallpaperChange = ""; + darkModeChange = ""; + screenLock = ""; + screenUnlock = ""; + performanceModeEnabled = ""; + performanceModeDisabled = ""; + startup = ""; + session = ""; + }; + plugins = { + autoUpdate = false; + }; + desktopWidgets = { + enabled = false; + gridSnap = false; + monitorWidgets = [ ]; + }; + }; + }; } diff --git a/jaci/desktop-configuration.nix b/jaci/desktop-configuration.nix index 7f7846e..69be3d3 100644 --- a/jaci/desktop-configuration.nix +++ b/jaci/desktop-configuration.nix @@ -125,23 +125,23 @@ in boot = { plymouth = { enable = true; - theme = "kiki-pixel"; # Options: "kiki" (waifu2x upscaled) or "kiki-pixel" (pixel art) + theme = "kiki-pixel"; # Options: "kiki" or "kiki-pixel" (pixel art) themePackages = [ (pkgs.runCommand "plymouth-kiki-theme" { } '' mkdir -p $out/share/plymouth/themes/kiki cp -r ${./kiki-plymouth-theme/kiki}/* $out/share/plymouth/themes/kiki/ substituteInPlace $out/share/plymouth/themes/kiki/kiki.plymouth \ --replace-fail "@IMAGEDIR@" "$out/share/plymouth/themes/kiki" - substituteInPlace $out/share/plymouth/themes/kiki/kiki.script \ - --replace-fail "@IMAGEDIR@" "$out/share/plymouth/themes/kiki" + # substituteInPlace $out/share/plymouth/themes/kiki/kiki.script \ + # --replace-fail "@IMAGEDIR@" "$out/share/plymouth/themes/kiki" '') (pkgs.runCommand "plymouth-kiki-pixel-theme" { } '' mkdir -p $out/share/plymouth/themes/kiki-pixel cp -r ${./kiki-plymouth-theme/kiki-pixel}/* $out/share/plymouth/themes/kiki-pixel/ substituteInPlace $out/share/plymouth/themes/kiki-pixel/kiki-pixel.plymouth \ --replace-fail "@IMAGEDIR@" "$out/share/plymouth/themes/kiki-pixel" - substituteInPlace $out/share/plymouth/themes/kiki-pixel/kiki-pixel.script \ - --replace-fail "@IMAGEDIR@" "$out/share/plymouth/themes/kiki-pixel" + # substituteInPlace $out/share/plymouth/themes/kiki-pixel/kiki-pixel.script \ + # --replace-fail "@IMAGEDIR@" "$out/share/plymouth/themes/kiki-pixel" '') ]; }; diff --git a/nate-work/modules/home-manager/home.nix b/nate-work/modules/home-manager/home.nix index 2c2f95a..f2c62fb 100644 --- a/nate-work/modules/home-manager/home.nix +++ b/nate-work/modules/home-manager/home.nix @@ -290,7 +290,6 @@ in cat = "bat --paging=never"; ccat = "cat"; catp = "bat --paging=never -p"; - catplain = "bat --paging=never -p"; rm = "rm -i"; }; syntaxHighlighting = {