Compare commits
14 Commits
c90d368432
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 6b8fa60540 | |||
| 86dc80eb3c | |||
| f1bd5146a3 | |||
| 6f35d60aab | |||
| 3d2e74d115 | |||
| 548a438f6a | |||
| 0939766e3a | |||
| f424ab98c7 | |||
| 15a4d8d5e8 | |||
| 5f7e9cada5 | |||
| c4a0eb0a98 | |||
| 103a485bf8 | |||
| 13f35677be | |||
| 579a120326 |
+14
-4
@@ -17,16 +17,26 @@ How to work on it: [conventions.md](./conventions.md).
|
||||
|
||||
Each machine: `modules/hosts/<name>/default.nix` → `nixosConfigurations.<name>`, real config in `*Configuration` + optional `_private/` and `_services/`.
|
||||
|
||||
## Features at a glance
|
||||
|
||||
- **Users catalog** — one catalog in `modules/system/users.nix`, pick who exists on a host with `chiasson.users.enabled = [ "example" ]`, override per host. Home Manager wires itself from the same list.
|
||||
- **SSH + Bitwarden (rbw) keys** — one ed25519 keypair per catalog user, private key in Bitwarden, public key in `modules/ssh/inventory.nix`. Outbound SSH uses a `.pub` filter against the rbw agent; inbound `authorized_keys` are generated from the same inventory. [Full wiring in conventions.md](./conventions.md#ssh-model).
|
||||
- **Wisdom modules** — Home Manager slices in `modules/wisdom/` auto-catalog via `lib.wisdomCatalogExtraModules` (defined in `modules/desktop/options.nix`). The baseline `wisdom` module handles git identity + shared tools; all other `wisdom*` exports are pulled in once per user through `desktopHomeBase` → `chiasson.users.extraModules.olivier`. Hosts only flip `chiasson.home.<category>.<slice>.enable` — no manual imports in `home.nix`. Categories include `apps` (spotify, discord, localsend), `browsers` (chrome, edge, zen, …), `editors` (cursor, vscode, obsidian, …), `shells` (bash, fish, oh-my-posh, yazi), `desktop` (gtk-qt-theming, screenshot), and `terminals` (kitty). Trivial single-package slices can be written with the `lib.wisdomSlice` helper instead of repeating the `root`/`cfg` + `mkIf` boilerplate.
|
||||
- **Wallpapers from a dedicated repo** — `modules/desktop/wallpapers.nix` pins `inputs.wallpapers` into the store and exposes it as `CHIASSON_NIX_WALLPAPERS` and `/etc/wallpapers`. Override `chiasson.desktop.wallpapers.source` if needed.
|
||||
- **Private host data** — import-tree skips `_private/` globally, so machine-only files (firmware quirks, display configs, service tweaks) live next to the host module without leaking elsewhere.
|
||||
|
||||
## Deploy / rebuild
|
||||
|
||||
Remote builds use the `builder` user (`systemDeployBuilder`, wired through `client-services` on desktops).
|
||||
Remote builds use the `builder` user (`systemDeployBuilder`, wired through `client-services` on desktops/laptops/tablets).
|
||||
|
||||
Fleet deploy is [Navi](https://github.com/cafkafk/navi) — config in `modules/deploy/navi.nix`, outputs `flake.navi` / `flake.naviHive`.
|
||||
|
||||
```bash
|
||||
nix develop # devShell has navi + hints
|
||||
nix develop # devShell has navi + just + hints
|
||||
just # list local helpers like `sync-dms`
|
||||
navi apply --on <host>
|
||||
navi apply-local --node 14900k --sudo # this machine, if hostname matches
|
||||
navi tui # interactive fleet dashboard
|
||||
```
|
||||
|
||||
Plain rebuild still works: `sudo nixos-rebuild switch --flake .#<host>`.
|
||||
@@ -37,11 +47,11 @@ Plain rebuild still works: `sudo nixos-rebuild switch --flake .#<host>`.
|
||||
modules/
|
||||
hosts/<host>/ # per-machine composition
|
||||
system/ # nixosModules.system aggregate
|
||||
desktop/ # GUI stack
|
||||
desktop/ # GUI stack (niri, hyprland, plasma, DMS)
|
||||
wisdom/ # HM modules (exports still named wisdom*)
|
||||
ssh/ # inbound NixOS + outbound HM
|
||||
deploy/ # navi hive
|
||||
lib/ # pure helpers → flake.lib
|
||||
patches/ # one-off patches (yt-dlp, t2fanrd, …)
|
||||
```
|
||||
|
||||
Machine-only stuff lives in `hosts/<host>/_private/` — import-tree skips `_private/` globally, so those files only get pulled in where you import them.
|
||||
|
||||
+3
-1
@@ -172,7 +172,9 @@ The integration block at the bottom of `modules/system/users.nix` turns the cata
|
||||
|
||||
**New NixOS leaf:** export `flake.nixosModules.whatever`, wire from `system/default.nix` or `desktop/default.nix` if it's global, or only from a host `configuration.nix` if it's not. `nix flake check`. Git-add new paths if eval uses the git tree.
|
||||
|
||||
**New HM slice:** add `modules/wisdom/.../foo.nix` exporting `flake.homeManagerModules.wisdomFoo` (import-tree picks it up; `wisdomCatalogExtraModules` includes every `wisdom*` export except `wisdom` / `wisdomShellBash`). Gate packages on `chiasson.home.*.enable`, set `mkDefault true` in `desktop-home-base.nix` if shared, or `enable = true` in a host `home.nix`. Upstream HM deps stay imported unconditionally — use `mkIf` on `cfg.enable` for config (never `config`-dependent `imports`; that recurses).
|
||||
**New HM slice:** add `modules/wisdom/.../foo.nix` exporting `flake.homeManagerModules.wisdomFoo` (import-tree picks it up; `wisdomCatalogExtraModules` includes every `wisdom*` export). Every `wisdom*` slice auto-catalogs — including the bash shell — so the root module no longer manually `imports` it. Gate packages on `chiasson.home.*.enable`, and set the slice's own `enable` default with `mkEnableOption "…" // { default = true/false }` in that same module — defaults live with the option that owns them, not in a shared defaults file. Hosts flip toggles in `home.nix`. Upstream HM deps stay imported unconditionally — use `mkIf` on `cfg.enable` for config (never `config`-dependent `imports`; that recurses).
|
||||
|
||||
**Trivial single-package slice:** use `self.lib.wisdomSlice { path = "a.b"; default = true/false; description = "…"; packages = pkgs: [ … ]; }` instead of the `root`/`cfg` + `mkIf (root.enable && cfg.enable)` boilerplate. `packages` is a `pkgs -> [ drv ]` function responsible for its own `availableOn`/platform gating. Several such slices may share one `simple.nix` in their category dir (each still exporting its own `wisdom*` module), rather than one file per slice.
|
||||
|
||||
**Derivations:** `let` inside a fragment, or `flake.packages` / `flake.lib` — not a bare `mkDerivation` file import-tree will try to load.
|
||||
|
||||
|
||||
@@ -1,19 +1,38 @@
|
||||
{ lib, ... }: {
|
||||
# Resolve `wisdom*` HM slices for NixOS `extraModules` (`self` is not an HM specialArg).
|
||||
# Slices are gated by `chiasson.home.*.enable`; hosts only flip toggles in `home.nix`.
|
||||
# Lives here (not `modules/lib/`) because `hosts/desktop-home-base.nix` consumes it and
|
||||
# fragment eval order requires the definition to sort before `hosts/`.
|
||||
{ lib, ... }:
|
||||
{
|
||||
flake.lib.wisdomCatalogExtraModules =
|
||||
self:
|
||||
let
|
||||
names = lib.sort builtins.lessThan (
|
||||
lib.filter (n: lib.hasPrefix "wisdom" n && n != "wisdom" && n != "wisdomShellBash") (
|
||||
lib.filter (n: lib.hasPrefix "wisdom" n && n != "wisdom") (
|
||||
builtins.attrNames self.homeManagerModules
|
||||
)
|
||||
);
|
||||
in
|
||||
map (name: self.homeManagerModules.${name}) names;
|
||||
|
||||
flake.lib.wisdomSlice =
|
||||
{ path, default, description, packages }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
segs = lib.splitString "." path;
|
||||
optPath = [
|
||||
"chiasson"
|
||||
"home"
|
||||
]
|
||||
++ segs
|
||||
++ [ "enable" ];
|
||||
root = config.chiasson.home;
|
||||
cfg = lib.getAttrFromPath segs root;
|
||||
enabled = lib.getAttrFromPath optPath config;
|
||||
in
|
||||
{
|
||||
options = lib.setAttrByPath optPath (lib.mkEnableOption description // { inherit default; });
|
||||
config = lib.mkIf (root.enable && enabled) {
|
||||
home.packages = lib.filter (lib.meta.availableOn pkgs.stdenv.hostPlatform) (packages pkgs);
|
||||
};
|
||||
};
|
||||
|
||||
flake.nixosModules.desktopOptions =
|
||||
{ config, options, lib, pkgs, self, inputs, ... }:
|
||||
let
|
||||
|
||||
@@ -1,25 +1,15 @@
|
||||
# Monitor layout for 14900k.
|
||||
# NVIDIA (default): DP-3 ultrawide, HDMI-A-3 + DP-4 side/top stack; DP-2 virtual 4K when streamingDisplay enabled.
|
||||
# Intel iGPU (gpu passthru): DP-1 ultrawide, HDMI-A-2 Samsung to the left.
|
||||
# Niri: `extraSettings` (KDL via `extraConfig`, other wrapper-modules keys) + `extraBinds` (merged keybinds).
|
||||
# Hyprland: `chiasson.desktop.hyprland.settings` (merged in HM when `chiasson.desktop.hyprland.enable`).
|
||||
# NVIDIA (default): DP-3 ultrawide, HDMI-A-3 + DP-4 stack; DP-2 virtual 4K when streamingDisplay is on.
|
||||
# Intel iGPU (gpu passthru): DP-1 ultrawide, HDMI-A-2 to the left.
|
||||
# Niri uses `extraSettings.extraConfig`; Hyprland uses `chiasson.desktop.hyprland.settings`.
|
||||
|
||||
#TODO[epic=Moderate] Clean this up, move to host's configuration.nix.
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
streamingDisplay = config.chiasson.system.streamingDisplay;
|
||||
gpuPassthru = config.chiasson.system.gpuPassthru.enable;
|
||||
streamingDisplay = config.chiasson.system.streamingDisplay.enable or false;
|
||||
streamingCfg = config.chiasson.system.streamingDisplay or { };
|
||||
|
||||
virtualOutputNiri =
|
||||
lib.optionalString streamingDisplay ''
|
||||
output "${streamingCfg.connector}" {
|
||||
mode "${streamingCfg.mode}"
|
||||
scale ${toString (streamingCfg.niriScale or 1.0)}
|
||||
position ${streamingCfg.niriPosition}
|
||||
}
|
||||
'';
|
||||
|
||||
# Niri outputs: a static block per GPU layout, plus the optional virtual 4K panel.
|
||||
niriOutputs =
|
||||
(if gpuPassthru then
|
||||
''
|
||||
@@ -54,48 +44,30 @@ let
|
||||
position x=0 y=-1080
|
||||
}
|
||||
'')
|
||||
+ virtualOutputNiri;
|
||||
|
||||
virtualOutputHyprland =
|
||||
lib.optionalString streamingDisplay
|
||||
"${streamingCfg.connector}, ${streamingCfg.mode}, 7680x0, ${toString (streamingCfg.niriScale or 1.0)}";
|
||||
+ lib.optionalString streamingDisplay.enable ''
|
||||
output "${streamingDisplay.connector}" {
|
||||
mode "${streamingDisplay.mode}"
|
||||
scale ${toString streamingDisplay.niriScale}
|
||||
position ${streamingDisplay.niriPosition}
|
||||
}
|
||||
'';
|
||||
|
||||
# Hyprland monitor strings, with the virtual panel appended when enabled.
|
||||
hyprlandMonitors =
|
||||
(if gpuPassthru then
|
||||
[
|
||||
"DP-1, 2560x1080@144, 0x0, 1"
|
||||
"HDMI-A-2, 1920x1080@60, -1920x0, 1"
|
||||
]
|
||||
[ "DP-1, 2560x1080@144, 0x0, 1" "HDMI-A-2, 1920x1080@60, -1920x0, 1" ]
|
||||
else
|
||||
[
|
||||
"DP-3, 2560x1080@144, 0x0, 1"
|
||||
"DP-4, 1920x1080@144, 0x-1080, 1"
|
||||
"HDMI-A-3, 1920x1080@60, -1920x0, 1"
|
||||
])
|
||||
++ lib.optional streamingDisplay virtualOutputHyprland;
|
||||
[ "DP-3, 2560x1080@144, 0x0, 1" "DP-4, 1920x1080@144, 0x-1080, 1" "HDMI-A-3, 1920x1080@60, -1920x0, 1" ])
|
||||
++ lib.optional streamingDisplay.enable "${streamingDisplay.connector}, ${streamingDisplay.mode}, 7680x0, ${toString streamingDisplay.niriScale}";
|
||||
|
||||
hyprlandWorkspaces =
|
||||
if gpuPassthru then
|
||||
[
|
||||
"1, monitor:DP-1, default:true"
|
||||
"2, monitor:DP-1"
|
||||
"3, monitor:DP-1"
|
||||
"4, monitor:HDMI-A-2, default:true"
|
||||
"5, monitor:HDMI-A-2"
|
||||
"6, monitor:HDMI-A-2"
|
||||
]
|
||||
[ "1, monitor:DP-1, default:true" "2, monitor:DP-1" "3, monitor:DP-1"
|
||||
"4, monitor:HDMI-A-2, default:true" "5, monitor:HDMI-A-2" "6, monitor:HDMI-A-2" ]
|
||||
else
|
||||
[
|
||||
"1, monitor:DP-3, default:true"
|
||||
"2, monitor:DP-3"
|
||||
"3, monitor:DP-3"
|
||||
"4, monitor:HDMI-A-3, default:true"
|
||||
"5, monitor:HDMI-A-3"
|
||||
"6, monitor:HDMI-A-3"
|
||||
"7, monitor:DP-4"
|
||||
"8, monitor:DP-4"
|
||||
"9, monitor:DP-4"
|
||||
];
|
||||
[ "1, monitor:DP-3, default:true" "2, monitor:DP-3" "3, monitor:DP-3"
|
||||
"4, monitor:HDMI-A-3, default:true" "5, monitor:HDMI-A-3" "6, monitor:HDMI-A-3"
|
||||
"7, monitor:DP-4" "8, monitor:DP-4" "9, monitor:DP-4" ];
|
||||
in
|
||||
{
|
||||
chiasson.desktop.niri.extraSettings = {
|
||||
@@ -103,10 +75,7 @@ in
|
||||
};
|
||||
|
||||
chiasson.desktop.niri.extraBinds."XF86Tools".spawn = [
|
||||
"wpctl"
|
||||
"set-mute"
|
||||
"@DEFAULT_AUDIO_SOURCE@"
|
||||
"toggle"
|
||||
"wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"
|
||||
];
|
||||
|
||||
chiasson.desktop.hyprland.settings = lib.mkIf config.chiasson.desktop.hyprland.enable {
|
||||
|
||||
@@ -39,7 +39,8 @@
|
||||
"hassUrl": "https://home.chiasson.cloud/",
|
||||
"hassTokenPath": "/run/secrets/home-assistant/auth-token",
|
||||
"showButtonsOnStatusBar": true,
|
||||
"showAttributes": false
|
||||
"showAttributes": false,
|
||||
"haRefreshCounter": 1
|
||||
},
|
||||
"unifiedTaskbar": {
|
||||
"enabled": true,
|
||||
|
||||
@@ -4,11 +4,14 @@
|
||||
"customThemeFile": "",
|
||||
"registryThemeVariants": {},
|
||||
"matugenScheme": "scheme-tonal-spot",
|
||||
"matugenContrast": 0,
|
||||
"runUserMatugenTemplates": true,
|
||||
"matugenTargetMonitor": "",
|
||||
"popupTransparency": 1,
|
||||
"dockTransparency": 1,
|
||||
"widgetBackgroundColor": "sch",
|
||||
"widgetBackgroundCustomColor": "#6750A4",
|
||||
"widgetBackgroundCustomStrength": 0.5,
|
||||
"widgetColorMode": "default",
|
||||
"controlCenterTileColorMode": "primary",
|
||||
"buttonColorMode": "primary",
|
||||
@@ -17,11 +20,18 @@
|
||||
"niriLayoutRadiusOverride": -1,
|
||||
"niriLayoutBorderSize": -1,
|
||||
"hyprlandLayoutGapsOverride": -1,
|
||||
"hyprlandLayoutGapsOutOverride": -1,
|
||||
"hyprlandLayoutRadiusOverride": -1,
|
||||
"hyprlandLayoutBorderSize": -1,
|
||||
"hyprlandResizeOnBorder": false,
|
||||
"mangoLayoutGapsOverride": -1,
|
||||
"mangoLayoutGapsOutOverride": -1,
|
||||
"mangoLayoutRadiusOverride": -1,
|
||||
"mangoLayoutBorderSize": -1,
|
||||
"mangoTrackpadNaturalScrolling": true,
|
||||
"firstDayOfWeek": -1,
|
||||
"showWeekNumber": false,
|
||||
"calendarBackend": "auto",
|
||||
"use24HourClock": false,
|
||||
"showSeconds": true,
|
||||
"padHours12Hour": false,
|
||||
@@ -36,6 +46,17 @@
|
||||
"modalAnimationSpeed": 1,
|
||||
"modalCustomAnimationDuration": 150,
|
||||
"enableRippleEffects": true,
|
||||
"animationVariant": 0,
|
||||
"motionEffect": 0,
|
||||
"m3ElevationEnabled": true,
|
||||
"m3ElevationIntensity": 12,
|
||||
"m3ElevationOpacity": 30,
|
||||
"m3ElevationColorMode": "default",
|
||||
"m3ElevationLightDirection": "top",
|
||||
"m3ElevationCustomColor": "#000000",
|
||||
"modalElevationEnabled": true,
|
||||
"popoutElevationEnabled": true,
|
||||
"barElevationEnabled": false,
|
||||
"blurEnabled": false,
|
||||
"blurForegroundLayers": true,
|
||||
"blurLayerOutlineOpacity": 0.12,
|
||||
@@ -45,6 +66,8 @@
|
||||
"wallpaperFillMode": "Fill",
|
||||
"blurredWallpaperLayer": false,
|
||||
"blurWallpaperOnOverview": false,
|
||||
"wallpaperBackgroundColorMode": "black",
|
||||
"wallpaperBackgroundCustomColor": "#000000",
|
||||
"showLauncherButton": true,
|
||||
"showWorkspaceSwitcher": true,
|
||||
"showFocusedWindow": true,
|
||||
@@ -64,6 +87,12 @@
|
||||
"showClock": true,
|
||||
"showNotificationButton": true,
|
||||
"showBattery": true,
|
||||
"showBatteryPercent": true,
|
||||
"showBatteryPercentOnlyOnBattery": false,
|
||||
"showBatteryTime": false,
|
||||
"showBatteryTimeOnlyOnBattery": false,
|
||||
"batteryPillStyle": false,
|
||||
"batteryPillPercentSign": false,
|
||||
"showControlCenterButton": true,
|
||||
"showCapsLockIndicator": true,
|
||||
"controlCenterShowNetworkIcon": true,
|
||||
@@ -78,6 +107,8 @@
|
||||
"controlCenterShowBatteryIcon": false,
|
||||
"controlCenterShowPrinterIcon": false,
|
||||
"controlCenterShowScreenSharingIcon": true,
|
||||
"controlCenterShowIdleInhibitorIcon": false,
|
||||
"controlCenterShowDoNotDisturbIcon": false,
|
||||
"showPrivacyButton": true,
|
||||
"privacyShowMicIcon": false,
|
||||
"privacyShowCameraIcon": false,
|
||||
@@ -133,29 +164,57 @@
|
||||
"maxWorkspaceIcons": 9,
|
||||
"workspaceAppIconSizeOffset": 1,
|
||||
"groupWorkspaceApps": true,
|
||||
"groupActiveWorkspaceApps": false,
|
||||
"workspaceFollowFocus": false,
|
||||
"showOccupiedWorkspacesOnly": true,
|
||||
"reverseScrolling": false,
|
||||
"dwlShowAllTags": false,
|
||||
"workspaceActiveAppHighlightEnabled": false,
|
||||
"workspaceColorMode": "default",
|
||||
"workspaceFocusedCustomColor": "#6750A4",
|
||||
"workspaceOccupiedColorMode": "none",
|
||||
"workspaceOccupiedCustomColor": "#625B71",
|
||||
"workspaceUnfocusedColorMode": "default",
|
||||
"workspaceUnfocusedCustomColor": "#49454E",
|
||||
"workspaceUrgentColorMode": "default",
|
||||
"workspaceUrgentCustomColor": "#B3261E",
|
||||
"workspaceFocusedBorderEnabled": false,
|
||||
"workspaceFocusedBorderColor": "primary",
|
||||
"workspaceFocusedBorderCustomColor": "#6750A4",
|
||||
"workspaceFocusedBorderThickness": 2,
|
||||
"workspaceUnfocusedMonitorSeparateAppearance": false,
|
||||
"workspaceUnfocusedMonitorColorMode": "default",
|
||||
"workspaceUnfocusedMonitorFocusedCustomColor": "#6750A4",
|
||||
"workspaceUnfocusedMonitorOccupiedColorMode": "none",
|
||||
"workspaceUnfocusedMonitorOccupiedCustomColor": "#625B71",
|
||||
"workspaceUnfocusedMonitorUnfocusedColorMode": "default",
|
||||
"workspaceUnfocusedMonitorUnfocusedCustomColor": "#49454E",
|
||||
"workspaceUnfocusedMonitorUrgentColorMode": "default",
|
||||
"workspaceUnfocusedMonitorUrgentCustomColor": "#B3261E",
|
||||
"workspaceUnfocusedMonitorBorderEnabled": false,
|
||||
"workspaceUnfocusedMonitorBorderColor": "primary",
|
||||
"workspaceUnfocusedMonitorBorderCustomColor": "#6750A4",
|
||||
"workspaceUnfocusedMonitorBorderThickness": 2,
|
||||
"workspaceNameIcons": {},
|
||||
"waveProgressEnabled": true,
|
||||
"scrollTitleEnabled": true,
|
||||
"mediaAdaptiveWidthEnabled": true,
|
||||
"audioVisualizerEnabled": true,
|
||||
"audioScrollMode": "volume",
|
||||
"audioWheelScrollAmount": 5,
|
||||
"audioDeviceScrollVolumeEnabled": false,
|
||||
"mediaExcludePlayers": [],
|
||||
"clockCompactMode": false,
|
||||
"focusedWindowCompactMode": false,
|
||||
"focusedWindowSize": 1,
|
||||
"focusedWindowShowIcon": true,
|
||||
"runningAppsCompactMode": true,
|
||||
"barMaxVisibleApps": 0,
|
||||
"barMaxVisibleRunningApps": 0,
|
||||
"barShowOverflowBadge": true,
|
||||
"trayAutoOverflow": true,
|
||||
"trayPopupSingleLine": true,
|
||||
"trayMaxVisibleItems": 0,
|
||||
"appsDockHideIndicators": false,
|
||||
"appsDockColorizeActive": false,
|
||||
"appsDockActiveColorMode": "primary",
|
||||
@@ -163,6 +222,7 @@
|
||||
"appsDockEnlargePercentage": 125,
|
||||
"appsDockIconSizePercentage": 100,
|
||||
"keyboardLayoutNameCompactMode": false,
|
||||
"keyboardLayoutNameShowIcon": false,
|
||||
"runningAppsCurrentWorkspace": true,
|
||||
"runningAppsGroupByApp": false,
|
||||
"runningAppsCurrentMonitor": false,
|
||||
@@ -198,9 +258,18 @@
|
||||
"lockDateFormat": "dddd, MMMM d",
|
||||
"greeterRememberLastSession": true,
|
||||
"greeterRememberLastUser": true,
|
||||
"greeterAutoLogin": false,
|
||||
"greeterEnableFprint": false,
|
||||
"greeterEnableU2f": false,
|
||||
"greeterWallpaperPath": "",
|
||||
"greeterUse24HourClock": true,
|
||||
"greeterShowSeconds": false,
|
||||
"greeterPadHours12Hour": false,
|
||||
"greeterLockDateFormat": "",
|
||||
"greeterFontFamily": "",
|
||||
"greeterWallpaperFillMode": "",
|
||||
"greeterSyncPending": false,
|
||||
"greeterSyncBaseline": {},
|
||||
"mediaSize": 1,
|
||||
"appLauncherViewMode": "list",
|
||||
"spotlightModalViewMode": "list",
|
||||
@@ -211,19 +280,53 @@
|
||||
"sortAppsAlphabetically": false,
|
||||
"appLauncherGridColumns": 4,
|
||||
"spotlightCloseNiriOverview": true,
|
||||
"rememberLastQuery": false,
|
||||
"rememberLastMode": true,
|
||||
"spotlightSectionViewModes": {},
|
||||
"appDrawerSectionViewModes": {},
|
||||
"niriOverviewOverlayEnabled": true,
|
||||
"dankLauncherV2Size": "compact",
|
||||
"dankLauncherV2Size": "medium",
|
||||
"dankLauncherV2ShowSourceBadges": true,
|
||||
"dankLauncherV2BorderEnabled": false,
|
||||
"dankLauncherV2BorderThickness": 2,
|
||||
"dankLauncherV2BorderColor": "primary",
|
||||
"dankLauncherV2ShowFooter": true,
|
||||
"dankLauncherV2UnloadOnClose": false,
|
||||
"dankLauncherV2UnloadOnClose": true,
|
||||
"dankLauncherV2IncludeFilesInAll": false,
|
||||
"dankLauncherV2IncludeFoldersInAll": false,
|
||||
"launcherUseOverlayLayer": false,
|
||||
"launcherStyle": "spotlight",
|
||||
"spotlightBarShowModeChips": true,
|
||||
"keybindsFloatingWindow": false,
|
||||
"useAutoLocation": false,
|
||||
"weatherEnabled": true,
|
||||
"networkPreference": "auto",
|
||||
"iconTheme": "WhiteSur-dark",
|
||||
"dashTabs": [
|
||||
{
|
||||
"id": "overview",
|
||||
"enabled": true
|
||||
},
|
||||
{
|
||||
"id": "media",
|
||||
"enabled": true
|
||||
},
|
||||
{
|
||||
"id": "wallpaper",
|
||||
"enabled": true
|
||||
},
|
||||
{
|
||||
"id": "weather",
|
||||
"enabled": true
|
||||
},
|
||||
{
|
||||
"id": "settings",
|
||||
"enabled": true
|
||||
}
|
||||
],
|
||||
"networkPreference": "ethernet",
|
||||
"iconThemeDark": "System Default",
|
||||
"iconThemeLight": "System Default",
|
||||
"iconThemePerMode": false,
|
||||
"lastAppliedIconTheme": "",
|
||||
"cursorSettings": {
|
||||
"theme": "System Default",
|
||||
"size": 24,
|
||||
@@ -240,9 +343,9 @@
|
||||
"cursorHideTimeout": 0
|
||||
}
|
||||
},
|
||||
"launcherLogoMode": "apps",
|
||||
"launcherLogoMode": "os",
|
||||
"launcherLogoCustomPath": "",
|
||||
"launcherLogoColorOverride": "",
|
||||
"launcherLogoColorOverride": "primary",
|
||||
"launcherLogoColorInvertOnMode": false,
|
||||
"launcherLogoBrightness": 0.5,
|
||||
"launcherLogoContrast": 1,
|
||||
@@ -251,28 +354,50 @@
|
||||
"monoFontFamily": "Fira Code",
|
||||
"fontWeight": 400,
|
||||
"fontScale": 1,
|
||||
"textRenderType": 0,
|
||||
"textRenderQuality": 0,
|
||||
"notepadUseMonospace": true,
|
||||
"notepadFontFamily": "",
|
||||
"notepadFontSize": 14,
|
||||
"notificationSummaryFontSize": 0,
|
||||
"notificationBodyFontSize": 0,
|
||||
"notepadShowLineNumbers": false,
|
||||
"notepadAutoSave": false,
|
||||
"notepadSlideoutSide": "right",
|
||||
"notepadDefaultMode": "slideout",
|
||||
"notepadTransparencyOverride": -1,
|
||||
"notepadLastCustomTransparency": 0.7,
|
||||
"notepadUseCompositorGap": false,
|
||||
"notepadEdgeGap": 0,
|
||||
"soundsEnabled": true,
|
||||
"useSystemSoundTheme": false,
|
||||
"soundLogin": false,
|
||||
"soundNewNotification": true,
|
||||
"soundVolumeChanged": true,
|
||||
"soundPluggedIn": true,
|
||||
"muteSoundsWhenMediaPlaying": true,
|
||||
"acMonitorTimeout": 0,
|
||||
"acLockTimeout": 0,
|
||||
"acSuspendTimeout": 0,
|
||||
"acSuspendBehavior": 0,
|
||||
"acProfileName": "",
|
||||
"acPostLockMonitorTimeout": 0,
|
||||
"batteryMonitorTimeout": 0,
|
||||
"batteryLockTimeout": 0,
|
||||
"batterySuspendTimeout": 0,
|
||||
"batterySuspendBehavior": 0,
|
||||
"batteryProfileName": "",
|
||||
"batteryPostLockMonitorTimeout": 0,
|
||||
"batteryChargeLimit": 100,
|
||||
"batteryNotifyChargeLimit": false,
|
||||
"batteryCriticalThreshold": 10,
|
||||
"batteryNotifyCritical": true,
|
||||
"batteryLowThreshold": 20,
|
||||
"batteryNotifyLow": false,
|
||||
"batteryChargeLimitNotificationType": 0,
|
||||
"batteryLowNotificationType": 0,
|
||||
"batteryCriticalNotificationType": 1,
|
||||
"batteryAutoPowerSaver": false,
|
||||
"lockBeforeSuspend": false,
|
||||
"loginctlLockIntegration": true,
|
||||
"fadeToLockEnabled": true,
|
||||
@@ -304,6 +429,7 @@
|
||||
"matugenTemplatePywalfox": true,
|
||||
"matugenTemplateZenBrowser": true,
|
||||
"matugenTemplateVesktop": false,
|
||||
"matugenTemplateVencord": true,
|
||||
"matugenTemplateEquibop": true,
|
||||
"matugenTemplateGhostty": true,
|
||||
"matugenTemplateKitty": true,
|
||||
@@ -316,10 +442,23 @@
|
||||
"matugenTemplateVscode": true,
|
||||
"matugenTemplateEmacs": true,
|
||||
"matugenTemplateZed": true,
|
||||
"matugenTemplateNeovimSettings": {
|
||||
"dark": {
|
||||
"baseTheme": "github_dark",
|
||||
"harmony": 0.5
|
||||
},
|
||||
"light": {
|
||||
"baseTheme": "github_light",
|
||||
"harmony": 0.5
|
||||
}
|
||||
},
|
||||
"matugenTemplateNeovimSetBackground": true,
|
||||
"showDock": false,
|
||||
"dockAutoHide": false,
|
||||
"dockSmartAutoHide": false,
|
||||
"dockUseOverlayLayer": false,
|
||||
"dockGroupByApp": false,
|
||||
"dockRestoreSpecialWorkspaceOnClick": false,
|
||||
"dockOpenOnOverview": false,
|
||||
"dockPosition": 1,
|
||||
"dockSpacing": 4,
|
||||
@@ -342,6 +481,9 @@
|
||||
"dockMaxVisibleApps": 0,
|
||||
"dockMaxVisibleRunningApps": 0,
|
||||
"dockShowOverflowBadge": true,
|
||||
"dockShowTrash": false,
|
||||
"dockTrashFileManager": "default",
|
||||
"dockTrashCustomCommand": "",
|
||||
"notificationOverlayEnabled": false,
|
||||
"notificationPopupShadowEnabled": true,
|
||||
"notificationPopupPrivacyMode": false,
|
||||
@@ -359,14 +501,21 @@
|
||||
"maxFprintTries": 15,
|
||||
"enableU2f": false,
|
||||
"u2fMode": "or",
|
||||
"lockScreenActiveMonitor": "all",
|
||||
"lockScreenInactiveColor": "#000000",
|
||||
"lockScreenNotificationMode": 0,
|
||||
"lockScreenVideoEnabled": false,
|
||||
"lockScreenVideoPath": "",
|
||||
"lockScreenVideoCycling": false,
|
||||
"lockScreenWallpaperPath": "",
|
||||
"lockScreenWallpaperFillMode": "",
|
||||
"lockScreenFontFamily": "",
|
||||
"hideBrightnessSlider": false,
|
||||
"notificationTimeoutLow": 5000,
|
||||
"notificationTimeoutNormal": 5000,
|
||||
"notificationTimeoutCritical": 0,
|
||||
"notificationCompactMode": false,
|
||||
"notificationShowTimeoutBar": false,
|
||||
"notificationDedupeEnabled": true,
|
||||
"notificationPopupPosition": 0,
|
||||
"notificationAnimationSpeed": 1,
|
||||
"notificationCustomAnimationDuration": 400,
|
||||
@@ -377,6 +526,7 @@
|
||||
"notificationHistorySaveNormal": true,
|
||||
"notificationHistorySaveCritical": true,
|
||||
"notificationRules": [],
|
||||
"notificationFocusedMonitor": false,
|
||||
"osdAlwaysShowValue": false,
|
||||
"osdPosition": 5,
|
||||
"osdVolumeEnabled": true,
|
||||
@@ -407,9 +557,13 @@
|
||||
"customPowerActionReboot": "",
|
||||
"customPowerActionPowerOff": "",
|
||||
"updaterHideWidget": false,
|
||||
"updaterCheckOnStart": false,
|
||||
"updaterUseCustomCommand": false,
|
||||
"updaterCustomCommand": "",
|
||||
"updaterTerminalAdditionalParams": "",
|
||||
"updaterIntervalSeconds": 1800,
|
||||
"updaterIncludeFlatpak": true,
|
||||
"updaterAllowAUR": true,
|
||||
"displayNameMode": "system",
|
||||
"screenPreferences": {},
|
||||
"showOnLastDisplay": {},
|
||||
@@ -420,6 +574,7 @@
|
||||
"displayProfileAutoSelect": false,
|
||||
"displayShowDisconnected": false,
|
||||
"displaySnapToEdge": true,
|
||||
"connectedFrameBarStyleBackups": {},
|
||||
"barConfigs": [
|
||||
{
|
||||
"bottomGap": 0,
|
||||
@@ -486,10 +641,6 @@
|
||||
{
|
||||
"name": "DP-3",
|
||||
"model": "34GL750"
|
||||
},
|
||||
{
|
||||
"name": "Virtual-1",
|
||||
"model": "Virtual-1"
|
||||
}
|
||||
],
|
||||
"showOnLastDisplay": false,
|
||||
@@ -517,7 +668,7 @@
|
||||
"id": "gpuTemp",
|
||||
"enabled": true,
|
||||
"selectedGpuIndex": 0,
|
||||
"pciId": "",
|
||||
"pciId": "10de:1f07",
|
||||
"minimumWidth": true
|
||||
},
|
||||
{
|
||||
@@ -685,6 +836,14 @@
|
||||
"desktopWidgetPositions": {},
|
||||
"desktopWidgetGridSettings": {
|
||||
"DP-3": {
|
||||
"enabled": true,
|
||||
"size": 40
|
||||
},
|
||||
"HDMI-A-3": {
|
||||
"enabled": true,
|
||||
"size": 50
|
||||
},
|
||||
"DP-4": {
|
||||
"enabled": true,
|
||||
"size": 50
|
||||
}
|
||||
@@ -696,7 +855,7 @@
|
||||
"name": "Desktop Clock",
|
||||
"enabled": true,
|
||||
"config": {
|
||||
"style": "analog",
|
||||
"style": "digital",
|
||||
"transparency": 0.8,
|
||||
"colorMode": "primary",
|
||||
"customColor": "#ffffff",
|
||||
@@ -704,347 +863,48 @@
|
||||
"showAnalogNumbers": false,
|
||||
"showAnalogSeconds": true,
|
||||
"displayPreferences": [
|
||||
"all"
|
||||
]
|
||||
},
|
||||
"positions": {
|
||||
"DP-3": {
|
||||
"width": 300,
|
||||
"height": 300,
|
||||
"x": 1550,
|
||||
"y": 50
|
||||
},
|
||||
"DP-4": {
|
||||
"width": 200,
|
||||
"height": 200,
|
||||
"x": 860,
|
||||
"y": 440
|
||||
},
|
||||
"HDMI-A-3": {
|
||||
"width": 200,
|
||||
"height": 200,
|
||||
"x": 1708.3671875,
|
||||
"y": 4.84765625
|
||||
}
|
||||
}
|
||||
{
|
||||
"name": "DP-2",
|
||||
"model": "SUN-4K"
|
||||
},
|
||||
{
|
||||
"id": "dw_1782021988600_vdg97np4g",
|
||||
"widgetType": "systemMonitor",
|
||||
"name": "System Monitor",
|
||||
"enabled": true,
|
||||
"config": {
|
||||
"showHeader": true,
|
||||
"transparency": 0.8,
|
||||
"colorMode": "primary",
|
||||
"customColor": "#ffffff",
|
||||
"showCpu": true,
|
||||
"showCpuGraph": true,
|
||||
"showCpuTemp": true,
|
||||
"showGpuTemp": false,
|
||||
"gpuPciId": "",
|
||||
"showMemory": true,
|
||||
"showMemoryGraph": true,
|
||||
"showNetwork": true,
|
||||
"showNetworkGraph": true,
|
||||
"showDisk": true,
|
||||
"showTopProcesses": false,
|
||||
"topProcessCount": 3,
|
||||
"topProcessSortBy": "cpu",
|
||||
"layoutMode": "auto",
|
||||
"graphInterval": 60,
|
||||
"displayPreferences": [
|
||||
"all"
|
||||
]
|
||||
"name": "DP-3",
|
||||
"model": "34GL750"
|
||||
},
|
||||
{
|
||||
"name": "DP-4",
|
||||
"model": "ZOWIE XL LCD"
|
||||
}
|
||||
],
|
||||
"showDigitalSeconds": false,
|
||||
"showOnOverlay": false,
|
||||
"showOnOverviewOnly": false,
|
||||
"showOnOverview": false
|
||||
},
|
||||
"positions": {
|
||||
"DP-3": {
|
||||
"width": 500,
|
||||
"width": 240,
|
||||
"height": 240,
|
||||
"x": 2240,
|
||||
"y": 40
|
||||
},
|
||||
"DP-4": {
|
||||
"width": 240.484375,
|
||||
"height": 240.484375,
|
||||
"x": 1350,
|
||||
"y": 50
|
||||
},
|
||||
"HDMI-A-3": {
|
||||
"width": 250,
|
||||
"height": 250,
|
||||
"x": 2000,
|
||||
"x": 1650,
|
||||
"y": 50
|
||||
},
|
||||
"DP-4": {
|
||||
"width": 320,
|
||||
"height": 480,
|
||||
"x": 800,
|
||||
"y": 300
|
||||
},
|
||||
"HDMI-A-3": {
|
||||
"width": 320,
|
||||
"height": 480,
|
||||
"x": 1595.0546875,
|
||||
"y": 556.515625
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "dw_1782022081429_08ufxr98h",
|
||||
"widgetType": "appShortcut",
|
||||
"name": "Application Shortcut: Obsidian",
|
||||
"enabled": true,
|
||||
"config": {
|
||||
"displayPreferences": [
|
||||
"all"
|
||||
],
|
||||
"showOnOverlay": false,
|
||||
"showOnOverview": false,
|
||||
"showOnOverviewOnly": false,
|
||||
"clickThrough": false,
|
||||
"shortcutApp": "obsidian",
|
||||
"followTheme": false,
|
||||
"drawOutlines": false,
|
||||
"syncPositionAcrossScreens": true
|
||||
},
|
||||
"positions": {
|
||||
"DP-3": {
|
||||
"width": 100,
|
||||
"height": 100,
|
||||
"x": 150,
|
||||
"y": 200
|
||||
},
|
||||
"DP-4": {
|
||||
"DP-2": {
|
||||
"width": 200,
|
||||
"height": 200,
|
||||
"x": 860,
|
||||
"y": 440
|
||||
},
|
||||
"HDMI-A-3": {
|
||||
"width": 200,
|
||||
"height": 200,
|
||||
"x": 860,
|
||||
"y": 440
|
||||
},
|
||||
"_synced": {
|
||||
"x": 0.05859375,
|
||||
"y": 0.18518518518518517,
|
||||
"width": 100,
|
||||
"height": 100
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "dw_1782022155947_1a4381zan",
|
||||
"widgetType": "appShortcut",
|
||||
"name": "Application Shortcut: Steam",
|
||||
"enabled": true,
|
||||
"config": {
|
||||
"displayPreferences": [
|
||||
"all"
|
||||
],
|
||||
"showOnOverlay": false,
|
||||
"showOnOverview": false,
|
||||
"showOnOverviewOnly": false,
|
||||
"clickThrough": false,
|
||||
"shortcutApp": "steam",
|
||||
"followTheme": false,
|
||||
"drawOutlines": false,
|
||||
"syncPositionAcrossScreens": true
|
||||
},
|
||||
"positions": {
|
||||
"DP-3": {
|
||||
"width": 100,
|
||||
"height": 100,
|
||||
"x": 50,
|
||||
"y": 900
|
||||
},
|
||||
"DP-4": {
|
||||
"width": 200,
|
||||
"height": 200,
|
||||
"x": 860,
|
||||
"y": 440
|
||||
},
|
||||
"HDMI-A-3": {
|
||||
"width": 200,
|
||||
"height": 200,
|
||||
"x": 860,
|
||||
"y": 440
|
||||
},
|
||||
"_synced": {
|
||||
"x": 0.01953125,
|
||||
"y": 0.8333333333333334,
|
||||
"width": 100,
|
||||
"height": 100
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "dw_1782022159047_a0w7xwkkz",
|
||||
"widgetType": "appShortcut",
|
||||
"name": "Application Shortcut: Vesktop",
|
||||
"enabled": true,
|
||||
"config": {
|
||||
"displayPreferences": [
|
||||
"all"
|
||||
],
|
||||
"showOnOverlay": false,
|
||||
"showOnOverview": false,
|
||||
"showOnOverviewOnly": false,
|
||||
"clickThrough": false,
|
||||
"shortcutApp": "vesktop",
|
||||
"followTheme": false,
|
||||
"drawOutlines": false,
|
||||
"syncPositionAcrossScreens": true
|
||||
},
|
||||
"positions": {
|
||||
"DP-3": {
|
||||
"width": 100,
|
||||
"height": 100,
|
||||
"x": 50,
|
||||
"y": 200
|
||||
},
|
||||
"DP-4": {
|
||||
"width": 200,
|
||||
"height": 200,
|
||||
"x": 860,
|
||||
"y": 440
|
||||
},
|
||||
"HDMI-A-3": {
|
||||
"width": 200,
|
||||
"height": 200,
|
||||
"x": 860,
|
||||
"y": 440
|
||||
},
|
||||
"_synced": {
|
||||
"x": 0.01953125,
|
||||
"y": 0.18518518518518517,
|
||||
"width": 100,
|
||||
"height": 100
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "dw_1782022160265_i4vr22k1v",
|
||||
"widgetType": "appShortcut",
|
||||
"name": "Application Shortcut: PrismLauncher",
|
||||
"enabled": true,
|
||||
"config": {
|
||||
"displayPreferences": [
|
||||
"all"
|
||||
],
|
||||
"showOnOverlay": false,
|
||||
"showOnOverview": false,
|
||||
"showOnOverviewOnly": false,
|
||||
"clickThrough": false,
|
||||
"shortcutApp": "org.prismlauncher.PrismLauncher",
|
||||
"followTheme": false,
|
||||
"drawOutlines": false,
|
||||
"syncPositionAcrossScreens": true
|
||||
},
|
||||
"positions": {
|
||||
"DP-3": {
|
||||
"width": 100,
|
||||
"height": 100,
|
||||
"x": 250,
|
||||
"y": 900
|
||||
},
|
||||
"DP-4": {
|
||||
"width": 200,
|
||||
"height": 200,
|
||||
"x": 860,
|
||||
"y": 440
|
||||
},
|
||||
"HDMI-A-3": {
|
||||
"width": 200,
|
||||
"height": 200,
|
||||
"x": 860,
|
||||
"y": 440
|
||||
},
|
||||
"_synced": {
|
||||
"x": 0.09765625,
|
||||
"y": 0.8333333333333334,
|
||||
"width": 100,
|
||||
"height": 100
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "dw_1782022161442_3vfjq50gk",
|
||||
"widgetType": "appShortcut",
|
||||
"name": "Application Shortcut: Pokeclicker",
|
||||
"enabled": true,
|
||||
"config": {
|
||||
"displayPreferences": [
|
||||
"all"
|
||||
],
|
||||
"showOnOverlay": false,
|
||||
"showOnOverview": false,
|
||||
"showOnOverviewOnly": false,
|
||||
"clickThrough": false,
|
||||
"shortcutApp": "pokeclicker-desktop-with-scripts",
|
||||
"followTheme": false,
|
||||
"drawOutlines": false,
|
||||
"syncPositionAcrossScreens": true
|
||||
},
|
||||
"positions": {
|
||||
"DP-3": {
|
||||
"width": 100,
|
||||
"height": 100,
|
||||
"x": 150,
|
||||
"y": 900
|
||||
},
|
||||
"DP-4": {
|
||||
"width": 200,
|
||||
"height": 200,
|
||||
"x": 860,
|
||||
"y": 440
|
||||
},
|
||||
"HDMI-A-3": {
|
||||
"width": 200,
|
||||
"height": 200,
|
||||
"x": 860,
|
||||
"y": 440
|
||||
},
|
||||
"_synced": {
|
||||
"x": 0.05859375,
|
||||
"y": 0.8333333333333334,
|
||||
"width": 100,
|
||||
"height": 100
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "dw_1782022229421_fuo32iz2s",
|
||||
"widgetType": "appShortcut",
|
||||
"name": "Application Shortcut: Edge",
|
||||
"enabled": true,
|
||||
"config": {
|
||||
"displayPreferences": [
|
||||
"all"
|
||||
],
|
||||
"showOnOverlay": false,
|
||||
"showOnOverview": false,
|
||||
"showOnOverviewOnly": false,
|
||||
"clickThrough": false,
|
||||
"shortcutApp": "microsoft-edge",
|
||||
"followTheme": false,
|
||||
"drawOutlines": false,
|
||||
"syncPositionAcrossScreens": true
|
||||
},
|
||||
"positions": {
|
||||
"DP-3": {
|
||||
"width": 150,
|
||||
"height": 150,
|
||||
"x": 50,
|
||||
"y": 50
|
||||
},
|
||||
"DP-4": {
|
||||
"width": 200,
|
||||
"height": 200,
|
||||
"x": 860,
|
||||
"y": 440
|
||||
},
|
||||
"HDMI-A-3": {
|
||||
"width": 200,
|
||||
"height": 200,
|
||||
"x": 860,
|
||||
"y": 440
|
||||
},
|
||||
"_synced": {
|
||||
"x": 0.01953125,
|
||||
"y": 0.046296296296296294,
|
||||
"width": 150,
|
||||
"height": 150
|
||||
"x": 412,
|
||||
"y": 284
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -1052,7 +912,7 @@
|
||||
"id": "dw_1782022922490_aiumfxf49",
|
||||
"widgetType": "cavaVisualizer",
|
||||
"name": "Cava Visualizer",
|
||||
"enabled": true,
|
||||
"enabled": false,
|
||||
"config": {
|
||||
"displayPreferences": [
|
||||
"all"
|
||||
@@ -1087,8 +947,8 @@
|
||||
"y": 440
|
||||
},
|
||||
"_synced": {
|
||||
"x": 0.2734375,
|
||||
"y": 0.5092592592592593,
|
||||
"x": 0.27313639322916666,
|
||||
"y": 0.5089156539351852,
|
||||
"width": 1100,
|
||||
"height": 500
|
||||
}
|
||||
@@ -1101,16 +961,19 @@
|
||||
"enabled": true,
|
||||
"config": {
|
||||
"displayPreferences": [
|
||||
"all"
|
||||
{
|
||||
"name": "DP-4",
|
||||
"model": "ZOWIE XL LCD"
|
||||
}
|
||||
],
|
||||
"syncPositionAcrossScreens": true,
|
||||
"viewMode": "detailed",
|
||||
"viewMode": "compact",
|
||||
"colorMode": "primary",
|
||||
"backgroundOpacity": 80,
|
||||
"showPressure": true,
|
||||
"forecastDays": 7,
|
||||
"showHourlyForecast": true,
|
||||
"hourlyCount": 6,
|
||||
"showHourlyForecast": false,
|
||||
"hourlyCount": 12,
|
||||
"showLocation": false,
|
||||
"showCondition": true,
|
||||
"showFeelsLike": true
|
||||
@@ -1135,17 +998,95 @@
|
||||
"y": 440
|
||||
},
|
||||
"_synced": {
|
||||
"x": 0.78125,
|
||||
"y": 0.32407407407407407,
|
||||
"width": 500,
|
||||
"height": 650
|
||||
"x": 0.859375,
|
||||
"y": 0.046296296296296294,
|
||||
"width": 250,
|
||||
"height": 250
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "dw_1782021988600_vdg97np4g",
|
||||
"widgetType": "systemMonitor",
|
||||
"name": "System Monitor",
|
||||
"enabled": true,
|
||||
"config": {
|
||||
"showHeader": true,
|
||||
"transparency": 0.8,
|
||||
"colorMode": "primary",
|
||||
"customColor": "#ffffff",
|
||||
"showCpu": true,
|
||||
"showCpuGraph": true,
|
||||
"showCpuTemp": true,
|
||||
"showGpuTemp": false,
|
||||
"gpuPciId": "",
|
||||
"showMemory": true,
|
||||
"showMemoryGraph": true,
|
||||
"showNetwork": true,
|
||||
"showNetworkGraph": true,
|
||||
"showDisk": true,
|
||||
"showTopProcesses": false,
|
||||
"topProcessCount": 3,
|
||||
"topProcessSortBy": "cpu",
|
||||
"layoutMode": "auto",
|
||||
"graphInterval": 300,
|
||||
"displayPreferences": [
|
||||
{
|
||||
"name": "DP-2",
|
||||
"model": "SUN-4K"
|
||||
},
|
||||
{
|
||||
"name": "DP-4",
|
||||
"model": "ZOWIE XL LCD"
|
||||
}
|
||||
]
|
||||
},
|
||||
"positions": {
|
||||
"DP-3": {
|
||||
"width": 800,
|
||||
"height": 350,
|
||||
"x": 1650,
|
||||
"y": 650
|
||||
},
|
||||
"DP-4": {
|
||||
"width": 800,
|
||||
"height": 350,
|
||||
"x": 1100,
|
||||
"y": 650
|
||||
},
|
||||
"HDMI-A-3": {
|
||||
"width": 700,
|
||||
"height": 350,
|
||||
"x": 1200,
|
||||
"y": 650
|
||||
},
|
||||
"DP-2": {
|
||||
"width": 320,
|
||||
"height": 480,
|
||||
"x": 352,
|
||||
"y": 144
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"desktopWidgetGroups": [],
|
||||
"builtInPluginSettings": {},
|
||||
"builtInPluginSettings": {
|
||||
"dms_settings_search": {
|
||||
"trigger": "?"
|
||||
},
|
||||
"dms_clipboard_search": {
|
||||
"trigger": "cb"
|
||||
}
|
||||
},
|
||||
"clipboardClickToPaste": false,
|
||||
"clipboardEnterToPaste": false,
|
||||
"clipboardRememberTypeFilter": false,
|
||||
"clipboardTypeFilter": "all",
|
||||
"clipboardVisibleEntryActions": [
|
||||
"pin",
|
||||
"edit",
|
||||
"delete"
|
||||
],
|
||||
"launcherPluginVisibility": {
|
||||
"obsidianSearch": {
|
||||
"allowWithoutTrigger": false
|
||||
@@ -1155,5 +1096,24 @@
|
||||
}
|
||||
},
|
||||
"launcherPluginOrder": [],
|
||||
"configVersion": 5
|
||||
"frameEnabled": false,
|
||||
"frameThickness": 100,
|
||||
"frameRounding": 100,
|
||||
"frameColor": "surface",
|
||||
"frameOpacity": 0.69,
|
||||
"frameScreenPreferences": [
|
||||
"all"
|
||||
],
|
||||
"frameBarSize": 100,
|
||||
"frameShowOnOverview": false,
|
||||
"frameBlurEnabled": true,
|
||||
"frameCloseGaps": false,
|
||||
"frameLauncherEmergeSide": "bottom",
|
||||
"frameLauncherArcExtender": true,
|
||||
"frameLauncherEdgeHover": true,
|
||||
"frameMode": "connected",
|
||||
"barInsetPaddingShared": -1,
|
||||
"barInsetPaddingSyncAll": false,
|
||||
"frameBarInsetPadding": 26,
|
||||
"configVersion": 12
|
||||
}
|
||||
|
||||
@@ -1,9 +1,5 @@
|
||||
# Extra local disks. Declared here, not in hardware.nix (hardware.nix is generated).
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
# Stable UID so NTFS `uid=` matches `users.users.olivier` (override if your account is not 1000).
|
||||
olivierUid = config.users.users.olivier.uid or 1000;
|
||||
in
|
||||
{
|
||||
users.users.olivier.uid = lib.mkDefault 1000;
|
||||
# LABEL="MediaLibrary" (btrfs on sda1 by UUID). No subvol=@ — this disk has no @ subvolume.
|
||||
@@ -33,15 +29,4 @@ in
|
||||
# LABEL="Deep Storage Unit". Owner olivier, group nfsmedia (990) so:
|
||||
# - local logins write as user 1000 (owner rwx);
|
||||
# - NFS (all_squash → uid/gid 990) matches group 990 → rwx (see jellyfin-nfs-export).
|
||||
#fileSystems."/mnt/test" = {
|
||||
# device = "/dev/disk/by-uuid/BC12E55E12E51DE0";
|
||||
# fsType = "ntfs-3g";
|
||||
# options = [
|
||||
# "rw"
|
||||
# "force"
|
||||
# "uid=${toString olivierUid}"
|
||||
# "gid=990"
|
||||
# "umask=0002"
|
||||
# ];
|
||||
#};
|
||||
}
|
||||
|
||||
@@ -1,14 +1,12 @@
|
||||
# Headless 4K virtual output for Sunshine → Moonlight on a client TV.
|
||||
#
|
||||
# NVIDIA proprietary driver: both kernel params are required —
|
||||
# NVIDIA: force-enable a spare DRM connector with a custom EDID via kernel params:
|
||||
# video=<connector>:e force-enables the connector
|
||||
# drm.edid_firmware=<connector>:… loads modes from the EDID blob
|
||||
#
|
||||
# Pick a connector that is disconnected on the host (check after boot):
|
||||
# grep -H . /sys/class/drm/card*-*/status
|
||||
#
|
||||
# Reboot after changing connector or EDID. 4K@60 is realistic on RTX 2070;
|
||||
# 4K@120 on a sink-less connector needs driver patches (see NVIDIA issue #1184).
|
||||
# Capture is pinned to the connector by name (Sunshine `output_name`), which is
|
||||
# stable across reboots/hotplug — unlike a numeric monitor index.
|
||||
# Reboot after changing connector or EDID. 4K@60 is realistic on RTX 2070.
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.chiasson.system.streamingDisplay;
|
||||
@@ -16,14 +14,13 @@ let
|
||||
edidFirmware = pkgs.runCommand "sunshine-virtual-4k-edid" {
|
||||
nativeBuildInputs = [ pkgs.python3 ];
|
||||
} ''
|
||||
${pkgs.python3}/bin/python3 ${./generate-virtual-edid.py} $TMPDIR/${cfg.edidFileName}
|
||||
mkdir -p $out/lib/firmware/edid
|
||||
cp $TMPDIR/${cfg.edidFileName} $out/lib/firmware/edid/${cfg.edidFileName}
|
||||
${pkgs.python3}/bin/python3 ${./generate-virtual-edid.py} $out/lib/firmware/edid/${cfg.edidFileName}
|
||||
'';
|
||||
|
||||
# Sunshine 2025.924 wlr capture only accepts a numeric monitor index (not "DP-2").
|
||||
# If the index drifts after hotplug, check:
|
||||
# journalctl --user -u sunshine -b | rg 'Monitor [0-9]+ is'
|
||||
# On stream start: scale + focus the virtual 4K output so streamed windows
|
||||
# land there. Capture is pinned to the connector via Sunshine `output_name`,
|
||||
# so no fragile numeric-index detection is needed.
|
||||
streamDisplayUp = pkgs.writeShellScriptBin "stream-display-up" ''
|
||||
${pkgs.niri}/bin/niri msg output ${cfg.connector} scale ${toString cfg.niriScale}
|
||||
${pkgs.niri}/bin/niri msg action focus-monitor ${cfg.connector}
|
||||
@@ -87,18 +84,6 @@ in
|
||||
default = "DP-3";
|
||||
description = "Niri monitor to refocus when a Moonlight session ends.";
|
||||
};
|
||||
|
||||
sunshineOutputIndex = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "3";
|
||||
example = "3";
|
||||
description = ''
|
||||
Wayland/wlr monitor index for Sunshine `output_name`. Sunshine 2025.924 ignores
|
||||
connector strings like `DP-2` and falls back to monitor 0 (your primary).
|
||||
Find the index with:
|
||||
`journalctl --user -u sunshine -b | rg "Monitor [0-9]+ is ${cfg.connector}"`
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable (lib.mkMerge [
|
||||
@@ -118,7 +103,11 @@ in
|
||||
(lib.mkIf config.chiasson.system.gaming.sunshine.enable {
|
||||
services.sunshine.settings = {
|
||||
capture = "wlr";
|
||||
output_name = cfg.sunshineOutputIndex;
|
||||
# Pin capture to the virtual display by connector name (stable across
|
||||
# reboots/hotplug). A numeric index drifted to the ultrawide before.
|
||||
output_name = cfg.connector;
|
||||
# RTX 2070 has no AV1 NVENC; avoid probing av1_nvenc.
|
||||
encoder = "hevc_nvenc,h264_nvenc";
|
||||
global_prep_cmd = "[{\"do\":\"${streamDisplayUp}/bin/stream-display-up\",\"undo\":\"${streamDisplayDown}/bin/stream-display-down\"}]";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -4,8 +4,6 @@
|
||||
system = "x86_64-linux";
|
||||
specialArgs = {
|
||||
inherit self inputs;
|
||||
host = "14900k";
|
||||
system = "x86_64-linux";
|
||||
};
|
||||
modules = [
|
||||
self.nixosModules."14900kConfiguration"
|
||||
|
||||
@@ -22,6 +22,14 @@
|
||||
spotify.openDiscoveryFirewall = true;
|
||||
pokeclicker.enable = true;
|
||||
};
|
||||
|
||||
editors.vscode = {
|
||||
enable = true;
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
alefragnani.project-manager
|
||||
johnpapa.vscode-peacock
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
@@ -17,10 +17,6 @@
|
||||
userCli.enable = true;
|
||||
};
|
||||
|
||||
chiasson.users.extraModules.olivier =
|
||||
self.lib.wisdomCatalogExtraModules self
|
||||
++ [
|
||||
self.homeManagerModules.desktopHomeDefaults
|
||||
];
|
||||
chiasson.users.extraModules.olivier = self.lib.wisdomCatalogExtraModules self;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,77 +0,0 @@
|
||||
# Shared HM defaults for desktop hosts (git identity, wisdom catalog toggles).
|
||||
{ ... }: {
|
||||
flake.homeManagerModules.desktopHomeDefaults =
|
||||
{ lib, pkgs, ... }:
|
||||
let
|
||||
aarch64 = pkgs.stdenv.hostPlatform.isAarch64;
|
||||
in
|
||||
{
|
||||
programs.git = {
|
||||
enable = lib.mkDefault true;
|
||||
settings.user = {
|
||||
name = "OlivierChiasson";
|
||||
email = "olivierchiasson@hotmail.fr";
|
||||
};
|
||||
};
|
||||
|
||||
#TODO[epic=Moderate] Check if git-crypt should belong in desktop-home-base.
|
||||
home.packages = [ pkgs.git-crypt pkgs.feishin ];
|
||||
|
||||
chiasson.home = {
|
||||
shell = {
|
||||
fish.enable = lib.mkDefault true;
|
||||
ohMyPosh.enable = lib.mkDefault true;
|
||||
yazi.enable = lib.mkDefault true;
|
||||
};
|
||||
|
||||
terminals.kitty.enable = lib.mkDefault true;
|
||||
|
||||
filebrowsers.nemo.enable = lib.mkDefault true;
|
||||
|
||||
browsers = {
|
||||
chrome.enable = lib.mkDefault false;
|
||||
chromiumHevc = {
|
||||
enable = lib.mkDefault true;
|
||||
packages = lib.mkDefault (
|
||||
if aarch64 then
|
||||
[ "chromium" ]
|
||||
else
|
||||
[ "google-chrome" ]
|
||||
);
|
||||
} // lib.optionalAttrs (!aarch64) {
|
||||
vaapi.gpu = lib.mkDefault "intel";
|
||||
};
|
||||
edge.enable = lib.mkDefault false;
|
||||
flow.enable = lib.mkDefault false;
|
||||
orion.enable = lib.mkDefault false;
|
||||
zen.enable = lib.mkDefault false;
|
||||
};
|
||||
|
||||
editors = {
|
||||
cursor.enable = lib.mkDefault true;
|
||||
kate.enable = lib.mkDefault false;
|
||||
obsidian.enable = lib.mkDefault true;
|
||||
};
|
||||
|
||||
apps = {
|
||||
discord.enable = lib.mkDefault false;
|
||||
localsend.enable = lib.mkDefault true;
|
||||
pokeclicker.enable = lib.mkDefault false;
|
||||
spotify = {
|
||||
enable = lib.mkDefault false;
|
||||
openDiscoveryFirewall = lib.mkDefault false;
|
||||
};
|
||||
};
|
||||
|
||||
desktop = {
|
||||
screenshot = {
|
||||
enable = lib.mkDefault true;
|
||||
swiftshareApiKeyFile = "/run/secrets/swiftshare/API_KEY"; #TODO[epic=sops] redo this by passing sops file output directly
|
||||
};
|
||||
theming.enable = lib.mkDefault true;
|
||||
};
|
||||
|
||||
hardware.uconsoleGamepad.enable = lib.mkDefault false;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -42,12 +42,7 @@
|
||||
# rebuilds Mobile NixOS' script-loader against the patched mruby.
|
||||
chiasson.system.ideapadMrubyOverlay.enable = true;
|
||||
|
||||
# Wi-Fi modem (qcom-wcn3990) + Bluetooth (QCA crnv32) need binary blobs.
|
||||
nixpkgs.config.allowUnfreePredicate =
|
||||
pkg: builtins.elem (lib.getName pkg) [
|
||||
"chromeos-sc7180-unredistributable-firmware"
|
||||
"chromeos-sc7180-unredistributable-firmware-zstd"
|
||||
];
|
||||
# Wi-Fi modem (qcom-wcn3990) + Bluetooth (QCA crnv32) need binary blobs
|
||||
hardware.firmware = [ pkgs.chromeos-sc7180-unredistributable-firmware ];
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
|
||||
|
||||
@@ -4,8 +4,6 @@
|
||||
system = "aarch64-linux";
|
||||
specialArgs = {
|
||||
inherit self inputs;
|
||||
host = "ideapad";
|
||||
system = "aarch64-linux";
|
||||
};
|
||||
modules = [
|
||||
self.nixosModules.ideapadConfiguration
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
# NFS mounts of nixdesk (14900k) bulk storage for nix-server. Exports live in
|
||||
# modules/hosts/14900k/_private/jellyfin-nfs-export.nix
|
||||
#
|
||||
# Jellyfin library paths (see also services/jellyfin.nix):
|
||||
# Movies → /mnt/nixdesk-jellyfin/movies
|
||||
# Shows → /mnt/nixdesk-jellyfin/tv
|
||||
#
|
||||
# If you see "Stale file handle" under /mnt after changing exports or fsid on nixdesk, drop the
|
||||
# old client mount and let automount reattach, e.g.:
|
||||
# sudo umount -l /mnt/nixdesk-jellyfin
|
||||
# ls /mnt/nixdesk-jellyfin
|
||||
# (or reboot nix-server.)
|
||||
{ ... }:
|
||||
let
|
||||
nfsExportHost = "192.168.2.25";
|
||||
# nfsvers+tcp: predictable Linux↔Linux; lookupcache=none: fewer stale dentries after export changes.
|
||||
nfsClientOpts = [
|
||||
"rw"
|
||||
"noatime"
|
||||
"nofail"
|
||||
"_netdev"
|
||||
"nfsvers=3"
|
||||
"tcp"
|
||||
"lookupcache=none"
|
||||
"x-systemd.automount"
|
||||
"x-systemd.idle-timeout=3600"
|
||||
];
|
||||
in
|
||||
{
|
||||
fileSystems."/mnt/nixdesk-jellyfin" = {
|
||||
device = "${nfsExportHost}:/mnt/deep/jellyfin";
|
||||
fsType = "nfs";
|
||||
options = nfsClientOpts;
|
||||
};
|
||||
}
|
||||
@@ -3,8 +3,6 @@
|
||||
system = "x86_64-linux";
|
||||
specialArgs = {
|
||||
inherit self inputs;
|
||||
host = "nix-server";
|
||||
system = "x86_64-linux";
|
||||
};
|
||||
modules = [
|
||||
self.nixosModules.nix-serverConfiguration
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
# NFS mounts of nixdesk (14900k) bulk storage for r5500. Exports live in
|
||||
# modules/hosts/14900k/_private/jellyfin-nfs-export.nix
|
||||
#
|
||||
# Jellyfin library paths:
|
||||
# Movies → /mnt/nixdesk-jellyfin/movies
|
||||
# Shows → /mnt/nixdesk-jellyfin/tv
|
||||
{ ... }:
|
||||
let
|
||||
nfsExportHost = "192.168.2.25";
|
||||
nfsClientOpts = [
|
||||
"rw"
|
||||
"noatime"
|
||||
"nofail"
|
||||
"_netdev"
|
||||
"nfsvers=3"
|
||||
"tcp"
|
||||
"lookupcache=none"
|
||||
"x-systemd.automount"
|
||||
"x-systemd.idle-timeout=3600"
|
||||
];
|
||||
in
|
||||
{
|
||||
fileSystems."/mnt/nixdesk-jellyfin" = {
|
||||
device = "${nfsExportHost}:/mnt/deep/jellyfin";
|
||||
fsType = "nfs";
|
||||
options = nfsClientOpts;
|
||||
};
|
||||
}
|
||||
@@ -17,7 +17,7 @@
|
||||
./_private/media-disk.nix
|
||||
./_private/media-paths.nix
|
||||
./_services/docker-media.nix
|
||||
./_services/nixdesk-nfs-client.nix
|
||||
self.nixosModules.nixdeskJellyfin
|
||||
./_services/jellyfin.nix
|
||||
./_services/sonarr.nix
|
||||
./_services/radarr.nix
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
system = "x86_64-linux";
|
||||
specialArgs = {
|
||||
inherit self inputs;
|
||||
host = "r5500";
|
||||
system = "x86_64-linux";
|
||||
};
|
||||
modules = [
|
||||
self.nixosModules.r5500Configuration
|
||||
|
||||
@@ -4,8 +4,6 @@
|
||||
system = "x86_64-linux";
|
||||
specialArgs = {
|
||||
inherit self inputs;
|
||||
host = "t2mbp";
|
||||
system = "x86_64-linux";
|
||||
};
|
||||
modules = [
|
||||
self.nixosModules.t2mbpConfiguration
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ self, inputs, ... }:
|
||||
{
|
||||
flake.nixosModules.t2mbpHome =
|
||||
{ self, ... }:
|
||||
{ self, pkgs, ... }:
|
||||
{
|
||||
imports = [ self.nixosModules.desktopHomeBase ];
|
||||
|
||||
@@ -14,6 +14,14 @@
|
||||
discord.enable = true;
|
||||
pokeclicker.enable = true;
|
||||
};
|
||||
|
||||
editors.vscode = {
|
||||
enable = true;
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
alefragnani.project-manager
|
||||
johnpapa.vscode-peacock
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
@@ -4,8 +4,6 @@
|
||||
specialArgs = inputs // {
|
||||
inherit self;
|
||||
inputs = inputs;
|
||||
host = "uConsole";
|
||||
system = "aarch64-linux";
|
||||
};
|
||||
trustCaches = false;
|
||||
modules = [
|
||||
|
||||
@@ -1,13 +1,21 @@
|
||||
{ self, inputs, ... }:
|
||||
{
|
||||
flake.nixosModules.uConsoleHome =
|
||||
{ self, ... }:
|
||||
{ self, pkgs, ... }:
|
||||
{
|
||||
imports = [ self.nixosModules.desktopHomeBase ];
|
||||
|
||||
chiasson.users.extraModules.olivier = [
|
||||
{
|
||||
chiasson.home.hardware.uconsoleGamepad.enable = true;
|
||||
|
||||
chiasson.home.editors.vscode = {
|
||||
enable = true;
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
alefragnani.project-manager
|
||||
johnpapa.vscode-peacock
|
||||
];
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
@@ -17,10 +17,9 @@
|
||||
++ lib.optionals pkgs.stdenv.isx86_64 [ heroic ];
|
||||
|
||||
steamExtraPkgs =
|
||||
if !cfg.steam.steamTinkerLaunch.enable then
|
||||
[ ]
|
||||
else
|
||||
lib.optional (lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.steamtinkerlaunch) pkgs.steamtinkerlaunch;
|
||||
lib.optional (cfg.steam.steamTinkerLaunch.enable && lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.steamtinkerlaunch) pkgs.steamtinkerlaunch;
|
||||
|
||||
launcherSet = launcherPkgs ++ steamExtraPkgs ++ cfg.launchers.extraPackages;
|
||||
in
|
||||
{
|
||||
options.chiasson.system.gaming = {
|
||||
@@ -194,11 +193,11 @@
|
||||
];
|
||||
}
|
||||
(lib.mkIf (cfg.launchers.forUsers == null) {
|
||||
environment.systemPackages = launcherPkgs ++ steamExtraPkgs ++ cfg.launchers.extraPackages;
|
||||
environment.systemPackages = launcherSet;
|
||||
})
|
||||
(lib.mkIf (cfg.launchers.forUsers != null) {
|
||||
users.users = lib.genAttrs cfg.launchers.forUsers (_: {
|
||||
packages = launcherPkgs ++ steamExtraPkgs ++ cfg.launchers.extraPackages;
|
||||
packages = launcherSet;
|
||||
});
|
||||
})
|
||||
]);
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
# NFS mount of nixdesk (14900k) bulk storage for clients. Exports live in
|
||||
# modules/hosts/14900k/_private/jellyfin-nfs-export.nix
|
||||
#
|
||||
# Jellyfin library paths (see also jellyfin.nix):
|
||||
# Movies → /mnt/nixdesk-jellyfin/movies
|
||||
# Shows → /mnt/nixdesk-jellyfin/tv
|
||||
#
|
||||
# If you see "Stale file handle" under /mnt after changing exports or fsid on nixdesk, drop the
|
||||
# old client mount and let automount reattach, e.g.:
|
||||
# sudo umount -l /mnt/nixdesk-jellyfin
|
||||
# ls /mnt/nixdesk-jellyfin
|
||||
{ ... }:
|
||||
{
|
||||
flake.nixosModules.nixdeskJellyfin =
|
||||
{ lib, ... }:
|
||||
let
|
||||
nfsExportHost = "192.168.2.25";
|
||||
# nfsvers+tcp: predictable Linux↔Linux; lookupcache=none: fewer stale dentries after export changes.
|
||||
nfsClientOpts = [
|
||||
"rw"
|
||||
"noatime"
|
||||
"nofail"
|
||||
"_netdev"
|
||||
"nfsvers=3"
|
||||
"tcp"
|
||||
"lookupcache=none"
|
||||
"x-systemd.automount"
|
||||
"x-systemd.idle-timeout=3600"
|
||||
];
|
||||
in
|
||||
{
|
||||
fileSystems."/mnt/nixdesk-jellyfin" = {
|
||||
device = "${nfsExportHost}:/mnt/deep/jellyfin";
|
||||
fsType = "nfs";
|
||||
options = nfsClientOpts;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -12,7 +12,9 @@
|
||||
|
||||
options.chiasson.home.apps.discord.enable = lib.mkEnableOption ''
|
||||
Vesktop (nixcord). Needs nixpkgs `discord` — breaks on e.g. aarch64-linux.
|
||||
'';
|
||||
'' // {
|
||||
default = false;
|
||||
};
|
||||
|
||||
config = lib.mkIf root.enable (lib.mkMerge [
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ ... }: {
|
||||
{ self, ... }: {
|
||||
flake.nixosModules.systemLocalsend =
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
@@ -19,23 +19,10 @@
|
||||
};
|
||||
};
|
||||
|
||||
flake.homeManagerModules.wisdomAppsLocalsend =
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
root = config.chiasson.home;
|
||||
cfg = config.chiasson.home.apps.localsend;
|
||||
in
|
||||
{
|
||||
options.chiasson.home.apps.localsend = {
|
||||
enable = lib.mkEnableOption ''
|
||||
LocalSend client; open the firewall on NixOS with `system.localsend` if you want inbound.
|
||||
'';
|
||||
|
||||
package = lib.mkPackageOption pkgs "localsend" { };
|
||||
};
|
||||
|
||||
config = lib.mkIf (root.enable && cfg.enable) {
|
||||
home.packages = [ cfg.package ];
|
||||
};
|
||||
flake.homeManagerModules.wisdomAppsLocalsend = self.lib.wisdomSlice {
|
||||
path = "apps.localsend";
|
||||
default = true;
|
||||
description = "LocalSend client; open the firewall on NixOS with `system.localsend` if you want inbound.";
|
||||
packages = pkgs: [ pkgs.localsend ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,16 +1,8 @@
|
||||
{ ... }: {
|
||||
flake.homeManagerModules.wisdomAppsPokeclicker =
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
root = config.chiasson.home;
|
||||
cfg = config.chiasson.home.apps.pokeclicker;
|
||||
pokeclickerPkg = pkgs.callPackage ./package { };
|
||||
in
|
||||
{
|
||||
options.chiasson.home.apps.pokeclicker.enable = lib.mkEnableOption "PokéClicker desktop (Farigh fork .deb → nix).";
|
||||
|
||||
config = lib.mkIf (root.enable && cfg.enable) {
|
||||
home.packages = [ pokeclickerPkg ];
|
||||
};
|
||||
{ self, ... }: {
|
||||
flake.homeManagerModules.wisdomAppsPokeclicker = self.lib.wisdomSlice {
|
||||
path = "apps.pokeclicker";
|
||||
default = false;
|
||||
description = "PokéClicker desktop (Farigh fork .deb → nix).";
|
||||
packages = pkgs: [ (pkgs.callPackage ./package { }) ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,19 +1,8 @@
|
||||
{ ... }: {
|
||||
flake.homeManagerModules.wisdomBrowsersChrome =
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
root = config.chiasson.home;
|
||||
cfg = config.chiasson.home.browsers.chrome;
|
||||
in
|
||||
{
|
||||
options.chiasson.home.browsers.chrome.enable = lib.mkEnableOption ''
|
||||
Chrome (unfree, needs `allowUnfree`); skipped if nixpkgs has no build for this platform.
|
||||
'';
|
||||
|
||||
config = lib.mkIf (root.enable && cfg.enable) {
|
||||
home.packages = lib.optional (
|
||||
lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.google-chrome
|
||||
) pkgs.google-chrome;
|
||||
};
|
||||
{ self, ... }: {
|
||||
flake.homeManagerModules.wisdomBrowsersChrome = self.lib.wisdomSlice {
|
||||
path = "browsers.chrome";
|
||||
default = false;
|
||||
description = "Chrome (unfree, needs `allowUnfree`); skipped if nixpkgs has no build for this platform.";
|
||||
packages = pkgs: [ pkgs.google-chrome ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -5,25 +5,43 @@
|
||||
cfg = config.chiasson.system.chromiumHevc;
|
||||
in
|
||||
{
|
||||
options.chiasson.system.chromiumHevc.enable = lib.mkEnableOption ''
|
||||
options.chiasson.system.chromiumHevc = {
|
||||
enable = lib.mkEnableOption ''
|
||||
VA-API packages for Chromium HEVC (Intel iHD + optional NVIDIA nvidia-vaapi-driver).
|
||||
Pair with `wisdomBrowsersChromiumHevc` on the user side.
|
||||
'';
|
||||
|
||||
gpu = lib.mkOption {
|
||||
type = lib.types.enum [
|
||||
"intel"
|
||||
"nvidia"
|
||||
];
|
||||
default = "intel";
|
||||
description = ''
|
||||
VA-API stack for the `*-hevc` browser launchers. Use **intel** for Jellyfin
|
||||
(Chromium + nvidia-vaapi-driver is unsupported upstream and fails with
|
||||
`failed Initialize()ing the frame pool` in Jellyfin). **nvidia** adds the
|
||||
nvidia-vaapi-driver and keep renderD129 + VaapiOnNvidiaGPUs for experiments only.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
hardware.graphics.enable = lib.mkDefault true;
|
||||
hardware.graphics.extraPackages = lib.mkAfter (
|
||||
with pkgs;
|
||||
[ nvidia-vaapi-driver ]
|
||||
lib.optionals (cfg.gpu == "nvidia") [
|
||||
pkgs.nvidia-vaapi-driver
|
||||
]
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
flake.homeManagerModules.wisdomBrowsersChromiumHevc =
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, pkgs, osConfig ? { }, ... }:
|
||||
let
|
||||
root = config.chiasson.home;
|
||||
cfg = config.chiasson.home.browsers.chromiumHevc;
|
||||
gpu = lib.attrByPath [ "chiasson" "system" "chromiumHevc" "gpu" ] "intel" osConfig;
|
||||
|
||||
browserCatalog = {
|
||||
"google-chrome" = {
|
||||
@@ -53,7 +71,6 @@
|
||||
intel = {
|
||||
driver = "iHD";
|
||||
drmDevice = "/dev/dri/renderD128";
|
||||
nvdBackend = "direct";
|
||||
enableFeatures = [
|
||||
"VaapiVideoDecodeLinuxGL"
|
||||
"VaapiVideoDecoder"
|
||||
@@ -69,7 +86,6 @@
|
||||
nvidia = {
|
||||
driver = "nvidia";
|
||||
drmDevice = "/dev/dri/renderD129";
|
||||
nvdBackend = "direct";
|
||||
enableFeatures = [
|
||||
"VaapiVideoDecoder"
|
||||
"VaapiIgnoreDriverChecks"
|
||||
@@ -85,21 +101,17 @@
|
||||
};
|
||||
};
|
||||
|
||||
activeGpu = gpuProfiles.${cfg.vaapi.gpu};
|
||||
|
||||
mkChromiumHevc =
|
||||
packageName:
|
||||
let
|
||||
spec = browserCatalog.${packageName};
|
||||
browser = spec.package;
|
||||
launcherName = spec.launcher;
|
||||
activeGpu = gpuProfiles.${gpu};
|
||||
enableFeatures = lib.concatStringsSep "," activeGpu.enableFeatures;
|
||||
disableFeatures = lib.concatStringsSep "," activeGpu.disableFeatures;
|
||||
desktopItem = pkgs.makeDesktopItem {
|
||||
name = launcherName;
|
||||
|
||||
mkDesktopItem =
|
||||
spec:
|
||||
pkgs.makeDesktopItem {
|
||||
name = spec.launcher;
|
||||
desktopName = spec.desktopName;
|
||||
genericName = "Web Browser";
|
||||
exec = "${launcherName} %U";
|
||||
exec = "${spec.launcher} %U";
|
||||
icon = spec.icon;
|
||||
categories = [
|
||||
"Network"
|
||||
@@ -113,6 +125,14 @@
|
||||
"x-scheme-handler/https"
|
||||
];
|
||||
};
|
||||
|
||||
mkChromiumHevc =
|
||||
packageName:
|
||||
let
|
||||
spec = browserCatalog.${packageName};
|
||||
browser = spec.package;
|
||||
launcherName = spec.launcher;
|
||||
desktopItem = mkDesktopItem spec;
|
||||
in
|
||||
pkgs.runCommand launcherName
|
||||
{
|
||||
@@ -126,7 +146,7 @@
|
||||
makeWrapper ${browser}/bin/${spec.binary} $out/bin/${launcherName} \
|
||||
--set LIBVA_DRIVER_NAME ${lib.escapeShellArg activeGpu.driver} \
|
||||
--set LIBVA_DRM_DEVICE ${lib.escapeShellArg activeGpu.drmDevice} \
|
||||
--set NVD_BACKEND ${lib.escapeShellArg activeGpu.nvdBackend} \
|
||||
--set NVD_BACKEND direct \
|
||||
--add-flags "--enable-features=${enableFeatures}" \
|
||||
--add-flags "--disable-features=${disableFeatures}" \
|
||||
${lib.concatMapStringsSep " " (a: "--add-flags ${lib.escapeShellArg a}") cfg.extraCommandLineArgs}
|
||||
@@ -136,46 +156,28 @@
|
||||
'';
|
||||
|
||||
selectedPackages = lib.filter (
|
||||
name:
|
||||
let
|
||||
spec = browserCatalog.${name};
|
||||
in
|
||||
lib.meta.availableOn pkgs.stdenv.hostPlatform spec.package
|
||||
name: lib.meta.availableOn pkgs.stdenv.hostPlatform browserCatalog.${name}.package
|
||||
) cfg.packages;
|
||||
|
||||
wrappers = map mkChromiumHevc selectedPackages;
|
||||
in
|
||||
{
|
||||
options.chiasson.home.browsers.chromiumHevc = {
|
||||
enable = lib.mkEnableOption ''
|
||||
enable =
|
||||
lib.mkEnableOption ''
|
||||
`google-chrome-hevc`: Chromium with VA-API HEVC for Jellyfin / MSE playback.
|
||||
|
||||
Default GPU is **Intel** (`vaapi.gpu = "intel"`): Chromium + NVIDIA VA-API is
|
||||
unsupported upstream (`nvidia-vaapi-driver` README) and fails with
|
||||
`failed Initialize()ing the frame pool` in Jellyfin.
|
||||
|
||||
GPU stack comes from `chiasson.system.chromiumHevc.gpu` (default **intel**).
|
||||
Requires `chiasson.system.chromiumHevc.enable` on NixOS.
|
||||
'';
|
||||
|
||||
packages = lib.mkOption {
|
||||
type = lib.types.listOf (
|
||||
lib.types.enum (lib.attrNames browserCatalog)
|
||||
);
|
||||
default = [ "google-chrome" ];
|
||||
description = "Chromium-based browsers to wrap.";
|
||||
''
|
||||
// {
|
||||
default = true;
|
||||
};
|
||||
|
||||
vaapi.gpu = lib.mkOption {
|
||||
type = lib.types.enum [
|
||||
"intel"
|
||||
"nvidia"
|
||||
];
|
||||
default = "intel";
|
||||
description = ''
|
||||
VA-API stack for `google-chrome-hevc`. Use **intel** for Jellyfin (Chromium +
|
||||
nvidia-vaapi-driver is unsupported and hits frame-pool init errors). **nvidia**
|
||||
keeps renderD129 + VaapiOnNvidiaGPUs for experiments only.
|
||||
'';
|
||||
packages = lib.mkOption {
|
||||
type = lib.types.listOf (lib.types.enum (lib.attrNames browserCatalog));
|
||||
default = if pkgs.stdenv.hostPlatform.isAarch64 then [ "chromium" ] else [ "google-chrome" ];
|
||||
description = "Chromium-based browsers to wrap.";
|
||||
};
|
||||
|
||||
extraCommandLineArgs = lib.mkOption {
|
||||
|
||||
@@ -1,17 +1,8 @@
|
||||
{ ... }: {
|
||||
flake.homeManagerModules.wisdomBrowsersEdge =
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
root = config.chiasson.home;
|
||||
cfg = config.chiasson.home.browsers.edge;
|
||||
in
|
||||
{
|
||||
options.chiasson.home.browsers.edge.enable = lib.mkEnableOption "Edge (unfree); skipped if unavailable on this platform.";
|
||||
|
||||
config = lib.mkIf (root.enable && cfg.enable) {
|
||||
home.packages = lib.optional (
|
||||
lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.microsoft-edge
|
||||
) pkgs.microsoft-edge;
|
||||
};
|
||||
{ self, ... }: {
|
||||
flake.homeManagerModules.wisdomBrowsersEdge = self.lib.wisdomSlice {
|
||||
path = "browsers.edge";
|
||||
default = false;
|
||||
description = "Edge (unfree); skipped if unavailable on this platform.";
|
||||
packages = pkgs: [ pkgs.microsoft-edge ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
{ ... }: {
|
||||
flake.homeManagerModules.wisdomBrowsersFlow =
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
root = config.chiasson.home;
|
||||
cfg = config.chiasson.home.browsers.flow;
|
||||
|
||||
flow-browser =
|
||||
{ self, ... }: {
|
||||
flake.homeManagerModules.wisdomBrowsersFlow = self.lib.wisdomSlice {
|
||||
path = "browsers.flow";
|
||||
default = false;
|
||||
description = "[Flow](https://github.com/MultiboxLabs/flow-browser) — upstream AppImage wrapped for NixOS.";
|
||||
packages =
|
||||
pkgs:
|
||||
let
|
||||
pname = "flow-browser";
|
||||
version = "0.11.0";
|
||||
@@ -25,7 +24,8 @@
|
||||
|
||||
appimageContents = pkgs.appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
pkgs.appimageTools.wrapType2 {
|
||||
[
|
||||
(pkgs.appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
@@ -45,23 +45,13 @@
|
||||
meta = {
|
||||
description = "Chromium-based browser (upstream AppImage)";
|
||||
homepage = "https://github.com/MultiboxLabs/flow-browser";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = pkgs.lib.licenses.gpl3Plus;
|
||||
sourceProvenance = with pkgs.lib.sourceTypes; [ binaryNativeCode ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
mainProgram = pname;
|
||||
maintainers = [ ];
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
options.chiasson.home.browsers.flow.enable = lib.mkEnableOption ''
|
||||
[Flow](https://github.com/MultiboxLabs/flow-browser) — upstream AppImage wrapped for NixOS.
|
||||
'';
|
||||
|
||||
config = lib.mkIf (root.enable && cfg.enable) {
|
||||
home.packages = lib.optional (
|
||||
lib.meta.availableOn pkgs.stdenv.hostPlatform flow-browser
|
||||
) flow-browser;
|
||||
};
|
||||
})
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -31,7 +31,9 @@
|
||||
{
|
||||
options.chiasson.home.browsers.orion.enable = lib.mkEnableOption ''
|
||||
[Orion](https://orionbrowser.com/) (Kagi) — installs the upstream Flatpak bundle and provides `oriongtk`.
|
||||
'';
|
||||
'' // {
|
||||
default = false;
|
||||
};
|
||||
|
||||
config = lib.mkIf (root.enable && cfg.enable) {
|
||||
home.packages = [ oriongtk ];
|
||||
|
||||
@@ -8,7 +8,9 @@
|
||||
{
|
||||
imports = [ inputs.zen-browser.homeModules.beta ];
|
||||
|
||||
options.chiasson.home.browsers.zen.enable = lib.mkEnableOption "Zen Browser + locked-down policies / extensions.";
|
||||
options.chiasson.home.browsers.zen.enable = lib.mkEnableOption "Zen Browser + locked-down policies / extensions." // {
|
||||
default = false;
|
||||
};
|
||||
|
||||
config = lib.mkIf (root.enable && cfg.enable) {
|
||||
programs.zen-browser = {
|
||||
|
||||
+28
-10
@@ -1,22 +1,21 @@
|
||||
# HM side of the flake; option tree is `chiasson.home.*` (docs/conventions.md).
|
||||
{ self, inputs, ... }: {
|
||||
# Root module: chiasson.home.enable + bash. Other `wisdom*` slices auto-wire via
|
||||
# `lib.wisdomCatalogExtraModules`; hosts flip `chiasson.home.*.enable` rather than re-importing.
|
||||
# Root module: chiasson.home.enable + git identity. Other `wisdom*` slices (including
|
||||
# the bash shell) auto-wire via `lib.wisdomCatalogExtraModules`; hosts flip
|
||||
# `chiasson.home.*.enable` rather than re-importing.
|
||||
flake.homeManagerModules.wisdom =
|
||||
{ config, lib, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.chiasson.home;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
self.homeManagerModules.wisdomShellBash
|
||||
];
|
||||
|
||||
options.chiasson.home = {
|
||||
enable = lib.mkEnableOption ''
|
||||
enable =
|
||||
lib.mkEnableOption ''
|
||||
HM profile root for this flake (bash on by default). Desktop hosts use
|
||||
`lib.wisdomCatalogExtraModules` once per user and flip `chiasson.home.*.enable` on the host.
|
||||
'' // {
|
||||
''
|
||||
// {
|
||||
default = true;
|
||||
};
|
||||
|
||||
@@ -29,6 +28,25 @@
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable { home.packages = cfg.extraPackages; };
|
||||
config = lib.mkIf cfg.enable (
|
||||
lib.mkMerge [
|
||||
{ home.packages = cfg.extraPackages; }
|
||||
|
||||
# Base git identity + encryption/player tools shared by every HM user.
|
||||
{
|
||||
programs.git = {
|
||||
enable = true;
|
||||
settings.user = {
|
||||
name = "OlivierChiasson";
|
||||
email = "olivierchiasson@hotmail.fr";
|
||||
};
|
||||
};
|
||||
home.packages = [
|
||||
pkgs.git-crypt
|
||||
pkgs.feishin
|
||||
];
|
||||
}
|
||||
]
|
||||
);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -12,7 +12,9 @@
|
||||
enable = lib.mkEnableOption ''
|
||||
WhiteSur GTK + icon themes, Phinger cursor, and Qt via qt6ct (DMS) or KDE platform theme.
|
||||
Matugen accent colors load via gtk3/gtk4 extraCss when matugenGtkColors is enabled.
|
||||
'';
|
||||
'' // {
|
||||
default = true;
|
||||
};
|
||||
|
||||
matugenGtkColors = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
|
||||
@@ -13,11 +13,13 @@
|
||||
{
|
||||
options.chiasson.home.desktop.screenshot.enable = lib.mkEnableOption ''
|
||||
grim/slurp/swappy + SwiftShare helpers; Hyprland binds if HM Hyprland is on.
|
||||
'';
|
||||
'' // {
|
||||
default = true;
|
||||
};
|
||||
|
||||
options.chiasson.home.desktop.screenshot.swiftshareApiKeyFile = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = null;
|
||||
default = "/run/secrets/swiftshare/API_KEY";
|
||||
description = ''
|
||||
File with SwiftShare API key (sops path is fine). Required when screenshot module is on.
|
||||
'';
|
||||
|
||||
@@ -33,7 +33,9 @@
|
||||
in
|
||||
{
|
||||
options.chiasson.home.editors.cursor = {
|
||||
enable = lib.mkEnableOption "Cursor editor from the `cursor` flake input.";
|
||||
enable = lib.mkEnableOption "Cursor editor from the `cursor` flake input." // {
|
||||
default = true;
|
||||
};
|
||||
setAsDefaultEditor = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
|
||||
@@ -1,17 +1,8 @@
|
||||
{ ... }: {
|
||||
flake.homeManagerModules.wisdomEditorsKate =
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
root = config.chiasson.home;
|
||||
cfg = config.chiasson.home.editors.kate;
|
||||
in
|
||||
{
|
||||
options.chiasson.home.editors.kate.enable = lib.mkEnableOption "Kate.";
|
||||
|
||||
config = lib.mkIf (root.enable && cfg.enable) {
|
||||
home.packages = lib.optional (
|
||||
lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kdePackages.kate
|
||||
) pkgs.kdePackages.kate;
|
||||
};
|
||||
{ self, ... }: {
|
||||
flake.homeManagerModules.wisdomEditorsKate = self.lib.wisdomSlice {
|
||||
path = "editors.kate";
|
||||
default = false;
|
||||
description = "Kate.";
|
||||
packages = pkgs: [ pkgs.kdePackages.kate ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,19 +1,8 @@
|
||||
{ ... }: {
|
||||
flake.homeManagerModules.wisdomEditorsObsidian =
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
root = config.chiasson.home;
|
||||
cfg = config.chiasson.home.editors.obsidian;
|
||||
in
|
||||
{
|
||||
options.chiasson.home.editors.obsidian.enable = lib.mkEnableOption ''
|
||||
Obsidian (unfree); skipped if unavailable here.
|
||||
'';
|
||||
|
||||
config = lib.mkIf (root.enable && cfg.enable) {
|
||||
home.packages = lib.optional (
|
||||
lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.obsidian
|
||||
) pkgs.obsidian;
|
||||
};
|
||||
{ self, ... }: {
|
||||
flake.homeManagerModules.wisdomEditorsObsidian = self.lib.wisdomSlice {
|
||||
path = "editors.obsidian";
|
||||
default = true;
|
||||
description = "Obsidian (unfree); skipped if unavailable here.";
|
||||
packages = pkgs: [ pkgs.obsidian ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,100 @@
|
||||
# Visual Studio Code (Microsoft build, unfree). Default extensions + settings shared by all
|
||||
# hosts; per-host extras (peacock, comment-anchors, project-manager) go via
|
||||
# `chiasson.home.editors.vscode.extensions`.
|
||||
{ self, ... }: {
|
||||
flake.homeManagerModules.wisdomEditorsVscode =
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
root = config.chiasson.home;
|
||||
cfg = config.chiasson.home.editors.vscode;
|
||||
|
||||
defaultExtensions = with pkgs.vscode-extensions; [
|
||||
jnoortheen.nix-ide
|
||||
yzhang.markdown-all-in-one
|
||||
esbenp.prettier-vscode
|
||||
vscjava.vscode-java-pack
|
||||
redhat.java
|
||||
];
|
||||
|
||||
# Wrap VS Code so a JDK is on PATH — the Red Hat Java language server (and
|
||||
# other extension-bundled JVMs) need `java` to run, independent of the
|
||||
# per-project `java.configuration.runtimes` setting.
|
||||
vscodeWithJdk = pkgs.symlinkJoin {
|
||||
name = "vscode-with-jdk";
|
||||
paths = [ pkgs.vscode ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
postBuild = ''
|
||||
wrapProgram "$out/bin/code" \
|
||||
--prefix PATH : "${pkgs.jdk25}/bin"
|
||||
'';
|
||||
};
|
||||
|
||||
coreSettings = {
|
||||
"nix.enableLanguageServer" = true;
|
||||
"nix.serverPath" = "nixd";
|
||||
"nix.serverSettings" = {
|
||||
nixd = {
|
||||
formatting = {
|
||||
command = "nixfmt";
|
||||
};
|
||||
};
|
||||
};
|
||||
"diffEditor.ignoreTrimWhitespace" = false;
|
||||
"chat.disableAIFeatures" = true;
|
||||
|
||||
"java.configuration.runtimes" = [
|
||||
{
|
||||
name = "JavaSE-21";
|
||||
path = "${pkgs.jdk21}/lib/openjdk";
|
||||
}
|
||||
{
|
||||
name = "JavaSE-25";
|
||||
path = "${pkgs.jdk25}/lib/openjdk";
|
||||
default = true;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
# Seed a *writable* settings.json (not a store symlink) so extensions like
|
||||
# kilo-code can edit it at runtime. `force = false` in the config means HM
|
||||
# only writes it when absent, preserving kilo's later edits across `switch`.
|
||||
settingsJson = pkgs.writeText "vscode-user-settings" (
|
||||
builtins.toJSON coreSettings
|
||||
);
|
||||
in
|
||||
{
|
||||
options.chiasson.home.editors.vscode = {
|
||||
enable = lib.mkEnableOption ''
|
||||
Visual Studio Code (Microsoft build; needs `nixpkgs.config.allowUnfree`). Core
|
||||
extensions (nix-ide, markdown-all-in-one, prettier) + nixd/nixfmt settings are included.
|
||||
'' // {
|
||||
default = false;
|
||||
};
|
||||
|
||||
extensions = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.package;
|
||||
default = [ ];
|
||||
description = ''
|
||||
Extra extensions not wanted on every host (e.g. peacock, comment-anchors,
|
||||
project-manager). Per-host via `chiasson.users.extraModules`.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf (root.enable && cfg.enable) {
|
||||
home.packages = [ ];
|
||||
|
||||
# Writable, seed-once user settings (kilo-code can append to it).
|
||||
home.file.".config/Code/User/settings.json" = {
|
||||
source = settingsJson;
|
||||
force = false;
|
||||
};
|
||||
|
||||
programs.vscode = {
|
||||
enable = true;
|
||||
package = vscodeWithJdk;
|
||||
extensions = defaultExtensions ++ cfg.extensions;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -8,7 +8,9 @@
|
||||
{
|
||||
options.chiasson.home.filebrowsers.nemo.enable = lib.mkEnableOption ''
|
||||
Nemo file manager (GTK). Colors come from DMS matugen via GTK settings — no KDE/Qt bridge needed.
|
||||
'';
|
||||
'' // {
|
||||
default = true;
|
||||
};
|
||||
|
||||
config = lib.mkIf (root.enable && cfg.enable) {
|
||||
home.packages = [ pkgs.nemo ];
|
||||
|
||||
@@ -8,7 +8,9 @@
|
||||
{
|
||||
options.chiasson.home.hardware.uconsoleGamepad.enable = lib.mkEnableOption ''
|
||||
uConsole gamepad antimicrox profile + Hyprland exec-once when HM Hyprland is on.
|
||||
'';
|
||||
'' // {
|
||||
default = false;
|
||||
};
|
||||
|
||||
config = lib.mkIf (root.enable && cfg.enable) (lib.mkMerge [
|
||||
{
|
||||
|
||||
@@ -8,7 +8,9 @@
|
||||
in
|
||||
{
|
||||
options.chiasson.home.shell.fish = {
|
||||
enable = lib.mkEnableOption "Fish + grc, quiet greeting, rbw SSH socket defaults.";
|
||||
enable = lib.mkEnableOption "Fish + grc, quiet greeting, rbw SSH socket defaults." // {
|
||||
default = true;
|
||||
};
|
||||
|
||||
nixYourShell = {
|
||||
enable = lib.mkEnableOption ''
|
||||
|
||||
@@ -7,7 +7,9 @@
|
||||
in
|
||||
{
|
||||
options.chiasson.home.shell.ohMyPosh = {
|
||||
enable = lib.mkEnableOption "[Oh My Posh](https://ohmyposh.dev/) prompt.";
|
||||
enable = lib.mkEnableOption "[Oh My Posh](https://ohmyposh.dev/) prompt." // {
|
||||
default = true;
|
||||
};
|
||||
|
||||
builtinTheme = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
|
||||
@@ -7,7 +7,9 @@
|
||||
cfg = config.chiasson.home.shell.yazi;
|
||||
in
|
||||
{
|
||||
options.chiasson.home.shell.yazi.enable = lib.mkEnableOption "Yazi as `y` + 7zz with rar.";
|
||||
options.chiasson.home.shell.yazi.enable = lib.mkEnableOption "Yazi as `y` + 7zz with rar." // {
|
||||
default = true;
|
||||
};
|
||||
|
||||
config = lib.mkIf (root.enable && cfg.enable) {
|
||||
programs.yazi = {
|
||||
|
||||
@@ -15,7 +15,9 @@
|
||||
{
|
||||
options.chiasson.home.terminals.kitty.enable = lib.mkEnableOption ''
|
||||
Kitty + DMS includes; activation strips `*-theme.auto.conf` so matugen colors stick.
|
||||
'';
|
||||
'' // {
|
||||
default = true;
|
||||
};
|
||||
|
||||
config = lib.mkIf (root.enable && cfg.enable) {
|
||||
programs.kitty = {
|
||||
|
||||
Reference in New Issue
Block a user