minor revision
This commit is contained in:
Yan Lin
parent
d6d949139c
commit
936f154a56
2 changed files with 191 additions and 201 deletions
|
|
@ -14,9 +14,9 @@
|
|||
../../../modules/ghostty.nix
|
||||
];
|
||||
|
||||
# Enable GNOME configuration
|
||||
programs.gnome-custom = {
|
||||
programs.yt-dlp-custom = {
|
||||
enable = true;
|
||||
downloadDir = "~/Downloads/web-video";
|
||||
};
|
||||
|
||||
# Enable Ghostty terminal with OSC-52 clipboard support
|
||||
|
|
|
|||
|
|
@ -1,214 +1,204 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.programs.gnome-custom;
|
||||
|
||||
# Import gvariant helpers for dconf types
|
||||
mkTuple = lib.hm.gvariant.mkTuple;
|
||||
mkUint32 = lib.hm.gvariant.mkUint32;
|
||||
in
|
||||
|
||||
{
|
||||
options.programs.gnome-custom = {
|
||||
enable = mkEnableOption "GNOME desktop environment configuration";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
# GNOME configuration via dconf
|
||||
dconf.settings = {
|
||||
# Interface settings
|
||||
"org/gnome/desktop/interface" = {
|
||||
color-scheme = "prefer-dark";
|
||||
gtk-theme = "Adwaita-dark";
|
||||
cursor-theme = "Adwaita";
|
||||
};
|
||||
|
||||
# Desktop background
|
||||
"org/gnome/desktop/background" = {
|
||||
picture-uri = "file:///home/yanlin/Documents/Library/nixos-nineish-dark@4k.png";
|
||||
picture-uri-dark = "file:///home/yanlin/Documents/Library/nixos-nineish-dark@4k.png";
|
||||
picture-options = "scaled";
|
||||
};
|
||||
|
||||
# Input sources - US English, Chinese Pinyin, Japanese
|
||||
"org/gnome/desktop/input-sources" = {
|
||||
sources = [
|
||||
(mkTuple [ "xkb" "us" ])
|
||||
(mkTuple [ "ibus" "libpinyin" ])
|
||||
(mkTuple [ "ibus" "mozc-jp" ])
|
||||
];
|
||||
xkb-options = [ "" ];
|
||||
};
|
||||
|
||||
# GNOME Shell configuration
|
||||
"org/gnome/shell" = {
|
||||
disable-user-extensions = false;
|
||||
enabled-extensions = [
|
||||
"hidetopbar@mathieu.bidon.ca"
|
||||
"pano@elhan.io"
|
||||
];
|
||||
favorite-apps = [
|
||||
"org.gnome.Nautilus.desktop"
|
||||
"firefox.desktop"
|
||||
"obsidian.desktop"
|
||||
"com.mitchellh.ghostty.desktop"
|
||||
"org.keepassxc.KeePassXC.desktop"
|
||||
];
|
||||
};
|
||||
|
||||
# Hide Top Bar extension configuration
|
||||
"org/gnome/shell/extensions/hidetopbar" = {
|
||||
enable-intellihide = true;
|
||||
enable-active-window = true;
|
||||
mouse-sensitive = false;
|
||||
mouse-sensitive-fullscreen-window = false;
|
||||
};
|
||||
|
||||
# Pano clipboard manager configuration
|
||||
"org/gnome/shell/extensions/pano" = {
|
||||
send-notification-on-copy = false; # Disable notification toasts
|
||||
play-audio-on-copy = false; # Disable audio feedback on copy
|
||||
};
|
||||
|
||||
# Nautilus (GNOME Files) configuration
|
||||
"org/gnome/nautilus/preferences" = {
|
||||
show-hidden-files = true;
|
||||
default-folder-viewer = "list-view";
|
||||
};
|
||||
|
||||
# Disable GNOME Software auto-updates
|
||||
"org/gnome/software" = {
|
||||
download-updates = false;
|
||||
download-updates-notify = false;
|
||||
};
|
||||
|
||||
# Notification settings
|
||||
"org/gnome/desktop/notifications" = {
|
||||
show-banners = false; # Disable notification popups (still logged in notification center)
|
||||
};
|
||||
|
||||
# Sound settings
|
||||
"org/gnome/desktop/sound" = {
|
||||
event-sounds = false; # Disable notification sounds
|
||||
};
|
||||
|
||||
# IBus libpinyin (Chinese Pinyin) configuration
|
||||
"com/github/libpinyin/ibus-libpinyin/libpinyin" = {
|
||||
lookup-table-page-size = 7; # Number of candidates displayed (default: 5)
|
||||
};
|
||||
# GNOME configuration via dconf
|
||||
dconf.settings = {
|
||||
# Interface settings
|
||||
"org/gnome/desktop/interface" = {
|
||||
color-scheme = "prefer-dark";
|
||||
gtk-theme = "Adwaita-dark";
|
||||
cursor-theme = "Adwaita";
|
||||
};
|
||||
|
||||
# Configure cursor theme system-wide
|
||||
home.pointerCursor = {
|
||||
name = "Adwaita";
|
||||
# Desktop background
|
||||
"org/gnome/desktop/background" = {
|
||||
picture-uri = "file:///home/yanlin/Documents/Library/nixos-nineish-dark@4k.png";
|
||||
picture-uri-dark = "file:///home/yanlin/Documents/Library/nixos-nineish-dark@4k.png";
|
||||
picture-options = "scaled";
|
||||
};
|
||||
|
||||
# Input sources - US English, Chinese Pinyin, Japanese
|
||||
"org/gnome/desktop/input-sources" = {
|
||||
sources = [
|
||||
(mkTuple [ "xkb" "us" ])
|
||||
(mkTuple [ "ibus" "libpinyin" ])
|
||||
(mkTuple [ "ibus" "mozc-jp" ])
|
||||
];
|
||||
xkb-options = [ "" ];
|
||||
};
|
||||
|
||||
# GNOME Shell configuration
|
||||
"org/gnome/shell" = {
|
||||
disable-user-extensions = false;
|
||||
enabled-extensions = [
|
||||
"hidetopbar@mathieu.bidon.ca"
|
||||
"pano@elhan.io"
|
||||
];
|
||||
favorite-apps = [
|
||||
"org.gnome.Nautilus.desktop"
|
||||
"firefox.desktop"
|
||||
"obsidian.desktop"
|
||||
"com.mitchellh.ghostty.desktop"
|
||||
"org.keepassxc.KeePassXC.desktop"
|
||||
];
|
||||
};
|
||||
|
||||
# Hide Top Bar extension configuration
|
||||
"org/gnome/shell/extensions/hidetopbar" = {
|
||||
enable-intellihide = true;
|
||||
enable-active-window = true;
|
||||
mouse-sensitive = false;
|
||||
mouse-sensitive-fullscreen-window = false;
|
||||
};
|
||||
|
||||
# Pano clipboard manager configuration
|
||||
"org/gnome/shell/extensions/pano" = {
|
||||
send-notification-on-copy = false; # Disable notification toasts
|
||||
play-audio-on-copy = false; # Disable audio feedback on copy
|
||||
};
|
||||
|
||||
# Nautilus (GNOME Files) configuration
|
||||
"org/gnome/nautilus/preferences" = {
|
||||
show-hidden-files = true;
|
||||
default-folder-viewer = "list-view";
|
||||
};
|
||||
|
||||
# Disable GNOME Software auto-updates
|
||||
"org/gnome/software" = {
|
||||
download-updates = false;
|
||||
download-updates-notify = false;
|
||||
};
|
||||
|
||||
# Notification settings
|
||||
"org/gnome/desktop/notifications" = {
|
||||
show-banners = false; # Disable notification popups (still logged in notification center)
|
||||
};
|
||||
|
||||
# Sound settings
|
||||
"org/gnome/desktop/sound" = {
|
||||
event-sounds = false; # Disable notification sounds
|
||||
};
|
||||
|
||||
# IBus libpinyin (Chinese Pinyin) configuration
|
||||
"com/github/libpinyin/ibus-libpinyin/libpinyin" = {
|
||||
lookup-table-page-size = 7; # Number of candidates displayed (default: 5)
|
||||
};
|
||||
};
|
||||
|
||||
# Configure cursor theme system-wide
|
||||
home.pointerCursor = {
|
||||
name = "Adwaita";
|
||||
package = pkgs.adwaita-icon-theme;
|
||||
size = 24;
|
||||
gtk.enable = true;
|
||||
x11.enable = true;
|
||||
};
|
||||
|
||||
# Configure GTK icon theme
|
||||
gtk = {
|
||||
enable = true;
|
||||
iconTheme = {
|
||||
package = pkgs.adwaita-icon-theme;
|
||||
size = 24;
|
||||
gtk.enable = true;
|
||||
x11.enable = true;
|
||||
name = "Adwaita";
|
||||
};
|
||||
|
||||
# Configure GTK icon theme
|
||||
gtk = {
|
||||
enable = true;
|
||||
iconTheme = {
|
||||
package = pkgs.adwaita-icon-theme;
|
||||
name = "Adwaita";
|
||||
};
|
||||
};
|
||||
|
||||
# Configure XDG user directories
|
||||
xdg.userDirs = {
|
||||
enable = true;
|
||||
createDirectories = true;
|
||||
|
||||
# Keep these directories
|
||||
desktop = "${config.home.homeDirectory}/Desktop";
|
||||
documents = "${config.home.homeDirectory}/Documents";
|
||||
download = "${config.home.homeDirectory}/Downloads";
|
||||
|
||||
# Disable unwanted directories
|
||||
music = null;
|
||||
pictures = null;
|
||||
videos = null;
|
||||
publicShare = null;
|
||||
templates = null;
|
||||
};
|
||||
|
||||
# GNOME Shell extensions
|
||||
home.packages = with pkgs; [
|
||||
gnomeExtensions.hide-top-bar
|
||||
gnomeExtensions.pano
|
||||
];
|
||||
|
||||
# SSH tunnel functions for SOCKS proxy via GNOME system proxy
|
||||
programs.zsh.initContent = ''
|
||||
# SSH tunnel functions for easy VPN-like functionality
|
||||
function tunnel-on() {
|
||||
if [[ -z "$1" ]]; then
|
||||
echo "Usage: tunnel-on <host>"
|
||||
return 1
|
||||
fi
|
||||
|
||||
local host="$1"
|
||||
local port=1080 # Use port 1080 (standard SOCKS port)
|
||||
|
||||
# Check if there's already an active tunnel
|
||||
local existing_tunnel=$(ps aux | grep -E "ssh -D $port" | grep -v grep)
|
||||
if [[ -n "$existing_tunnel" ]]; then
|
||||
echo "Existing tunnel detected. Switching to $host..."
|
||||
echo "Stopping current tunnel..."
|
||||
pkill -f "ssh -D $port"
|
||||
sleep 1
|
||||
fi
|
||||
|
||||
echo "Starting SOCKS tunnel to $host on port $port..."
|
||||
|
||||
# Start SSH tunnel in background
|
||||
ssh -D $port -N -f "$host"
|
||||
if [[ $? -eq 0 ]]; then
|
||||
echo "Tunnel established. Configuring system proxy..."
|
||||
|
||||
# Configure GNOME system proxy settings
|
||||
gsettings set org.gnome.system.proxy mode 'manual'
|
||||
gsettings set org.gnome.system.proxy.socks host 'localhost'
|
||||
gsettings set org.gnome.system.proxy.socks port $port
|
||||
|
||||
echo "✓ System proxy enabled (localhost:$port -> $host)"
|
||||
else
|
||||
echo "✗ Failed to establish tunnel to $host"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
function tunnel-off() {
|
||||
local port=1080
|
||||
echo "Disabling system proxy..."
|
||||
gsettings set org.gnome.system.proxy mode 'none'
|
||||
echo "✓ System proxy disabled"
|
||||
|
||||
echo "Stopping SSH tunnels..."
|
||||
pkill -f "ssh -D $port"
|
||||
echo "✓ SSH tunnels stopped"
|
||||
}
|
||||
|
||||
function tunnel-status() {
|
||||
local port=1080
|
||||
echo "=== GNOME System Proxy Status ==="
|
||||
echo "Mode: $(gsettings get org.gnome.system.proxy mode)"
|
||||
echo "SOCKS Host: $(gsettings get org.gnome.system.proxy.socks host)"
|
||||
echo "SOCKS Port: $(gsettings get org.gnome.system.proxy.socks port)"
|
||||
|
||||
echo ""
|
||||
echo "=== Active SSH Tunnels ==="
|
||||
local tunnels=$(ps aux | grep -E "ssh -D $port" | grep -v grep)
|
||||
if [[ -n "$tunnels" ]]; then
|
||||
echo "$tunnels"
|
||||
else
|
||||
echo "No active SSH tunnels"
|
||||
fi
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
# Configure XDG user directories
|
||||
xdg.userDirs = {
|
||||
enable = true;
|
||||
createDirectories = true;
|
||||
|
||||
# Keep these directories
|
||||
desktop = "${config.home.homeDirectory}/Desktop";
|
||||
documents = "${config.home.homeDirectory}/Documents";
|
||||
download = "${config.home.homeDirectory}/Downloads";
|
||||
|
||||
# Disable unwanted directories
|
||||
music = null;
|
||||
pictures = null;
|
||||
videos = null;
|
||||
publicShare = null;
|
||||
templates = null;
|
||||
};
|
||||
|
||||
# GNOME Shell extensions
|
||||
home.packages = with pkgs; [
|
||||
gnomeExtensions.hide-top-bar
|
||||
gnomeExtensions.pano
|
||||
];
|
||||
|
||||
# SSH tunnel functions for SOCKS proxy via GNOME system proxy
|
||||
programs.zsh.initContent = ''
|
||||
# SSH tunnel functions for easy VPN-like functionality
|
||||
function tunnel-on() {
|
||||
if [[ -z "$1" ]]; then
|
||||
echo "Usage: tunnel-on <host>"
|
||||
return 1
|
||||
fi
|
||||
|
||||
local host="$1"
|
||||
local port=1080 # Use port 1080 (standard SOCKS port)
|
||||
|
||||
# Check if there's already an active tunnel
|
||||
local existing_tunnel=$(ps aux | grep -E "ssh -D $port" | grep -v grep)
|
||||
if [[ -n "$existing_tunnel" ]]; then
|
||||
echo "Existing tunnel detected. Switching to $host..."
|
||||
echo "Stopping current tunnel..."
|
||||
pkill -f "ssh -D $port"
|
||||
sleep 1
|
||||
fi
|
||||
|
||||
echo "Starting SOCKS tunnel to $host on port $port..."
|
||||
|
||||
# Start SSH tunnel in background
|
||||
ssh -D $port -N -f "$host"
|
||||
if [[ $? -eq 0 ]]; then
|
||||
echo "Tunnel established. Configuring system proxy..."
|
||||
|
||||
# Configure GNOME system proxy settings
|
||||
gsettings set org.gnome.system.proxy mode 'manual'
|
||||
gsettings set org.gnome.system.proxy.socks host 'localhost'
|
||||
gsettings set org.gnome.system.proxy.socks port $port
|
||||
|
||||
echo "✓ System proxy enabled (localhost:$port -> $host)"
|
||||
else
|
||||
echo "✗ Failed to establish tunnel to $host"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
function tunnel-off() {
|
||||
local port=1080
|
||||
echo "Disabling system proxy..."
|
||||
gsettings set org.gnome.system.proxy mode 'none'
|
||||
echo "✓ System proxy disabled"
|
||||
|
||||
echo "Stopping SSH tunnels..."
|
||||
pkill -f "ssh -D $port"
|
||||
echo "✓ SSH tunnels stopped"
|
||||
}
|
||||
|
||||
function tunnel-status() {
|
||||
local port=1080
|
||||
echo "=== GNOME System Proxy Status ==="
|
||||
echo "Mode: $(gsettings get org.gnome.system.proxy mode)"
|
||||
echo "SOCKS Host: $(gsettings get org.gnome.system.proxy.socks host)"
|
||||
echo "SOCKS Port: $(gsettings get org.gnome.system.proxy.socks port)"
|
||||
|
||||
echo ""
|
||||
echo "=== Active SSH Tunnels ==="
|
||||
local tunnels=$(ps aux | grep -E "ssh -D $port" | grep -v grep)
|
||||
if [[ -n "$tunnels" ]]; then
|
||||
echo "$tunnels"
|
||||
else
|
||||
echo "No active SSH tunnels"
|
||||
fi
|
||||
}
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue