diff --git a/common.nix b/common.nix index 7353d75..a4922af 100644 --- a/common.nix +++ b/common.nix @@ -66,6 +66,11 @@ with builtins; services.xserver = { enable = true; + wacom.enable = true; + libinput = { + enable = true; + }; + desktopManager = { xterm.enable = false; }; @@ -83,6 +88,7 @@ with builtins; arandr lxappearance gruvbox-dark-gtk gruvbox-dark-icons-gtk gruvterial-theme flameshot tesseract5 imagemagick xclip polybar kitty xkeysnail gtk-engine-murrine playerctl xmacro + libwacom wacomtablet xorg.xev ]; }; }; @@ -141,7 +147,7 @@ with builtins; # spotify-tui jetbrains.webstorm jetbrains.datagrip jetbrains.idea-ultimate jetbrains.pycharm-professional python3Full jetbrains.clion wget git neofetch pciutils pavucontrol font-manager zip unzip gnutar iw btop xdotool xorg.xwininfo nodejs gparted networkmanagerapplet mailspring - betterdiscordctl pulseaudioFull speedtest-cli librewolf jdk8 jdk11 + betterdiscordctl pulseaudioFull speedtest-cli librewolf firefox jdk8 jdk11 jdk vlc xfce.thunar xfce.tumbler xfce.thunar-archive-plugin gnome.file-roller uhk-agent spotify spotify-tray cool-retro-term lutris libsecret gh xorg.xhost helvum xdg-desktop-portal-gtk nheko obsidian @@ -151,7 +157,7 @@ with builtins; firebird-emu obs-studio kdenlive openal mullvad mullvad-vpn sl lolcat ifuse - cava + cava appimage-run #prismlauncher gitg gnome-builder gpick qdirstat file whois ffmpeg_5 scribus p7zip file nmap cmatrix tree socat libreoffice diff --git a/modules/desktop.nix b/modules/desktop.nix index 9886702..062f258 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -64,7 +64,7 @@ in with lib; { { command = "xhost +"; } { command = "xkeysnail ${../other/xkeysnail.py}"; always = true; } { command = "sleep 4 && setxkbmap -layout us -variant altgr-intl"; always = true; } - { command = "feh --bg-scale ${../other/wallpaper.jpg}"; always = true; notification = false; } + { command = "feh --bg-fill ${../other/wallpaper.jpg}"; always = true; notification = false; } { command = "picom"; } { command = "pkill nm-applet; nm-applet"; always = true; } { command = "pkill pa-applet; pa-applet"; always = true; } @@ -128,7 +128,7 @@ in with lib; { # rofi fuckery "${mod}+d" = "exec --no-startup-id rofi -show drun -theme ${../other/rofi-themes/applauncher.rasi}"; - "${mod}+space" = "exec --no-startup-id rofi -show window -theme ${../other/rofi-themes/applauncher.rasi}"; + "${mod}+space" = "exec --no-startup-id rofi -show combi -combi-show window#run -modes combi -theme ${../other/rofi-themes/applauncher.rasi}"; "${mod}+i" = "exec --no-startup-id rofimoji -f alchemical_symbols anatolian_hieroglyphs emojis braille_patterns box_drawing chess_symbols emoticons geometric_shapes gothic greek_extended math mathematical_alphanumeric_symbols mathematical_operators miscellaneous_symbols miscellaneous_mathematical_symbols-a miscellaneous_mathematical_symbols-b miscellaneous_symbols_and_arrows miscellaneous_symbols_and_pictographs miscellaneous_technical modi modifier_tone_letters musical_symbols nerd_font number_forms shorthand_format_controls specials variation_selectors vertical_forms -a copy"; "${mod}+Shift+e" = "exec --no-startup-id rofi -show \"desktopctl\" -modes \"desktopctl:${desktop-ctl.outPath}/bin/desktopctl\" -theme ${../other/rofi-themes/applauncher.rasi}"; "${mod}+m" = "exec --no-startup-id menu-qalc"; diff --git a/monosodium-glutamate-g/configuration.nix b/monosodium-glutamate-g/configuration.nix index 291f2d7..0ccff0e 100644 --- a/monosodium-glutamate-g/configuration.nix +++ b/monosodium-glutamate-g/configuration.nix @@ -41,6 +41,7 @@ # TODO: clean up. prismlauncher nvtop-amd + libGL ]; environment.pathsToLink = [ diff --git a/other/wallpaper.jpg b/other/wallpaper.jpg index 7aea640..d682b7c 100644 Binary files a/other/wallpaper.jpg and b/other/wallpaper.jpg differ diff --git a/other/xkeysnail.py b/other/xkeysnail.py index e60d7de..c7e080d 100644 --- a/other/xkeysnail.py +++ b/other/xkeysnail.py @@ -31,13 +31,13 @@ define_conditional_multipurpose_modmap(lambda wm_class, device_name: device_name Key.CAPSLOCK: [Key.ESC, Key.RIGHT_CTRL], }) -define_keymap(re.compile("Firefox|Google-chrome|LibreWolf|Chromium"), { - K("C-M-k"): K("C-TAB"), - K("C-M-j"): K("C-Shift-TAB"), -}, "Firefox and Chrome") +# define_keymap(re.compile("Firefox|Google-chrome|LibreWolf|Chromium"), { + # K("C-M-k"): K("C-TAB"), + # K("C-M-j"): K("C-Shift-TAB"), +# }, "Firefox and Chrome") #basic emacs -define_keymap(lambda wm_class: wm_class not in ("Emacs", "konsole", "cool-retro-term", "kitty", "jetbrains-webstorm", "jetbrains-clion", "jetbrains-pycharm", "jetbrains-dataspell", "jetbrains-idea", "Gimp-2.10", "obsidian", "gw2-64.exe", "neovide", "Material Maker"), { +define_keymap(lambda wm_class: wm_class not in ("Emacs", "konsole", "cool-retro-term", "kitty", "jetbrains-webstorm", "jetbrains-clion", "jetbrains-pycharm", "jetbrains-dataspell", "jetbrains-idea", "Gimp-2.10", "obsidian", "gw2-64.exe", "neovide", "Material Maker", "Blender"), { # Cursor K("C-b"): with_mark(K("left")), K("C-f"): with_mark(K("right")), @@ -58,19 +58,19 @@ define_keymap(lambda wm_class: wm_class not in ("Emacs", "konsole", "cool-retro- }, "Basic emacs keys etc") -define_keymap(lambda wm_class: wm_class not in ("discord", "jetbrains-webstorm", "jetbrains-clion", "jetbrains-pycharm", "jetbrains-dataspell", "jetbrains-idea", "nheko", "Signal", "gw2-64.exe", "Material Maker"), { +define_keymap(lambda wm_class: wm_class not in ("discord", "jetbrains-webstorm", "jetbrains-clion", "jetbrains-pycharm", "jetbrains-dataspell", "jetbrains-idea", "nheko", "Signal", "gw2-64.exe", "Material Maker", "Blender"), { # Kill line K("C-k"): [K("Shift-end"), K("C-x"), set_mark(False)], }) # other emacs like -define_keymap(lambda wm_class: wm_class not in ("Emacs", "URxvt", "konsole", "cool-retro-term", "discord", "jetbrains-webstorm", "jetbrains-clion", "jetbrains-pycharm", "jetbrains-dataspell", "jetbrains-idea", "Gimp-2.10", "obsidian", "nheko", "Signal", "Material Maker"), { +define_keymap(lambda wm_class: wm_class not in ("Emacs", "URxvt", "konsole", "cool-retro-term", "discord", "jetbrains-webstorm", "jetbrains-clion", "jetbrains-pycharm", "jetbrains-dataspell", "jetbrains-idea", "Gimp-2.10", "obsidian", "nheko", "Signal", "Material Maker", "Blender"), { # Beginning/End of file K("M-Shift-comma"): with_mark(K("C-home")), K("M-Shift-dot"): with_mark(K("C-end")), }, "Emacs-like keys") -define_keymap(lambda wm_class: wm_class not in ("Emacs", "konsole", "cool-retro-term", "jetbrains-webstorm", "jetbrains-clion", "jetbrains-pycharm", "jetbrains-dataspell", "jetbrains-idea", "gw2-64.exe", "Material Maker"), { +define_keymap(lambda wm_class: wm_class not in ("Emacs", "konsole", "cool-retro-term", "jetbrains-webstorm", "jetbrains-clion", "jetbrains-pycharm", "jetbrains-dataspell", "jetbrains-idea", "gw2-64.exe", "Material Maker", "Blender"), { K("C-j"): K("F6") }) diff --git a/potatobook-g/configuration.nix b/potatobook-g/configuration.nix index 6673092..2013e5d 100644 --- a/potatobook-g/configuration.nix +++ b/potatobook-g/configuration.nix @@ -55,9 +55,6 @@ # dpi = 180; layout = "us"; xkbVariant = "altgr-intl"; - libinput = { - enable = true; - }; }; services.autorandr = {