diff --git a/home/i3.nix b/home/i3.nix index e6f6f5b..217d981 100644 --- a/home/i3.nix +++ b/home/i3.nix @@ -1,6 +1,6 @@ { config, pkgs, lib, ... }: let - modKey = "Mod1"; + modKey = "Mod4"; UP = "k"; DOWN = "j"; LEFT = "h"; @@ -114,7 +114,7 @@ in "${modKey}+f" = "fullscreen toggle"; "${modKey}+s" = "layout stacking"; "${modKey}+w" = "layout tabbed"; - "${modKey}+e" = "layout split"; + "${modKey}+e" = "layout toggle split"; "${modKey}+Shift+space" = "floating toggle"; "${modKey}+space" = "focus mode_toggle"; "${modKey}+Shift+minus" = "move scratchpad"; @@ -147,5 +147,9 @@ in }; }; }; + + home.packages = with pkgs; [ + rofi + ]; } diff --git a/home/tmux.nix b/home/tmux.nix index 4fc2824..ba1940d 100644 --- a/home/tmux.nix +++ b/home/tmux.nix @@ -10,5 +10,6 @@ disableConfirmationPrompt = false; customPaneNavigationAndResize = true; terminal = "tmux-direct"; + shell = "${pkgs.zsh}/bin/zsh"; }; } diff --git a/hosts/waku/default.nix b/hosts/waku/default.nix index 63fe959..ef7e28f 100644 --- a/hosts/waku/default.nix +++ b/hosts/waku/default.nix @@ -1,5 +1,4 @@ { config, lib, pkgs, ... }: - { imports = [ ./hardware-configuration.nix @@ -35,9 +34,22 @@ 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.xserver.windowManager.i3.enable = true; + services.xserver.resolutions = [ {x = 2560; y = 1600; } ]; services.desktopManager.gnome.enable = true; services.gnome = { core-apps.enable = false; @@ -56,31 +68,6 @@ 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 = { enable = true; #extest.enable = true; diff --git a/profiles/base.nix b/profiles/base.nix index 868ba69..b43527a 100644 --- a/profiles/base.nix +++ b/profiles/base.nix @@ -43,21 +43,66 @@ programs.nix-ld = { enable = true; 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 zstd - stdenv.cc.cc - curl - openssl - attr - libssh - bzip2 - libxml2 - acl - libsodium - util-linux - xz - systemd - ffmpeg ]; }; diff --git a/profiles/desktop.nix b/profiles/desktop.nix index f47b184..aba049a 100644 --- a/profiles/desktop.nix +++ b/profiles/desktop.nix @@ -17,10 +17,6 @@ xkb = { layout = "us"; }; - resolutions = [ - { x = 1920; y = 1080; } - { x = 2560; y = 1600; } - ]; dpi = 96; displayManager.lightdm = { 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 { enable = true; touchpad = { @@ -57,6 +78,7 @@ kdePackages.spectacle kdePackages.gwenview kdePackages.okular + fontconfig ]) ++ (with pkgs.skkDictionaries; [ l emoji