yanlin/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rearrange gnome system and home config

Browse source
This commit is contained in:
Yan Lin 2025-11-03 13:46:06 +01:00
parent a4720dcec9
commit 74946fcd6d
6 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hosts/nixos/deck/home.nix
View file

@ -10,11 +10,11 @@
../../../modules/syncthing.nix ../../../modules/syncthing.nix
../../../modules/firefox.nix ../../../modules/firefox.nix
../../../modules/ghostty.nix ../../../modules/ghostty.nix
../../../modules/gnome.nix ../../../modules/gnome/home.nix
]; ];
# Always show GNOME top bar on Steam Deck # Always show GNOME top bar on Steam Deck
gnome-custom.alwaysShowTopBar = true; gnome-home-custom.alwaysShowTopBar = true;
# Disable Documents sync on Steam Deck (save space) # Disable Documents sync on Steam Deck (save space)
syncthing-custom.enabledFolders = [ "Credentials" "Obsidian" ]; syncthing-custom.enabledFolders = [ "Credentials" "Obsidian" ];

4
hosts/nixos/deck/system.nix
View file

@ -5,13 +5,13 @@
./hardware-configuration.nix ./hardware-configuration.nix
./disk-config.nix ./disk-config.nix
../system-default.nix # Common NixOS system configuration ../system-default.nix # Common NixOS system configuration
../../../modules/desktop.nix ../../../modules/gnome/system.nix
../../../modules/wireguard.nix ../../../modules/wireguard.nix
../../../modules/login-display.nix ../../../modules/login-display.nix
]; ];
# Desktop module configuration (disable GDM for Jovian autoStart mode) # Desktop module configuration (disable GDM for Jovian autoStart mode)
desktop-custom.enableDisplayManager = false; gnome-system-custom.enableDisplayManager = false;
# Bootloader - standard UEFI setup # Bootloader - standard UEFI setup
boot.loader = { boot.loader = {

2
hosts/nixos/thinkpad/home.nix
View file

@ -9,7 +9,7 @@
../home-default.nix ../home-default.nix
../../../modules/syncthing.nix ../../../modules/syncthing.nix
../../../modules/tex.nix ../../../modules/tex.nix
../../../modules/gnome.nix ../../../modules/gnome/home.nix
../../../modules/firefox.nix ../../../modules/firefox.nix
../../../modules/ghostty.nix ../../../modules/ghostty.nix
../../../modules/papis.nix ../../../modules/papis.nix

2
hosts/nixos/thinkpad/system.nix
View file

@ -4,7 +4,7 @@
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
../system-default.nix # Common NixOS system configuration ../system-default.nix # Common NixOS system configuration
../../../modules/desktop.nix ../../../modules/gnome/system.nix
../../../modules/wireguard.nix ../../../modules/wireguard.nix
../../../modules/login-display.nix ../../../modules/login-display.nix
../../../modules/keyboard-toggle.nix ../../../modules/keyboard-toggle.nix

9
modules/gnome.nix → modules/gnome/home.nix
View file

@ -1,14 +1,14 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
cfg = config.gnome-custom; cfg = config.gnome-home-custom;
# Import gvariant helpers for dconf types # Import gvariant helpers for dconf types
mkTuple = lib.hm.gvariant.mkTuple; mkTuple = lib.hm.gvariant.mkTuple;
mkUint32 = lib.hm.gvariant.mkUint32; mkUint32 = lib.hm.gvariant.mkUint32;
in in
{ {
options.gnome-custom = { options.gnome-home-custom = {
alwaysShowTopBar = lib.mkOption { alwaysShowTopBar = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
@ -123,11 +123,6 @@ in
tile-bottomleft-quarter = [ "<Super>f" ]; # Bottom-left: Super+F tile-bottomleft-quarter = [ "<Super>f" ]; # Bottom-left: Super+F
tile-bottomright-quarter = [ "<Super>g" ]; # Bottom-right: Super+G tile-bottomright-quarter = [ "<Super>g" ]; # Bottom-right: Super+G
}; };
# NOTE: vim-style hjkl keybindings (Super+h/j/k/l) are configured at the
# system level in desktop.nix with lockAll = true to prevent them from
# being overridden after suspend/resume or by GNOME extensions
}; };
# IBus Mozc (Japanese) configuration - default to Hiragana input mode # IBus Mozc (Japanese) configuration - default to Hiragana input mode

4
modules/desktop.nix → modules/gnome/system.nix
View file

@ -3,7 +3,7 @@
with lib; with lib;
let let
cfg = config.desktop-custom; cfg = config.gnome-system-custom;
# Import gvariant for dconf types # Import gvariant for dconf types
mkTuple = lib.gvariant.mkTuple; mkTuple = lib.gvariant.mkTuple;
mkUint32 = lib.gvariant.mkUint32; mkUint32 = lib.gvariant.mkUint32;
@ -11,7 +11,7 @@ let
in in
{ {
options.desktop-custom = { options.gnome-system-custom = {
enableDisplayManager = mkOption { enableDisplayManager = mkOption {
type = types.bool; type = types.bool;
default = true; default = true;