mirror of
https://github.com/zoriya/flake.git
synced 2026-06-05 03:29:51 +00:00
Cleanup ghostty setup
This commit is contained in:
@@ -1,52 +0,0 @@
|
|||||||
{
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
services.xserver = {
|
|
||||||
enable = true;
|
|
||||||
displayManager = {
|
|
||||||
gdm.enable = true;
|
|
||||||
autoLogin = {
|
|
||||||
enable = true;
|
|
||||||
user = "zoriya";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
desktopManager.gnome.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Those two lines prevent a crash with gdm autologin.
|
|
||||||
systemd.services."getty@tty1".enable = false;
|
|
||||||
systemd.services."autovt@tty1".enable = false;
|
|
||||||
|
|
||||||
i18n.inputMethod.enabled = "ibus";
|
|
||||||
i18n.inputMethod.ibus.engines = with pkgs.ibus-engines; [mozc];
|
|
||||||
|
|
||||||
# Allow automatic timezoned to work.
|
|
||||||
services.geoclue2.enableDemoAgent = lib.mkForce true;
|
|
||||||
|
|
||||||
fileSystems."/home/zoriya/.local/share/gnome-shell/extensions/fairy@zoriya.dev" = {
|
|
||||||
device = "/home/zoriya/projects/fairy/";
|
|
||||||
fsType = "none";
|
|
||||||
options = ["bind"];
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [gnome3.gnome-tweaks];
|
|
||||||
environment.gnome.excludePackages =
|
|
||||||
(with pkgs; [
|
|
||||||
gnome-tour
|
|
||||||
])
|
|
||||||
++ (with pkgs.gnome; [
|
|
||||||
gedit
|
|
||||||
epiphany
|
|
||||||
geary
|
|
||||||
gnome-characters
|
|
||||||
tali
|
|
||||||
iagno
|
|
||||||
hitori
|
|
||||||
atomix
|
|
||||||
yelp
|
|
||||||
gnome-contacts
|
|
||||||
gnome-initial-setup
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
@@ -1,233 +0,0 @@
|
|||||||
{
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
wallpaper = pkgs.writeShellScriptBin "wallpaper" (builtins.readFile ./wallpaper.sh);
|
|
||||||
in {
|
|
||||||
dconf.settings = with lib.hm.gvariant; {
|
|
||||||
"org/gnome/shell" = {
|
|
||||||
disable-user-extensions = false;
|
|
||||||
# Waiting for https://github.com/bdaase/noannoyance/pull/29
|
|
||||||
disable-extension-version-validation = true;
|
|
||||||
enabled-extensions = [
|
|
||||||
"fairy@zoriya.dev"
|
|
||||||
"noannoyance@daase.net"
|
|
||||||
"blur-my-shell@aunetx"
|
|
||||||
"auto-move-windows@gnome-shell-extensions.gcampax.github.com"
|
|
||||||
"launch-new-instance@gnome-shell-extensions.gcampax.github.com"
|
|
||||||
"default-workspace@mateusrodcosta.com"
|
|
||||||
"pano@elhan.io"
|
|
||||||
"just-perfection-desktop@just-perfection"
|
|
||||||
# "color-picker@tuberry"
|
|
||||||
"unite@hardpixel.eu"
|
|
||||||
"WallpaperSwitcher@Rishu"
|
|
||||||
# Waiting for https://github.com/yilozt/rounded-window-corners/issues/121
|
|
||||||
# "rounded-window-corners@yilozt.shell-extension.zip"
|
|
||||||
];
|
|
||||||
welcome-dialog-last-shown-version = 999999;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Due to https://github.com/aunetx/blur-my-shell/issues/388
|
|
||||||
"org/gnome/shell/extensions/blur-my-shell/applications" = {
|
|
||||||
blur = false;
|
|
||||||
};
|
|
||||||
"org/gnome/shell/extensions/blur-my-shell/panel" = {
|
|
||||||
override-background-dynamically = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
"org/gnome/desktop/session" = {
|
|
||||||
idle-delay = mkUint32 900;
|
|
||||||
};
|
|
||||||
|
|
||||||
"org/gnome/settings-daemon/plugins/power" = {
|
|
||||||
sleep-inactive-battery-timeout = 1800;
|
|
||||||
sleep-inactive-ac-timeout = 1800;
|
|
||||||
};
|
|
||||||
|
|
||||||
"org/gnome/desktop/sound" = {
|
|
||||||
allow-volume-above-100-percent = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
"org/gnome/mutter" = {
|
|
||||||
focus-change-on-pointer-rest = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
"org/gnome/desktop/wm/preferences" = {
|
|
||||||
auto-raise = true;
|
|
||||||
num-workspaces = 9;
|
|
||||||
resize-with-right-button = true;
|
|
||||||
focus-mode = "sloppy";
|
|
||||||
};
|
|
||||||
|
|
||||||
"org/gnome/shell/extensions/dash-to-dock" = {
|
|
||||||
disable-overview-on-startup = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# "org/gnome/shell/world-clocks" = {
|
|
||||||
# locations = "[<(uint32 2, <('Nantes', 'LFRS', true, [(0.82321363634175626, -0.027925268031909273)], [(0.82408630096775348, -0.027052603405912107)])>)>]";
|
|
||||||
# };
|
|
||||||
# "org/gnome/shell/weather" = {
|
|
||||||
# automatic-location = true;
|
|
||||||
# # locations = "[<(uint32 2, <('Tokyo', 'RJTI', true, [(0.62191898430954862, 2.4408429589140699)], [(0.62282074357417661, 2.4391218722853854)])>)>]";
|
|
||||||
# locations = "[<(uint32 2, <('Tokyo', 'RJTI', true, [(0.62191898430954862, 2.4408429589140699)], [(0.62282074357417661, 2.4391218722853854)])>)>]";
|
|
||||||
# };
|
|
||||||
"org/gnome/desktop/peripherals/touchpad" = {
|
|
||||||
tap-to-click = true;
|
|
||||||
};
|
|
||||||
"org/gnome/desktop/peripherals/mouse" = {
|
|
||||||
natural-scroll = true;
|
|
||||||
};
|
|
||||||
"org/gnome/mutter" = {
|
|
||||||
experimental-features = ["scale-monitor-framebuffer"];
|
|
||||||
overlay-key = "";
|
|
||||||
workspaces-only-on-primary = true;
|
|
||||||
};
|
|
||||||
"org/gnome/desktop/interface" = {
|
|
||||||
scaling-factor = 1.5;
|
|
||||||
# Dark mode by default
|
|
||||||
# color-scheme = "prefer-dark";
|
|
||||||
enable-hot-corners = false;
|
|
||||||
clock-show-weekday = true;
|
|
||||||
show-battery-percentage = true;
|
|
||||||
cursor-blink = false;
|
|
||||||
monospace-font-name = "JetBrainsMono Nerd Font 10";
|
|
||||||
locate-pointer = true;
|
|
||||||
};
|
|
||||||
"org/gnome/desktop/input-sources" = {
|
|
||||||
mru-sources = [(mkTuple ["xkb" "us"]) (mkTuple ["ibus" "mozc-jp"])];
|
|
||||||
sources = [(mkTuple ["xkb" "us"]) (mkTuple ["ibus" "mozc-jp"])];
|
|
||||||
xkb-options = ["terminate:ctrl_alt_bksp" "caps:swapescape"];
|
|
||||||
};
|
|
||||||
|
|
||||||
"org/gnome/desktop/wm/keybindings" = {
|
|
||||||
minimize = [];
|
|
||||||
activate-window-menu = [];
|
|
||||||
close = ["<Super>c"];
|
|
||||||
move-to-monitor-left = ["<Shift><Super>comma"];
|
|
||||||
move-to-monitor-right = ["<Shift><Super>period"];
|
|
||||||
};
|
|
||||||
|
|
||||||
"org/gnome/settings-daemon/plugins/media-keys" = {
|
|
||||||
screensaver = ["<Super><Shift>l"];
|
|
||||||
};
|
|
||||||
|
|
||||||
"org/gnome/shell/keybindings" = {
|
|
||||||
toggle-message-tray = [];
|
|
||||||
switch-to-application-1 = [];
|
|
||||||
switch-to-application-2 = [];
|
|
||||||
switch-to-application-3 = [];
|
|
||||||
switch-to-application-4 = [];
|
|
||||||
switch-to-application-5 = [];
|
|
||||||
switch-to-application-6 = [];
|
|
||||||
switch-to-application-7 = [];
|
|
||||||
switch-to-application-8 = [];
|
|
||||||
switch-to-application-9 = [];
|
|
||||||
};
|
|
||||||
|
|
||||||
"org/gnome/settings-daemon/plugins/media-keys" = {
|
|
||||||
custom-keybindings = [
|
|
||||||
"/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
|
|
||||||
"/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
|
|
||||||
binding = "<Super>e";
|
|
||||||
command = "kitty";
|
|
||||||
name = "Open Terminal";
|
|
||||||
};
|
|
||||||
|
|
||||||
"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1" = {
|
|
||||||
binding = "<Super>r";
|
|
||||||
command = "firefox";
|
|
||||||
name = "Firefox";
|
|
||||||
};
|
|
||||||
|
|
||||||
"org/gnome/shell/extensions/WallpaperSwitcher" = {
|
|
||||||
wallpaper-path = "/home/zoriya/wallpapers";
|
|
||||||
switching-mode = 1;
|
|
||||||
frequency = 3000;
|
|
||||||
};
|
|
||||||
|
|
||||||
"org/gnome/desktop/screensaver" = {
|
|
||||||
picture-uri = "file:///home/zoriya/wallpapers/default";
|
|
||||||
};
|
|
||||||
|
|
||||||
"org/gnome/desktop/background" = {
|
|
||||||
# Setting default images for before the wallpaper switcher runs.
|
|
||||||
picture-uri = "file:///home/zoriya/wallpapers/default";
|
|
||||||
picture-uri-dark = "file:///home/zoriya/wallpapers/default";
|
|
||||||
};
|
|
||||||
|
|
||||||
"org/gnome/shell/extensions/auto-move-windows" = {
|
|
||||||
application-list = ["discord.desktop:3" "youtube-music.desktop:3"];
|
|
||||||
};
|
|
||||||
|
|
||||||
"org/gnome/shell/extensions/default-workspace" = {
|
|
||||||
default-workspace-number = 4;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Disable globally all the option, leave only the options to disable client decorations.
|
|
||||||
"org/gnome/shell/extensions/unite" = {
|
|
||||||
extend-left-box = false;
|
|
||||||
autofocus-windows = false;
|
|
||||||
show-legacy-tray = false;
|
|
||||||
show-desktop-name = false;
|
|
||||||
enable-titlebar-actions = false;
|
|
||||||
restrict-to-primary-screen = false;
|
|
||||||
hide-activities-button = "always";
|
|
||||||
hide-window-titlebars = "always";
|
|
||||||
show-window-title = "never";
|
|
||||||
show-window-buttons = "never";
|
|
||||||
notifications-position = "center";
|
|
||||||
hide-dropdown-arrows = false;
|
|
||||||
hide-app-menu-icon = true;
|
|
||||||
reduce-panel-spacing = false;
|
|
||||||
desktop-name-text = "";
|
|
||||||
};
|
|
||||||
|
|
||||||
"org/gnome/shell/extensions/pano" = {
|
|
||||||
history-length = 500;
|
|
||||||
global-shortcut = ["<Super>v"];
|
|
||||||
incognito-shortcut = ["<Shift><Control><Alt><Super>v"];
|
|
||||||
paste-on-select = true;
|
|
||||||
send-notification-on-copy = false;
|
|
||||||
play-audio-on-copy = false;
|
|
||||||
keep-search-entry = false;
|
|
||||||
show-indicator = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
"org/gnome/shell/extensions/fairy" = {
|
|
||||||
tag-names = ["一" "二" "三" " 四" "五" "六" "七" "八" "九"];
|
|
||||||
};
|
|
||||||
|
|
||||||
"org/gnome/shell/extensions/just-perfection" = {
|
|
||||||
activities-button = false;
|
|
||||||
background-menu = false;
|
|
||||||
# clock-menu-position = 1;
|
|
||||||
# clock-menu-position-offset = 10;
|
|
||||||
dash = false;
|
|
||||||
workspace-switcher-size = 10;
|
|
||||||
startup-status = 0;
|
|
||||||
theme = false;
|
|
||||||
window-demands-attention-focus = true;
|
|
||||||
window-preview-caption = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
home.packages = with pkgs.gnomeExtensions; [
|
|
||||||
blur-my-shell
|
|
||||||
just-perfection
|
|
||||||
rounded-window-corners
|
|
||||||
wallpaper-switcher
|
|
||||||
noannoyance-2
|
|
||||||
default-workspace
|
|
||||||
wallpaper
|
|
||||||
pano
|
|
||||||
color-picker
|
|
||||||
unite
|
|
||||||
];
|
|
||||||
|
|
||||||
xdg.configFile."autostart/youtube-music.desktop".source = "${pkgs.youtube-music}/share/applications/youtube-music.desktop";
|
|
||||||
}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
WALLPAPERS=~/wallpapers/
|
|
||||||
|
|
||||||
WP=$(find $WALLPAPERS -type f | shuf -n 1)
|
|
||||||
ln -fs $WP ~/.cache/current-wallpaper
|
|
||||||
|
|
||||||
gsettings set org.gnome.desktop.background picture-uri "$WP"
|
|
||||||
gsettings set org.gnome.desktop.background picture-uri-dark "$WP"
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
{pkgs, ...}: {
|
{pkgs, user, ...}: {
|
||||||
imports = [
|
imports = [
|
||||||
../../modules/wm
|
../../modules/wm
|
||||||
];
|
];
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
};
|
};
|
||||||
initial_session = {
|
initial_session = {
|
||||||
command = "${pkgs.systemd}/bin/systemctl --wait --user start river.service";
|
command = "${pkgs.systemd}/bin/systemctl --wait --user start river.service";
|
||||||
user = "zoriya";
|
user = user;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,3 +1,9 @@
|
|||||||
|
if [[ -n $GHOSTTY_RESOURCES_DIR ]]; then
|
||||||
|
autoload -Uz -- "$GHOSTTY_RESOURCES_DIR"/shell-integration/zsh/ghostty-integration
|
||||||
|
ghostty-integration
|
||||||
|
unfunction ghostty-integration
|
||||||
|
fi
|
||||||
|
|
||||||
# This speeds up pasting w/ autosuggest
|
# This speeds up pasting w/ autosuggest
|
||||||
# https://github.com/zsh-users/zsh-autosuggestions/issues/238
|
# https://github.com/zsh-users/zsh-autosuggestions/issues/238
|
||||||
pasteinit() {
|
pasteinit() {
|
||||||
|
|||||||
+9
-14
@@ -1,18 +1,13 @@
|
|||||||
{ghostty, system, ...}: let
|
{
|
||||||
pkg = ghostty.packages.${system}.default;
|
ghostty,
|
||||||
in {
|
system,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
xdg.configFile."ghostty/config".source = ./ghostty.config;
|
xdg.configFile."ghostty/config".source = ./ghostty.config;
|
||||||
|
|
||||||
programs.zsh.initExtra = ''
|
home.packages = lib.optionals pkgs.stdenv.isLinux [
|
||||||
# load ghostty integration (responsible for OSC 133 aka sementic prompts)
|
ghostty.packages.${system}.default
|
||||||
if [[ $TERM != "dumb" ]]; then
|
|
||||||
autoload -Uz -- ${pkg}/share/ghostty/shell-integration/zsh/ghostty-integration
|
|
||||||
ghostty-integration
|
|
||||||
unfunction ghostty-integration
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
|
|
||||||
home.packages = [
|
|
||||||
pkg
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
{pkgs, ...}: let
|
{pkgs, user, ...}: let
|
||||||
wallpaper = pkgs.writeShellScriptBin "wallpaper" ''
|
wallpaper = pkgs.writeShellScriptBin "wallpaper" ''
|
||||||
WALLPAPERS=~/wallpapers/
|
WALLPAPERS=~/wallpapers/
|
||||||
|
|
||||||
@@ -50,7 +50,7 @@ in {
|
|||||||
};
|
};
|
||||||
background = {
|
background = {
|
||||||
monitor = "";
|
monitor = "";
|
||||||
path = "/home/zoriya/.cache/current-wallpaper";
|
path = "/home/${user}/.cache/current-wallpaper";
|
||||||
};
|
};
|
||||||
input-field = {
|
input-field = {
|
||||||
monitor = "";
|
monitor = "";
|
||||||
|
|||||||
Reference in New Issue
Block a user