Compare commits

..

4 Commits

Author SHA1 Message Date
Ethan Simmons
39031aab84 Update neovim config 2025-02-16 15:10:30 -06:00
Ethan Simmons
62dd32207d Setup japanese input 2025-02-16 14:58:51 -06:00
Ethan Simmons
807500b2ec Add fonts 2025-02-13 21:45:22 -06:00
Ethan Simmons
d982906c39 Edit nvim config 2025-02-13 21:45:12 -06:00
5 changed files with 31 additions and 6 deletions

View File

@@ -24,6 +24,7 @@
bottles bottles
inkscape inkscape
orca-slicer orca-slicer
qemu
]; ];
services.hardware.openrgb.enable = true; services.hardware.openrgb.enable = true;

View File

@@ -37,6 +37,8 @@ local plugins = {
'Vigemus/iron.nvim', 'Vigemus/iron.nvim',
'junegunn/vim-easy-align',
} }
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"

View File

@@ -18,7 +18,7 @@ iron.setup {
}, },
-- How the repl window will be displayed -- How the repl window will be displayed
-- See below for more information -- See below for more information
repl_open_cmd = require('iron.view').bottom(40), repl_open_cmd = require('iron.view').split.vertical.rightbelow("%40"),
}, },
-- Iron doesn't set keymaps by default anymore. -- Iron doesn't set keymaps by default anymore.
-- You can set them here or manually add keymaps to the functions in iron.core -- You can set them here or manually add keymaps to the functions in iron.core

View File

@@ -127,8 +127,9 @@ in
}) })
]; ];
startup = [] startup = [
++ optionals gui.sway.desktop [ { command = "fcitx5 -d"; }
] ++ optionals gui.sway.desktop [
{ command = "vorta"; } { command = "vorta"; }
{ command = "MOZ_ENABLE_WAYLAND=1 firefox"; } { command = "MOZ_ENABLE_WAYLAND=1 firefox"; }
{ command = "sleep 20 && vesktop --enable-features=WebRTCPipeWireCapturer"; } { command = "sleep 20 && vesktop --enable-features=WebRTCPipeWireCapturer"; }
@@ -193,7 +194,7 @@ in
}; };
input."type:keyboard" = { input."type:keyboard" = {
xkb_layout = "us,de"; xkb_layout = "us,de,jp";
xkb_options = "grp:toggle"; xkb_options = "grp:toggle";
}; };
@@ -253,9 +254,19 @@ in
''; '';
extraSessionCommands = mkIf gui.secrets '' extraSessionCommands =
(if gui.secrets
then ''
eval $(gnome-keyring-daemon --start --components=pkcs11,secrets,ssh); eval $(gnome-keyring-daemon --start --components=pkcs11,secrets,ssh);
export SSH_AUTH_SOCK; export SSH_AUTH_SOCK;
''
else "") + ''
# https://www.reddit.com/r/swaywm/comments/i6qlos/how_do_i_use_an_ime_with_sway/g1lk4xh?utm_source=share&utm_medium=web2x&context=3
export INPUT_METHOD=fcitx
export QT_IM_MODULE=fcitx
export GTK_IM_MODULE=fcitx
export XMODIFIERS=@im=fcitx
export XIM_SERVERS=fcitx
''; '';
}; };
}; };

View File

@@ -40,6 +40,14 @@ in
hardware.opengl.enable = true; hardware.opengl.enable = true;
i18n.inputMethod = {
enabled = "fcitx5";
fcitx5.addons = with pkgs; [
fcitx5-mozc
fcitx5-gtk
];
};
fonts = { fonts = {
packages = with pkgs; [ packages = with pkgs; [
liberation_ttf liberation_ttf
@@ -51,6 +59,9 @@ in
font-awesome font-awesome
corefonts corefonts
carlito carlito
roboto
source-sans
source-sans-pro
]; ];
fontconfig = { fontconfig = {