parent
6002b09ca6
commit
9b13868f9a
10 changed files with 343 additions and 172 deletions
|
|
@ -21,32 +21,61 @@ in
|
|||
# fuck qt tbh
|
||||
i18n.inputMethod = {
|
||||
enable = true;
|
||||
type = "ibus";
|
||||
package = pkgs.ibus-patched;
|
||||
# ibus.engines = with pkgs.ibus-engines; [ uniemoji ];
|
||||
};
|
||||
systemd.user.services.ibus =
|
||||
let
|
||||
ibusPackage = config.i18n.inputMethod.package;
|
||||
in
|
||||
assert hasPrefix "ibus-with-plugins" ibusPackage.name;
|
||||
{
|
||||
# panel is weird...
|
||||
# default is ${ibusPackage}/libexec/ibus-ui-gtk3 which works but sends a notification that it's misconfigured
|
||||
# wayland support can be enabled with --enable-wayland-im but that segfaults (possible due to zwp_input_method_v1 not being available?)
|
||||
script = ''
|
||||
exec ${ibusPackage}/bin/ibus-daemon --xim --replace --panel '${ibusPackage}/libexec/ibus-ui-gtk3'
|
||||
'';
|
||||
serviceConfig = {
|
||||
Type = "dbus";
|
||||
BusName = "org.freedesktop.IBus";
|
||||
Restart = "on-abnormal";
|
||||
};
|
||||
unitConfig = {
|
||||
CollectMode = "inactive-or-failed";
|
||||
};
|
||||
# yeah we hardcoding this now, fuck it
|
||||
wantedBy = [ cfg.wantedBy ];
|
||||
partOf = [ "graphical-session.target" ];
|
||||
};
|
||||
# home-manager.sharedModules = [
|
||||
# (
|
||||
# { lib, ... }:
|
||||
# {
|
||||
# dconf.settings = {
|
||||
# "org/gnome/desktop/input-sources" = {
|
||||
# sources = [
|
||||
# (lib.hm.gvariant.mkTuple [
|
||||
# "xkb"
|
||||
# "us"
|
||||
# ])
|
||||
# (lib.hm.gvariant.mkTuple [
|
||||
# "ibus"
|
||||
# "libpinyin"
|
||||
# ])
|
||||
# (lib.hm.gvariant.mkTuple [
|
||||
# "ibus"
|
||||
# "mozc-jp"
|
||||
# ])
|
||||
# ];
|
||||
# };
|
||||
# };
|
||||
# }
|
||||
# )
|
||||
# ];
|
||||
|
||||
systemd.user.services."org.freedesktop.IBus.session.generic".wantedBy = [ cfg.wantedBy ];
|
||||
systemd.packages = [ pkgs.ibus-patched ];
|
||||
# systemd.user.services.ibus =
|
||||
# let
|
||||
# ibusPackage = config.i18n.inputMethod.package;
|
||||
# in
|
||||
# assert hasPrefix "ibus-with-plugins" ibusPackage.name;
|
||||
# {
|
||||
# # panel is weird...
|
||||
# # default is ${ibusPackage}/libexec/ibus-ui-gtk3 which works but sends a notification that it's misconfigured
|
||||
# # wayland support can be enabled with --enable-wayland-im but that segfaults (possible due to zwp_input_method_v1 not being available?)
|
||||
# script = ''
|
||||
# exec ${ibusPackage}/bin/ibus-daemon --xim --replace --panel '${ibusPackage}/libexec/ibus-ui-gtk3'
|
||||
# '';
|
||||
# serviceConfig = {
|
||||
# Type = "dbus";
|
||||
# BusName = "org.freedesktop.IBus";
|
||||
# Restart = "on-abnormal";
|
||||
# };
|
||||
# unitConfig = {
|
||||
# CollectMode = "inactive-or-failed";
|
||||
# };
|
||||
# # yeah we hardcoding this now, fuck it
|
||||
# wantedBy = [ cfg.wantedBy ];
|
||||
# partOf = [ "graphical-session.target" ];
|
||||
# };
|
||||
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@ let
|
|||
"KeePassXC"
|
||||
"org.gnome.NautilusPreviewer"
|
||||
"io.github.Qalculate.qalculate-qt"
|
||||
"ibus-ui-emojier"
|
||||
"ibus-ui-gtk3"
|
||||
];
|
||||
matchFloat = concatStringsSep "\n" (
|
||||
map (x: ''
|
||||
|
|
@ -52,20 +54,22 @@ in
|
|||
value = 1;
|
||||
}
|
||||
];
|
||||
home-manager.users.${config.xyno.system.user.name} = mkIf config.xyno.presets.home-manager.enable (
|
||||
{ ... }:
|
||||
{
|
||||
xyno.dark-theme.enable = true;
|
||||
# home.file.".config/xdg-desktop-portal-termfilechooser/config".text = ''
|
||||
# [filechooser]
|
||||
# cmd=${pkgs.xdg-desktop-portal-termfilechooser}/share/xdg-desktop-portal-termfilechooser/yazi-wrapper.sh
|
||||
# default_dir=$HOME
|
||||
# env=TERMCMD=footclient --app-id floating-alacritty
|
||||
# open_mode = suggested
|
||||
# save_mode = suggested
|
||||
# '';
|
||||
}
|
||||
);
|
||||
home-manager.sharedModules = [
|
||||
(
|
||||
{ ... }:
|
||||
{
|
||||
xyno.dark-theme.enable = true;
|
||||
# home.file.".config/xdg-desktop-portal-termfilechooser/config".text = ''
|
||||
# [filechooser]
|
||||
# cmd=${pkgs.xdg-desktop-portal-termfilechooser}/share/xdg-desktop-portal-termfilechooser/yazi-wrapper.sh
|
||||
# default_dir=$HOME
|
||||
# env=TERMCMD=footclient --app-id floating-alacritty
|
||||
# open_mode = suggested
|
||||
# save_mode = suggested
|
||||
# '';
|
||||
}
|
||||
)
|
||||
];
|
||||
|
||||
xdg.portal = {
|
||||
extraPortals = [
|
||||
|
|
@ -88,7 +92,16 @@ in
|
|||
environment.systemPackages = with pkgs; [
|
||||
playerctl
|
||||
xwayland-satellite
|
||||
nirius
|
||||
];
|
||||
systemd.user.services.niriusd = {
|
||||
unitConfig.PartOf = "graphical-session.target";
|
||||
unitConfig.After = "graphical-session.target";
|
||||
unitConfig.Requisite = "graphical-session.target";
|
||||
serviceConfig.Restart = "on-failure";
|
||||
wantedBy = [ "niri.service" ];
|
||||
script = "exec ${pkgs.nirius}/bin/niriusd";
|
||||
};
|
||||
programs.niri.enable = true;
|
||||
environment.etc."niri/config.kdl".mode = "444"; # copy file so niri detects changes
|
||||
environment.etc."niri/config.kdl".text = ''
|
||||
|
|
@ -110,6 +123,9 @@ in
|
|||
Mod+Shift+N { spawn "makoctl" "dismiss" "-a"; }
|
||||
Mod+N { spawn "makoctl" "dismiss"; }
|
||||
Mod+E { spawn "makoctl" "menu" "fuzzel -d"; }
|
||||
Mod+G { spawn "nirius" "toggle-follow-mode"; }
|
||||
Mod+Shift+bracketleft { spawn "nirius" "scratchpad-show"; }
|
||||
Mod+Shift+bracketright { spawn "nirius" "scratchpad-toggle"; }
|
||||
XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.03+"; }
|
||||
XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.03-"; }
|
||||
XF86AudioMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; }
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@ in
|
|||
qt = {
|
||||
enable = true;
|
||||
style = "breeze";
|
||||
# platformTheme = "gnome";
|
||||
};
|
||||
environment.variables.QT_STYLE_OVERRIDE = lib.mkForce "breeze-dark";
|
||||
|
||||
programs.yazi = {
|
||||
settings.keymap.mgr.prepend_keymap = [
|
||||
|
|
@ -71,11 +71,31 @@ in
|
|||
# enable the gnome shit
|
||||
services.gnome.gnome-keyring.enable = true;
|
||||
services.gnome.gnome-online-accounts.enable = true;
|
||||
services.gnome.core-apps.enable = true;
|
||||
environment.systemPackages = with pkgs;[
|
||||
gnome-calendar
|
||||
gnome-clocks
|
||||
gnome-font-viewer
|
||||
mate.engrampa
|
||||
papirus-folders
|
||||
kdePackages.gwenview
|
||||
kdePackages.skanlite
|
||||
kdePackages.okular
|
||||
kdePackages.breeze-gtk
|
||||
kdePackages.breeze.qt5
|
||||
kdePackages.breeze
|
||||
kdePackages.breeze-icons
|
||||
nautilus # for xdg portal
|
||||
];
|
||||
services.gnome.gcr-ssh-agent.enable = mkForce false;
|
||||
services.gnome.sushi.enable = true;
|
||||
# services.gnome.sushi.enable = true;
|
||||
services.gnome.gnome-settings-daemon.enable = true;
|
||||
services.gvfs.enable = true;
|
||||
|
||||
programs.thunar = {
|
||||
enable = true;
|
||||
plugins = with pkgs.xfce; [ thunar-archive-plugin thunar-volman ];
|
||||
};
|
||||
services.tumbler.enable = true; # thunar image preview
|
||||
services.gvfs.enable = true; # thunar network device mount
|
||||
|
||||
xdg.terminal-exec = {
|
||||
enable = true;
|
||||
|
|
@ -111,12 +131,6 @@ in
|
|||
# };
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
kdePackages.breeze-gtk
|
||||
kdePackages.breeze.qt5
|
||||
kdePackages.breeze
|
||||
kdePackages.breeze-icons
|
||||
];
|
||||
|
||||
# fonts
|
||||
fonts.fontconfig.defaultFonts = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue