Compare commits
12 Commits
13f35677be
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 6b8fa60540 | |||
| 86dc80eb3c | |||
| f1bd5146a3 | |||
| 6f35d60aab | |||
| 3d2e74d115 | |||
| 548a438f6a | |||
| 0939766e3a | |||
| f424ab98c7 | |||
| 15a4d8d5e8 | |||
| 5f7e9cada5 | |||
| c4a0eb0a98 | |||
| 103a485bf8 |
+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/`.
|
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
|
## 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`.
|
Fleet deploy is [Navi](https://github.com/cafkafk/navi) — config in `modules/deploy/navi.nix`, outputs `flake.navi` / `flake.naviHive`.
|
||||||
|
|
||||||
```bash
|
```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 --on <host>
|
||||||
navi apply-local --node 14900k --sudo # this machine, if hostname matches
|
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>`.
|
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/
|
modules/
|
||||||
hosts/<host>/ # per-machine composition
|
hosts/<host>/ # per-machine composition
|
||||||
system/ # nixosModules.system aggregate
|
system/ # nixosModules.system aggregate
|
||||||
desktop/ # GUI stack
|
desktop/ # GUI stack (niri, hyprland, plasma, DMS)
|
||||||
wisdom/ # HM modules (exports still named wisdom*)
|
wisdom/ # HM modules (exports still named wisdom*)
|
||||||
ssh/ # inbound NixOS + outbound HM
|
ssh/ # inbound NixOS + outbound HM
|
||||||
deploy/ # navi hive
|
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.
|
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 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`, and set the slice's own `enable` default (`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).
|
**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.
|
**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, ... }: {
|
{ 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/`.
|
|
||||||
flake.lib.wisdomCatalogExtraModules =
|
flake.lib.wisdomCatalogExtraModules =
|
||||||
self:
|
self:
|
||||||
let
|
let
|
||||||
names = lib.sort builtins.lessThan (
|
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
|
builtins.attrNames self.homeManagerModules
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
in
|
in
|
||||||
map (name: self.homeManagerModules.${name}) names;
|
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 =
|
flake.nixosModules.desktopOptions =
|
||||||
{ config, options, lib, pkgs, self, inputs, ... }:
|
{ config, options, lib, pkgs, self, inputs, ... }:
|
||||||
let
|
let
|
||||||
|
|||||||
@@ -1,25 +1,15 @@
|
|||||||
# Monitor layout for 14900k.
|
# Monitor layout for 14900k.
|
||||||
# NVIDIA (default): DP-3 ultrawide, HDMI-A-3 + DP-4 side/top stack; DP-2 virtual 4K when streamingDisplay enabled.
|
# 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 Samsung to the left.
|
# Intel iGPU (gpu passthru): DP-1 ultrawide, HDMI-A-2 to the left.
|
||||||
# Niri: `extraSettings` (KDL via `extraConfig`, other wrapper-modules keys) + `extraBinds` (merged keybinds).
|
# Niri uses `extraSettings.extraConfig`; Hyprland uses `chiasson.desktop.hyprland.settings`.
|
||||||
# Hyprland: `chiasson.desktop.hyprland.settings` (merged in HM when `chiasson.desktop.hyprland.enable`).
|
|
||||||
|
|
||||||
#TODO[epic=Moderate] Clean this up, move to host's configuration.nix.
|
#TODO[epic=Moderate] Clean this up, move to host's configuration.nix.
|
||||||
{ config, lib, ... }:
|
{ config, lib, ... }:
|
||||||
let
|
let
|
||||||
|
streamingDisplay = config.chiasson.system.streamingDisplay;
|
||||||
gpuPassthru = config.chiasson.system.gpuPassthru.enable;
|
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 =
|
niriOutputs =
|
||||||
(if gpuPassthru then
|
(if gpuPassthru then
|
||||||
''
|
''
|
||||||
@@ -54,48 +44,30 @@ let
|
|||||||
position x=0 y=-1080
|
position x=0 y=-1080
|
||||||
}
|
}
|
||||||
'')
|
'')
|
||||||
+ virtualOutputNiri;
|
+ lib.optionalString streamingDisplay.enable ''
|
||||||
|
output "${streamingDisplay.connector}" {
|
||||||
virtualOutputHyprland =
|
mode "${streamingDisplay.mode}"
|
||||||
lib.optionalString streamingDisplay
|
scale ${toString streamingDisplay.niriScale}
|
||||||
"${streamingCfg.connector}, ${streamingCfg.mode}, 7680x0, ${toString (streamingCfg.niriScale or 1.0)}";
|
position ${streamingDisplay.niriPosition}
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
|
||||||
|
# Hyprland monitor strings, with the virtual panel appended when enabled.
|
||||||
hyprlandMonitors =
|
hyprlandMonitors =
|
||||||
(if gpuPassthru then
|
(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
|
else
|
||||||
[
|
[ "DP-3, 2560x1080@144, 0x0, 1" "DP-4, 1920x1080@144, 0x-1080, 1" "HDMI-A-3, 1920x1080@60, -1920x0, 1" ])
|
||||||
"DP-3, 2560x1080@144, 0x0, 1"
|
++ lib.optional streamingDisplay.enable "${streamingDisplay.connector}, ${streamingDisplay.mode}, 7680x0, ${toString streamingDisplay.niriScale}";
|
||||||
"DP-4, 1920x1080@144, 0x-1080, 1"
|
|
||||||
"HDMI-A-3, 1920x1080@60, -1920x0, 1"
|
|
||||||
])
|
|
||||||
++ lib.optional streamingDisplay virtualOutputHyprland;
|
|
||||||
|
|
||||||
hyprlandWorkspaces =
|
hyprlandWorkspaces =
|
||||||
if gpuPassthru then
|
if gpuPassthru then
|
||||||
[
|
[ "1, monitor:DP-1, default:true" "2, monitor:DP-1" "3, monitor:DP-1"
|
||||||
"1, monitor:DP-1, default:true"
|
"4, monitor:HDMI-A-2, default:true" "5, monitor:HDMI-A-2" "6, monitor:HDMI-A-2" ]
|
||||||
"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
|
else
|
||||||
[
|
[ "1, monitor:DP-3, default:true" "2, monitor:DP-3" "3, monitor:DP-3"
|
||||||
"1, monitor:DP-3, default:true"
|
"4, monitor:HDMI-A-3, default:true" "5, monitor:HDMI-A-3" "6, monitor:HDMI-A-3"
|
||||||
"2, monitor:DP-3"
|
"7, monitor:DP-4" "8, monitor:DP-4" "9, monitor:DP-4" ];
|
||||||
"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
|
in
|
||||||
{
|
{
|
||||||
chiasson.desktop.niri.extraSettings = {
|
chiasson.desktop.niri.extraSettings = {
|
||||||
@@ -103,10 +75,7 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
chiasson.desktop.niri.extraBinds."XF86Tools".spawn = [
|
chiasson.desktop.niri.extraBinds."XF86Tools".spawn = [
|
||||||
"wpctl"
|
"wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"
|
||||||
"set-mute"
|
|
||||||
"@DEFAULT_AUDIO_SOURCE@"
|
|
||||||
"toggle"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
chiasson.desktop.hyprland.settings = lib.mkIf config.chiasson.desktop.hyprland.enable {
|
chiasson.desktop.hyprland.settings = lib.mkIf config.chiasson.desktop.hyprland.enable {
|
||||||
|
|||||||
@@ -1,9 +1,5 @@
|
|||||||
# Extra local disks. Declared here, not in hardware.nix (hardware.nix is generated).
|
# Extra local disks. Declared here, not in hardware.nix (hardware.nix is generated).
|
||||||
{ config, lib, ... }:
|
{ 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;
|
users.users.olivier.uid = lib.mkDefault 1000;
|
||||||
# LABEL="MediaLibrary" (btrfs on sda1 by UUID). No subvol=@ — this disk has no @ subvolume.
|
# 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:
|
# LABEL="Deep Storage Unit". Owner olivier, group nfsmedia (990) so:
|
||||||
# - local logins write as user 1000 (owner rwx);
|
# - local logins write as user 1000 (owner rwx);
|
||||||
# - NFS (all_squash → uid/gid 990) matches group 990 → rwx (see jellyfin-nfs-export).
|
# - 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.
|
# 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
|
# video=<connector>:e force-enables the connector
|
||||||
# drm.edid_firmware=<connector>:… loads modes from the EDID blob
|
# drm.edid_firmware=<connector>:… loads modes from the EDID blob
|
||||||
#
|
#
|
||||||
# Pick a connector that is disconnected on the host (check after boot):
|
# Capture is pinned to the connector by name (Sunshine `output_name`), which is
|
||||||
# grep -H . /sys/class/drm/card*-*/status
|
# stable across reboots/hotplug — unlike a numeric monitor index.
|
||||||
#
|
# Reboot after changing connector or EDID. 4K@60 is realistic on RTX 2070.
|
||||||
# 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).
|
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
let
|
let
|
||||||
cfg = config.chiasson.system.streamingDisplay;
|
cfg = config.chiasson.system.streamingDisplay;
|
||||||
@@ -16,14 +14,13 @@ let
|
|||||||
edidFirmware = pkgs.runCommand "sunshine-virtual-4k-edid" {
|
edidFirmware = pkgs.runCommand "sunshine-virtual-4k-edid" {
|
||||||
nativeBuildInputs = [ pkgs.python3 ];
|
nativeBuildInputs = [ pkgs.python3 ];
|
||||||
} ''
|
} ''
|
||||||
${pkgs.python3}/bin/python3 ${./generate-virtual-edid.py} $TMPDIR/${cfg.edidFileName}
|
|
||||||
mkdir -p $out/lib/firmware/edid
|
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").
|
# On stream start: scale + focus the virtual 4K output so streamed windows
|
||||||
# If the index drifts after hotplug, check:
|
# land there. Capture is pinned to the connector via Sunshine `output_name`,
|
||||||
# journalctl --user -u sunshine -b | rg 'Monitor [0-9]+ is'
|
# so no fragile numeric-index detection is needed.
|
||||||
streamDisplayUp = pkgs.writeShellScriptBin "stream-display-up" ''
|
streamDisplayUp = pkgs.writeShellScriptBin "stream-display-up" ''
|
||||||
${pkgs.niri}/bin/niri msg output ${cfg.connector} scale ${toString cfg.niriScale}
|
${pkgs.niri}/bin/niri msg output ${cfg.connector} scale ${toString cfg.niriScale}
|
||||||
${pkgs.niri}/bin/niri msg action focus-monitor ${cfg.connector}
|
${pkgs.niri}/bin/niri msg action focus-monitor ${cfg.connector}
|
||||||
@@ -87,18 +84,6 @@ in
|
|||||||
default = "DP-3";
|
default = "DP-3";
|
||||||
description = "Niri monitor to refocus when a Moonlight session ends.";
|
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 [
|
config = lib.mkIf cfg.enable (lib.mkMerge [
|
||||||
@@ -118,7 +103,11 @@ in
|
|||||||
(lib.mkIf config.chiasson.system.gaming.sunshine.enable {
|
(lib.mkIf config.chiasson.system.gaming.sunshine.enable {
|
||||||
services.sunshine.settings = {
|
services.sunshine.settings = {
|
||||||
capture = "wlr";
|
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\"}]";
|
global_prep_cmd = "[{\"do\":\"${streamDisplayUp}/bin/stream-display-up\",\"undo\":\"${streamDisplayDown}/bin/stream-display-down\"}]";
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -4,8 +4,6 @@
|
|||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit self inputs;
|
inherit self inputs;
|
||||||
host = "14900k";
|
|
||||||
system = "x86_64-linux";
|
|
||||||
};
|
};
|
||||||
modules = [
|
modules = [
|
||||||
self.nixosModules."14900kConfiguration"
|
self.nixosModules."14900kConfiguration"
|
||||||
|
|||||||
@@ -22,6 +22,14 @@
|
|||||||
spotify.openDiscoveryFirewall = true;
|
spotify.openDiscoveryFirewall = true;
|
||||||
pokeclicker.enable = true;
|
pokeclicker.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
editors.vscode = {
|
||||||
|
enable = true;
|
||||||
|
extensions = with pkgs.vscode-extensions; [
|
||||||
|
alefragnani.project-manager
|
||||||
|
johnpapa.vscode-peacock
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -42,12 +42,7 @@
|
|||||||
# rebuilds Mobile NixOS' script-loader against the patched mruby.
|
# rebuilds Mobile NixOS' script-loader against the patched mruby.
|
||||||
chiasson.system.ideapadMrubyOverlay.enable = true;
|
chiasson.system.ideapadMrubyOverlay.enable = true;
|
||||||
|
|
||||||
# Wi-Fi modem (qcom-wcn3990) + Bluetooth (QCA crnv32) need binary blobs.
|
# 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"
|
|
||||||
];
|
|
||||||
hardware.firmware = [ pkgs.chromeos-sc7180-unredistributable-firmware ];
|
hardware.firmware = [ pkgs.chromeos-sc7180-unredistributable-firmware ];
|
||||||
hardware.enableRedistributableFirmware = true;
|
hardware.enableRedistributableFirmware = true;
|
||||||
|
|
||||||
|
|||||||
@@ -4,8 +4,6 @@
|
|||||||
system = "aarch64-linux";
|
system = "aarch64-linux";
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit self inputs;
|
inherit self inputs;
|
||||||
host = "ideapad";
|
|
||||||
system = "aarch64-linux";
|
|
||||||
};
|
};
|
||||||
modules = [
|
modules = [
|
||||||
self.nixosModules.ideapadConfiguration
|
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";
|
system = "x86_64-linux";
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit self inputs;
|
inherit self inputs;
|
||||||
host = "nix-server";
|
|
||||||
system = "x86_64-linux";
|
|
||||||
};
|
};
|
||||||
modules = [
|
modules = [
|
||||||
self.nixosModules.nix-serverConfiguration
|
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-disk.nix
|
||||||
./_private/media-paths.nix
|
./_private/media-paths.nix
|
||||||
./_services/docker-media.nix
|
./_services/docker-media.nix
|
||||||
./_services/nixdesk-nfs-client.nix
|
self.nixosModules.nixdeskJellyfin
|
||||||
./_services/jellyfin.nix
|
./_services/jellyfin.nix
|
||||||
./_services/sonarr.nix
|
./_services/sonarr.nix
|
||||||
./_services/radarr.nix
|
./_services/radarr.nix
|
||||||
|
|||||||
@@ -3,8 +3,6 @@
|
|||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit self inputs;
|
inherit self inputs;
|
||||||
host = "r5500";
|
|
||||||
system = "x86_64-linux";
|
|
||||||
};
|
};
|
||||||
modules = [
|
modules = [
|
||||||
self.nixosModules.r5500Configuration
|
self.nixosModules.r5500Configuration
|
||||||
|
|||||||
@@ -4,8 +4,6 @@
|
|||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit self inputs;
|
inherit self inputs;
|
||||||
host = "t2mbp";
|
|
||||||
system = "x86_64-linux";
|
|
||||||
};
|
};
|
||||||
modules = [
|
modules = [
|
||||||
self.nixosModules.t2mbpConfiguration
|
self.nixosModules.t2mbpConfiguration
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{ self, inputs, ... }:
|
{ self, inputs, ... }:
|
||||||
{
|
{
|
||||||
flake.nixosModules.t2mbpHome =
|
flake.nixosModules.t2mbpHome =
|
||||||
{ self, ... }:
|
{ self, pkgs, ... }:
|
||||||
{
|
{
|
||||||
imports = [ self.nixosModules.desktopHomeBase ];
|
imports = [ self.nixosModules.desktopHomeBase ];
|
||||||
|
|
||||||
@@ -14,6 +14,14 @@
|
|||||||
discord.enable = true;
|
discord.enable = true;
|
||||||
pokeclicker.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 // {
|
specialArgs = inputs // {
|
||||||
inherit self;
|
inherit self;
|
||||||
inputs = inputs;
|
inputs = inputs;
|
||||||
host = "uConsole";
|
|
||||||
system = "aarch64-linux";
|
|
||||||
};
|
};
|
||||||
trustCaches = false;
|
trustCaches = false;
|
||||||
modules = [
|
modules = [
|
||||||
|
|||||||
@@ -1,13 +1,21 @@
|
|||||||
{ self, inputs, ... }:
|
{ self, inputs, ... }:
|
||||||
{
|
{
|
||||||
flake.nixosModules.uConsoleHome =
|
flake.nixosModules.uConsoleHome =
|
||||||
{ self, ... }:
|
{ self, pkgs, ... }:
|
||||||
{
|
{
|
||||||
imports = [ self.nixosModules.desktopHomeBase ];
|
imports = [ self.nixosModules.desktopHomeBase ];
|
||||||
|
|
||||||
chiasson.users.extraModules.olivier = [
|
chiasson.users.extraModules.olivier = [
|
||||||
{
|
{
|
||||||
chiasson.home.hardware.uconsoleGamepad.enable = true;
|
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 ];
|
++ lib.optionals pkgs.stdenv.isx86_64 [ heroic ];
|
||||||
|
|
||||||
steamExtraPkgs =
|
steamExtraPkgs =
|
||||||
if !cfg.steam.steamTinkerLaunch.enable then
|
lib.optional (cfg.steam.steamTinkerLaunch.enable && lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.steamtinkerlaunch) pkgs.steamtinkerlaunch;
|
||||||
[ ]
|
|
||||||
else
|
launcherSet = launcherPkgs ++ steamExtraPkgs ++ cfg.launchers.extraPackages;
|
||||||
lib.optional (lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.steamtinkerlaunch) pkgs.steamtinkerlaunch;
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.chiasson.system.gaming = {
|
options.chiasson.system.gaming = {
|
||||||
@@ -194,11 +193,11 @@
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
(lib.mkIf (cfg.launchers.forUsers == null) {
|
(lib.mkIf (cfg.launchers.forUsers == null) {
|
||||||
environment.systemPackages = launcherPkgs ++ steamExtraPkgs ++ cfg.launchers.extraPackages;
|
environment.systemPackages = launcherSet;
|
||||||
})
|
})
|
||||||
(lib.mkIf (cfg.launchers.forUsers != null) {
|
(lib.mkIf (cfg.launchers.forUsers != null) {
|
||||||
users.users = lib.genAttrs cfg.launchers.forUsers (_: {
|
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;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
{ ... }: {
|
{ self, ... }: {
|
||||||
flake.nixosModules.systemLocalsend =
|
flake.nixosModules.systemLocalsend =
|
||||||
{ config, lib, ... }:
|
{ config, lib, ... }:
|
||||||
let
|
let
|
||||||
@@ -19,25 +19,10 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
flake.homeManagerModules.wisdomAppsLocalsend =
|
flake.homeManagerModules.wisdomAppsLocalsend = self.lib.wisdomSlice {
|
||||||
{ config, lib, pkgs, ... }:
|
path = "apps.localsend";
|
||||||
let
|
default = true;
|
||||||
root = config.chiasson.home;
|
description = "LocalSend client; open the firewall on NixOS with `system.localsend` if you want inbound.";
|
||||||
cfg = config.chiasson.home.apps.localsend;
|
packages = pkgs: [ pkgs.localsend ];
|
||||||
in
|
};
|
||||||
{
|
|
||||||
options.chiasson.home.apps.localsend = {
|
|
||||||
enable = lib.mkEnableOption ''
|
|
||||||
LocalSend client; open the firewall on NixOS with `system.localsend` if you want inbound.
|
|
||||||
'' // {
|
|
||||||
default = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
package = lib.mkPackageOption pkgs "localsend" { };
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf (root.enable && cfg.enable) {
|
|
||||||
home.packages = [ cfg.package ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,18 +1,8 @@
|
|||||||
{ ... }: {
|
{ self, ... }: {
|
||||||
flake.homeManagerModules.wisdomAppsPokeclicker =
|
flake.homeManagerModules.wisdomAppsPokeclicker = self.lib.wisdomSlice {
|
||||||
{ config, lib, pkgs, ... }:
|
path = "apps.pokeclicker";
|
||||||
let
|
default = false;
|
||||||
root = config.chiasson.home;
|
description = "PokéClicker desktop (Farigh fork .deb → nix).";
|
||||||
cfg = config.chiasson.home.apps.pokeclicker;
|
packages = pkgs: [ (pkgs.callPackage ./package { }) ];
|
||||||
pokeclickerPkg = pkgs.callPackage ./package { };
|
};
|
||||||
in
|
|
||||||
{
|
|
||||||
options.chiasson.home.apps.pokeclicker.enable = lib.mkEnableOption "PokéClicker desktop (Farigh fork .deb → nix)." // {
|
|
||||||
default = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf (root.enable && cfg.enable) {
|
|
||||||
home.packages = [ pokeclickerPkg ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,21 +1,8 @@
|
|||||||
{ ... }: {
|
{ self, ... }: {
|
||||||
flake.homeManagerModules.wisdomBrowsersChrome =
|
flake.homeManagerModules.wisdomBrowsersChrome = self.lib.wisdomSlice {
|
||||||
{ config, lib, pkgs, ... }:
|
path = "browsers.chrome";
|
||||||
let
|
default = false;
|
||||||
root = config.chiasson.home;
|
description = "Chrome (unfree, needs `allowUnfree`); skipped if nixpkgs has no build for this platform.";
|
||||||
cfg = config.chiasson.home.browsers.chrome;
|
packages = pkgs: [ pkgs.google-chrome ];
|
||||||
in
|
};
|
||||||
{
|
|
||||||
options.chiasson.home.browsers.chrome.enable = lib.mkEnableOption ''
|
|
||||||
Chrome (unfree, needs `allowUnfree`); skipped if nixpkgs has no build for this platform.
|
|
||||||
'' // {
|
|
||||||
default = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf (root.enable && cfg.enable) {
|
|
||||||
home.packages = lib.optional (
|
|
||||||
lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.google-chrome
|
|
||||||
) pkgs.google-chrome;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,25 +5,43 @@
|
|||||||
cfg = config.chiasson.system.chromiumHevc;
|
cfg = config.chiasson.system.chromiumHevc;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.chiasson.system.chromiumHevc.enable = lib.mkEnableOption ''
|
options.chiasson.system.chromiumHevc = {
|
||||||
VA-API packages for Chromium HEVC (Intel iHD + optional NVIDIA nvidia-vaapi-driver).
|
enable = lib.mkEnableOption ''
|
||||||
Pair with `wisdomBrowsersChromiumHevc` on the user side.
|
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 {
|
config = lib.mkIf cfg.enable {
|
||||||
hardware.graphics.enable = lib.mkDefault true;
|
hardware.graphics.enable = lib.mkDefault true;
|
||||||
hardware.graphics.extraPackages = lib.mkAfter (
|
hardware.graphics.extraPackages = lib.mkAfter (
|
||||||
with pkgs;
|
lib.optionals (cfg.gpu == "nvidia") [
|
||||||
[ nvidia-vaapi-driver ]
|
pkgs.nvidia-vaapi-driver
|
||||||
|
]
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
flake.homeManagerModules.wisdomBrowsersChromiumHevc =
|
flake.homeManagerModules.wisdomBrowsersChromiumHevc =
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, osConfig ? { }, ... }:
|
||||||
let
|
let
|
||||||
root = config.chiasson.home;
|
root = config.chiasson.home;
|
||||||
cfg = config.chiasson.home.browsers.chromiumHevc;
|
cfg = config.chiasson.home.browsers.chromiumHevc;
|
||||||
|
gpu = lib.attrByPath [ "chiasson" "system" "chromiumHevc" "gpu" ] "intel" osConfig;
|
||||||
|
|
||||||
browserCatalog = {
|
browserCatalog = {
|
||||||
"google-chrome" = {
|
"google-chrome" = {
|
||||||
@@ -53,7 +71,6 @@
|
|||||||
intel = {
|
intel = {
|
||||||
driver = "iHD";
|
driver = "iHD";
|
||||||
drmDevice = "/dev/dri/renderD128";
|
drmDevice = "/dev/dri/renderD128";
|
||||||
nvdBackend = "direct";
|
|
||||||
enableFeatures = [
|
enableFeatures = [
|
||||||
"VaapiVideoDecodeLinuxGL"
|
"VaapiVideoDecodeLinuxGL"
|
||||||
"VaapiVideoDecoder"
|
"VaapiVideoDecoder"
|
||||||
@@ -69,7 +86,6 @@
|
|||||||
nvidia = {
|
nvidia = {
|
||||||
driver = "nvidia";
|
driver = "nvidia";
|
||||||
drmDevice = "/dev/dri/renderD129";
|
drmDevice = "/dev/dri/renderD129";
|
||||||
nvdBackend = "direct";
|
|
||||||
enableFeatures = [
|
enableFeatures = [
|
||||||
"VaapiVideoDecoder"
|
"VaapiVideoDecoder"
|
||||||
"VaapiIgnoreDriverChecks"
|
"VaapiIgnoreDriverChecks"
|
||||||
@@ -85,7 +101,30 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
activeGpu = gpuProfiles.${cfg.vaapi.gpu};
|
activeGpu = gpuProfiles.${gpu};
|
||||||
|
enableFeatures = lib.concatStringsSep "," activeGpu.enableFeatures;
|
||||||
|
disableFeatures = lib.concatStringsSep "," activeGpu.disableFeatures;
|
||||||
|
|
||||||
|
mkDesktopItem =
|
||||||
|
spec:
|
||||||
|
pkgs.makeDesktopItem {
|
||||||
|
name = spec.launcher;
|
||||||
|
desktopName = spec.desktopName;
|
||||||
|
genericName = "Web Browser";
|
||||||
|
exec = "${spec.launcher} %U";
|
||||||
|
icon = spec.icon;
|
||||||
|
categories = [
|
||||||
|
"Network"
|
||||||
|
"WebBrowser"
|
||||||
|
];
|
||||||
|
mimeTypes = [
|
||||||
|
"text/html"
|
||||||
|
"text/xml"
|
||||||
|
"application/xhtml+xml"
|
||||||
|
"x-scheme-handler/http"
|
||||||
|
"x-scheme-handler/https"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
mkChromiumHevc =
|
mkChromiumHevc =
|
||||||
packageName:
|
packageName:
|
||||||
@@ -93,26 +132,7 @@
|
|||||||
spec = browserCatalog.${packageName};
|
spec = browserCatalog.${packageName};
|
||||||
browser = spec.package;
|
browser = spec.package;
|
||||||
launcherName = spec.launcher;
|
launcherName = spec.launcher;
|
||||||
enableFeatures = lib.concatStringsSep "," activeGpu.enableFeatures;
|
desktopItem = mkDesktopItem spec;
|
||||||
disableFeatures = lib.concatStringsSep "," activeGpu.disableFeatures;
|
|
||||||
desktopItem = pkgs.makeDesktopItem {
|
|
||||||
name = launcherName;
|
|
||||||
desktopName = spec.desktopName;
|
|
||||||
genericName = "Web Browser";
|
|
||||||
exec = "${launcherName} %U";
|
|
||||||
icon = spec.icon;
|
|
||||||
categories = [
|
|
||||||
"Network"
|
|
||||||
"WebBrowser"
|
|
||||||
];
|
|
||||||
mimeTypes = [
|
|
||||||
"text/html"
|
|
||||||
"text/xml"
|
|
||||||
"application/xhtml+xml"
|
|
||||||
"x-scheme-handler/http"
|
|
||||||
"x-scheme-handler/https"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
in
|
in
|
||||||
pkgs.runCommand launcherName
|
pkgs.runCommand launcherName
|
||||||
{
|
{
|
||||||
@@ -126,7 +146,7 @@
|
|||||||
makeWrapper ${browser}/bin/${spec.binary} $out/bin/${launcherName} \
|
makeWrapper ${browser}/bin/${spec.binary} $out/bin/${launcherName} \
|
||||||
--set LIBVA_DRIVER_NAME ${lib.escapeShellArg activeGpu.driver} \
|
--set LIBVA_DRIVER_NAME ${lib.escapeShellArg activeGpu.driver} \
|
||||||
--set LIBVA_DRM_DEVICE ${lib.escapeShellArg activeGpu.drmDevice} \
|
--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 "--enable-features=${enableFeatures}" \
|
||||||
--add-flags "--disable-features=${disableFeatures}" \
|
--add-flags "--disable-features=${disableFeatures}" \
|
||||||
${lib.concatMapStringsSep " " (a: "--add-flags ${lib.escapeShellArg a}") cfg.extraCommandLineArgs}
|
${lib.concatMapStringsSep " " (a: "--add-flags ${lib.escapeShellArg a}") cfg.extraCommandLineArgs}
|
||||||
@@ -136,50 +156,30 @@
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
selectedPackages = lib.filter (
|
selectedPackages = lib.filter (
|
||||||
name:
|
name: lib.meta.availableOn pkgs.stdenv.hostPlatform browserCatalog.${name}.package
|
||||||
let
|
|
||||||
spec = browserCatalog.${name};
|
|
||||||
in
|
|
||||||
lib.meta.availableOn pkgs.stdenv.hostPlatform spec.package
|
|
||||||
) cfg.packages;
|
) cfg.packages;
|
||||||
|
|
||||||
wrappers = map mkChromiumHevc selectedPackages;
|
wrappers = map mkChromiumHevc selectedPackages;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.chiasson.home.browsers.chromiumHevc = {
|
options.chiasson.home.browsers.chromiumHevc = {
|
||||||
enable = lib.mkEnableOption ''
|
enable =
|
||||||
`google-chrome-hevc`: Chromium with VA-API HEVC for Jellyfin / MSE playback.
|
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
|
GPU stack comes from `chiasson.system.chromiumHevc.gpu` (default **intel**).
|
||||||
unsupported upstream (`nvidia-vaapi-driver` README) and fails with
|
Requires `chiasson.system.chromiumHevc.enable` on NixOS.
|
||||||
`failed Initialize()ing the frame pool` in Jellyfin.
|
''
|
||||||
|
// {
|
||||||
Requires `chiasson.system.chromiumHevc.enable` on NixOS.
|
default = true;
|
||||||
'' // {
|
};
|
||||||
default = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
packages = lib.mkOption {
|
packages = lib.mkOption {
|
||||||
type = lib.types.listOf (
|
type = lib.types.listOf (lib.types.enum (lib.attrNames browserCatalog));
|
||||||
lib.types.enum (lib.attrNames browserCatalog)
|
|
||||||
);
|
|
||||||
default = if pkgs.stdenv.hostPlatform.isAarch64 then [ "chromium" ] else [ "google-chrome" ];
|
default = if pkgs.stdenv.hostPlatform.isAarch64 then [ "chromium" ] else [ "google-chrome" ];
|
||||||
description = "Chromium-based browsers to wrap.";
|
description = "Chromium-based browsers to wrap.";
|
||||||
};
|
};
|
||||||
|
|
||||||
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.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
extraCommandLineArgs = lib.mkOption {
|
extraCommandLineArgs = lib.mkOption {
|
||||||
type = lib.types.listOf lib.types.str;
|
type = lib.types.listOf lib.types.str;
|
||||||
default = [ ];
|
default = [ ];
|
||||||
|
|||||||
@@ -1,19 +1,8 @@
|
|||||||
{ ... }: {
|
{ self, ... }: {
|
||||||
flake.homeManagerModules.wisdomBrowsersEdge =
|
flake.homeManagerModules.wisdomBrowsersEdge = self.lib.wisdomSlice {
|
||||||
{ config, lib, pkgs, ... }:
|
path = "browsers.edge";
|
||||||
let
|
default = false;
|
||||||
root = config.chiasson.home;
|
description = "Edge (unfree); skipped if unavailable on this platform.";
|
||||||
cfg = config.chiasson.home.browsers.edge;
|
packages = pkgs: [ pkgs.microsoft-edge ];
|
||||||
in
|
};
|
||||||
{
|
|
||||||
options.chiasson.home.browsers.edge.enable = lib.mkEnableOption "Edge (unfree); skipped if unavailable on this platform." // {
|
|
||||||
default = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf (root.enable && cfg.enable) {
|
|
||||||
home.packages = lib.optional (
|
|
||||||
lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.microsoft-edge
|
|
||||||
) pkgs.microsoft-edge;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,31 +1,31 @@
|
|||||||
{ ... }: {
|
{ self, ... }: {
|
||||||
flake.homeManagerModules.wisdomBrowsersFlow =
|
flake.homeManagerModules.wisdomBrowsersFlow = self.lib.wisdomSlice {
|
||||||
{ config, lib, pkgs, ... }:
|
path = "browsers.flow";
|
||||||
let
|
default = false;
|
||||||
root = config.chiasson.home;
|
description = "[Flow](https://github.com/MultiboxLabs/flow-browser) — upstream AppImage wrapped for NixOS.";
|
||||||
cfg = config.chiasson.home.browsers.flow;
|
packages =
|
||||||
|
pkgs:
|
||||||
|
let
|
||||||
|
pname = "flow-browser";
|
||||||
|
version = "0.11.0";
|
||||||
|
|
||||||
flow-browser =
|
suffix = if pkgs.stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64";
|
||||||
let
|
|
||||||
pname = "flow-browser";
|
|
||||||
version = "0.11.0";
|
|
||||||
|
|
||||||
suffix = if pkgs.stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64";
|
hash =
|
||||||
|
if pkgs.stdenv.hostPlatform.isAarch64 then
|
||||||
|
"sha256-rTRKbNyVRJAw7ZyDR6kx+XJ4rWmErZqA0b6LP9t5eOA="
|
||||||
|
else
|
||||||
|
"sha256-/Tca4uUBfgbZQEeXdYkCz6CWxqvCl40CQpACFry1k9s=";
|
||||||
|
|
||||||
hash =
|
src = pkgs.fetchurl {
|
||||||
if pkgs.stdenv.hostPlatform.isAarch64 then
|
url = "https://github.com/MultiboxLabs/flow-browser/releases/download/v${version}/flow-browser-${version}-${suffix}.AppImage";
|
||||||
"sha256-rTRKbNyVRJAw7ZyDR6kx+XJ4rWmErZqA0b6LP9t5eOA="
|
inherit hash;
|
||||||
else
|
};
|
||||||
"sha256-/Tca4uUBfgbZQEeXdYkCz6CWxqvCl40CQpACFry1k9s=";
|
|
||||||
|
|
||||||
src = pkgs.fetchurl {
|
appimageContents = pkgs.appimageTools.extractType2 { inherit pname version src; };
|
||||||
url = "https://github.com/MultiboxLabs/flow-browser/releases/download/v${version}/flow-browser-${version}-${suffix}.AppImage";
|
in
|
||||||
inherit hash;
|
[
|
||||||
};
|
(pkgs.appimageTools.wrapType2 {
|
||||||
|
|
||||||
appimageContents = pkgs.appimageTools.extractType2 { inherit pname version src; };
|
|
||||||
in
|
|
||||||
pkgs.appimageTools.wrapType2 {
|
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||||
@@ -45,25 +45,13 @@
|
|||||||
meta = {
|
meta = {
|
||||||
description = "Chromium-based browser (upstream AppImage)";
|
description = "Chromium-based browser (upstream AppImage)";
|
||||||
homepage = "https://github.com/MultiboxLabs/flow-browser";
|
homepage = "https://github.com/MultiboxLabs/flow-browser";
|
||||||
license = lib.licenses.gpl3Plus;
|
license = pkgs.lib.licenses.gpl3Plus;
|
||||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
sourceProvenance = with pkgs.lib.sourceTypes; [ binaryNativeCode ];
|
||||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||||
mainProgram = pname;
|
mainProgram = pname;
|
||||||
maintainers = [ ];
|
maintainers = [ ];
|
||||||
};
|
};
|
||||||
};
|
})
|
||||||
in
|
];
|
||||||
{
|
};
|
||||||
options.chiasson.home.browsers.flow.enable = lib.mkEnableOption ''
|
|
||||||
[Flow](https://github.com/MultiboxLabs/flow-browser) — upstream AppImage wrapped for NixOS.
|
|
||||||
'' // {
|
|
||||||
default = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf (root.enable && cfg.enable) {
|
|
||||||
home.packages = lib.optional (
|
|
||||||
lib.meta.availableOn pkgs.stdenv.hostPlatform flow-browser
|
|
||||||
) flow-browser;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
+29
-25
@@ -1,24 +1,23 @@
|
|||||||
# HM side of the flake; option tree is `chiasson.home.*` (docs/conventions.md).
|
# HM side of the flake; option tree is `chiasson.home.*` (docs/conventions.md).
|
||||||
{ self, inputs, ... }: {
|
{ self, inputs, ... }: {
|
||||||
# Root module: chiasson.home.enable + bash. Other `wisdom*` slices auto-wire via
|
# Root module: chiasson.home.enable + git identity. Other `wisdom*` slices (including
|
||||||
# `lib.wisdomCatalogExtraModules`; hosts flip `chiasson.home.*.enable` rather than re-importing.
|
# the bash shell) auto-wire via `lib.wisdomCatalogExtraModules`; hosts flip
|
||||||
|
# `chiasson.home.*.enable` rather than re-importing.
|
||||||
flake.homeManagerModules.wisdom =
|
flake.homeManagerModules.wisdom =
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
let
|
let
|
||||||
cfg = config.chiasson.home;
|
cfg = config.chiasson.home;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
|
||||||
self.homeManagerModules.wisdomShellBash
|
|
||||||
];
|
|
||||||
|
|
||||||
options.chiasson.home = {
|
options.chiasson.home = {
|
||||||
enable = lib.mkEnableOption ''
|
enable =
|
||||||
HM profile root for this flake (bash on by default). Desktop hosts use
|
lib.mkEnableOption ''
|
||||||
`lib.wisdomCatalogExtraModules` once per user and flip `chiasson.home.*.enable` on the host.
|
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;
|
''
|
||||||
};
|
// {
|
||||||
|
default = true;
|
||||||
|
};
|
||||||
|
|
||||||
extraPackages = lib.mkOption {
|
extraPackages = lib.mkOption {
|
||||||
type = lib.types.listOf lib.types.package;
|
type = lib.types.listOf lib.types.package;
|
||||||
@@ -29,20 +28,25 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable (lib.mkMerge [
|
config = lib.mkIf cfg.enable (
|
||||||
{ home.packages = cfg.extraPackages; }
|
lib.mkMerge [
|
||||||
|
{ home.packages = cfg.extraPackages; }
|
||||||
|
|
||||||
# Base git identity + encryption/player tools shared by every HM user.
|
# Base git identity + encryption/player tools shared by every HM user.
|
||||||
{
|
{
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.user = {
|
settings.user = {
|
||||||
name = "OlivierChiasson";
|
name = "OlivierChiasson";
|
||||||
email = "olivierchiasson@hotmail.fr";
|
email = "olivierchiasson@hotmail.fr";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
home.packages = [
|
||||||
home.packages = [ pkgs.git-crypt pkgs.feishin ];
|
pkgs.git-crypt
|
||||||
}
|
pkgs.feishin
|
||||||
]);
|
];
|
||||||
|
}
|
||||||
|
]
|
||||||
|
);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,19 +1,8 @@
|
|||||||
{ ... }: {
|
{ self, ... }: {
|
||||||
flake.homeManagerModules.wisdomEditorsKate =
|
flake.homeManagerModules.wisdomEditorsKate = self.lib.wisdomSlice {
|
||||||
{ config, lib, pkgs, ... }:
|
path = "editors.kate";
|
||||||
let
|
default = false;
|
||||||
root = config.chiasson.home;
|
description = "Kate.";
|
||||||
cfg = config.chiasson.home.editors.kate;
|
packages = pkgs: [ pkgs.kdePackages.kate ];
|
||||||
in
|
};
|
||||||
{
|
|
||||||
options.chiasson.home.editors.kate.enable = lib.mkEnableOption "Kate." // {
|
|
||||||
default = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf (root.enable && cfg.enable) {
|
|
||||||
home.packages = lib.optional (
|
|
||||||
lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kdePackages.kate
|
|
||||||
) pkgs.kdePackages.kate;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,21 +1,8 @@
|
|||||||
{ ... }: {
|
{ self, ... }: {
|
||||||
flake.homeManagerModules.wisdomEditorsObsidian =
|
flake.homeManagerModules.wisdomEditorsObsidian = self.lib.wisdomSlice {
|
||||||
{ config, lib, pkgs, ... }:
|
path = "editors.obsidian";
|
||||||
let
|
default = true;
|
||||||
root = config.chiasson.home;
|
description = "Obsidian (unfree); skipped if unavailable here.";
|
||||||
cfg = config.chiasson.home.editors.obsidian;
|
packages = pkgs: [ pkgs.obsidian ];
|
||||||
in
|
};
|
||||||
{
|
|
||||||
options.chiasson.home.editors.obsidian.enable = lib.mkEnableOption ''
|
|
||||||
Obsidian (unfree); skipped if unavailable here.
|
|
||||||
'' // {
|
|
||||||
default = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf (root.enable && cfg.enable) {
|
|
||||||
home.packages = lib.optional (
|
|
||||||
lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.obsidian
|
|
||||||
) 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;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf (root.enable && cfg.enable) {
|
config = lib.mkIf (root.enable && cfg.enable) {
|
||||||
home.packages = [pkgs.nemo];
|
home.packages = [ pkgs.nemo ];
|
||||||
|
|
||||||
xdg.mimeApps = {
|
xdg.mimeApps = {
|
||||||
enable = lib.mkDefault true;
|
enable = lib.mkDefault true;
|
||||||
|
|||||||
Reference in New Issue
Block a user