updated configs, added AI to waku

This commit is contained in:
2026-03-26 16:20:13 +09:00
parent 12c8cc4d69
commit ad4a10ec09
5 changed files with 104 additions and 45 deletions

View File

@@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
modKey = "Mod1"; modKey = "Mod4";
UP = "k"; UP = "k";
DOWN = "j"; DOWN = "j";
LEFT = "h"; LEFT = "h";
@@ -114,7 +114,7 @@ in
"${modKey}+f" = "fullscreen toggle"; "${modKey}+f" = "fullscreen toggle";
"${modKey}+s" = "layout stacking"; "${modKey}+s" = "layout stacking";
"${modKey}+w" = "layout tabbed"; "${modKey}+w" = "layout tabbed";
"${modKey}+e" = "layout split"; "${modKey}+e" = "layout toggle split";
"${modKey}+Shift+space" = "floating toggle"; "${modKey}+Shift+space" = "floating toggle";
"${modKey}+space" = "focus mode_toggle"; "${modKey}+space" = "focus mode_toggle";
"${modKey}+Shift+minus" = "move scratchpad"; "${modKey}+Shift+minus" = "move scratchpad";
@@ -147,5 +147,9 @@ in
}; };
}; };
}; };
home.packages = with pkgs; [
rofi
];
} }

View File

@@ -10,5 +10,6 @@
disableConfirmationPrompt = false; disableConfirmationPrompt = false;
customPaneNavigationAndResize = true; customPaneNavigationAndResize = true;
terminal = "tmux-direct"; terminal = "tmux-direct";
shell = "${pkgs.zsh}/bin/zsh";
}; };
} }

View File

@@ -1,5 +1,4 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
@@ -35,9 +34,22 @@
spiceUSBRedirection.enable = true; spiceUSBRedirection.enable = true;
}; };
services.ollama = {
enable = true;
acceleration = "rocm";
};
services.n8n = {
enable = true;
};
services.open-webui = {
enable = true;
port = 11111;
};
services.fprintd.enable = true; services.fprintd.enable = true;
services.xserver.windowManager.i3.enable = true; services.xserver.windowManager.i3.enable = true;
services.xserver.resolutions = [ {x = 2560; y = 1600; } ];
services.desktopManager.gnome.enable = true; services.desktopManager.gnome.enable = true;
services.gnome = { services.gnome = {
core-apps.enable = false; core-apps.enable = false;
@@ -56,31 +68,6 @@
kdePackages.xdg-desktop-portal-kde kdePackages.xdg-desktop-portal-kde
]; ];
fonts = {
fontDir.enable = true;
fontconfig = {
defaultFonts = {
emoji = [ "Noto Color Emoji" ];
monospace = [ "Moralerspace Argon" ];
sansSerif = [ "Noto Sans" ];
serif = [ "Noto Serif" ];
};
};
packages = with pkgs; [
nerd-fonts._0xproto
nerd-fonts.fira-code
moralerspace
gyre-fonts
ipafont
jigmo
noto-fonts
noto-fonts-cjk-sans
noto-fonts-cjk-serif
corefonts
noto-fonts-color-emoji
];
};
programs.steam = { programs.steam = {
enable = true; enable = true;
#extest.enable = true; #extest.enable = true;

View File

@@ -43,21 +43,66 @@
programs.nix-ld = { programs.nix-ld = {
enable = true; enable = true;
libraries = with pkgs; [ libraries = with pkgs; [
SDL
SDL2_image
acl
atk
attr
bzip2
cairo
cups
curl
dbus
dbus-glib
e2fsprogs
ffmpeg
flac
fontconfig
fuse
glew
glib
gtk2
gtk3
icu
libGL
libcap
libcxx
libelf
libjpeg
libnotify
libpng
libsodium
libssh
libtiff
libusb1
libxkbcommon
libxml2
nss
openssl
pango
stdenv.cc.cc
systemd
util-linux
xorg.libICE
xorg.libSM
xorg.libX11
xorg.libXcomposite
xorg.libXcursor
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXi
xorg.libXmu
xorg.libXrandr
xorg.libXrender
xorg.libXt
xorg.libXtst
xorg.libXxf86vm
xorg.libxcb
xorg.libxshmfence
xz
zlib zlib
zstd zstd
stdenv.cc.cc
curl
openssl
attr
libssh
bzip2
libxml2
acl
libsodium
util-linux
xz
systemd
ffmpeg
]; ];
}; };

View File

@@ -17,10 +17,6 @@
xkb = { xkb = {
layout = "us"; layout = "us";
}; };
resolutions = [
{ x = 1920; y = 1080; }
{ x = 2560; y = 1600; }
];
dpi = 96; dpi = 96;
displayManager.lightdm = { displayManager.lightdm = {
enable = true; enable = true;
@@ -30,6 +26,31 @@
}; };
}; };
fonts = {
fontDir.enable = true;
fontconfig = {
defaultFonts = {
emoji = [ "Noto Color Emoji" ];
monospace = [ "Moralerspace Argon" ];
sansSerif = [ "Noto Sans" ];
serif = [ "Noto Serif" ];
};
};
packages = with pkgs; [
nerd-fonts._0xproto
nerd-fonts.fira-code
moralerspace
gyre-fonts
ipafont
jigmo
noto-fonts
noto-fonts-cjk-sans
noto-fonts-cjk-serif
corefonts
noto-fonts-color-emoji
];
};
services.libinput = lib.mkDefault { services.libinput = lib.mkDefault {
enable = true; enable = true;
touchpad = { touchpad = {
@@ -57,6 +78,7 @@
kdePackages.spectacle kdePackages.spectacle
kdePackages.gwenview kdePackages.gwenview
kdePackages.okular kdePackages.okular
fontconfig
]) ++ (with pkgs.skkDictionaries; [ ]) ++ (with pkgs.skkDictionaries; [
l l
emoji emoji