diff --git a/home/dot_config/neovide/config.toml b/home/dot_config/neovide/config.toml index 93cf59c..d73a2f8 100644 --- a/home/dot_config/neovide/config.toml +++ b/home/dot_config/neovide/config.toml @@ -8,7 +8,7 @@ fork = true idle = true maximized = false # neovim-bin = "/opt/homebrew/bin/nvim" -frame = "transparent" +frame = "full" no-multigrid = false srgb = false tabs = true @@ -19,8 +19,7 @@ wsl = false [font] normal = [ - "Maple Mono NF CN", + "Maple Mono NF", "Iosevka Nerd Font", - "霞鹜文楷等宽", ] # Will use the bundled Fira Code Nerd Font by default size = 14.0 diff --git a/nixcfgs/hosts/zephyrus/default.nix b/nixcfgs/hosts/zephyrus/default.nix index 9a1b400..4afa9be 100644 --- a/nixcfgs/hosts/zephyrus/default.nix +++ b/nixcfgs/hosts/zephyrus/default.nix @@ -1,12 +1,5 @@ # ~/.config/nixcfgs/hosts/zephyrus/default.nix -{ - config, - lib, - pkgs, - nix-flatpak, - ... -}: -{ +{config, ...}: { imports = [ ../../modules/nixos ../../modules/nixos/host-machine.nix @@ -22,7 +15,7 @@ ../../modules/nixos/obs-studio.nix ../../modules/nixos/wine.nix ../../modules/nixos/desktop/gnome.nix - # ../../modules/nixos/desktop/niri.nix + ../../modules/nixos/desktop/niri.nix ../../modules/nixos/desktop/kde.nix ../../modules/nixos/display-manager/sddm.nix ./hardware-configuration.nix @@ -36,8 +29,10 @@ boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; + networking.modemmanager.enable = false; + # Xilinx Artix-7 Basys 3 services.udev.extraRules = '' - ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6010", MODE="0666", GROUP="wheel" + ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6010", MODE="0660", GROUP="dialout", SYMLINK+="basys3" ''; system.stateVersion = "25.05"; } diff --git a/nixcfgs/users/js0ny/packages/flatpak.nix b/nixcfgs/users/js0ny/packages/flatpak.nix index 726d85a..ca857b1 100644 --- a/nixcfgs/users/js0ny/packages/flatpak.nix +++ b/nixcfgs/users/js0ny/packages/flatpak.nix @@ -1,5 +1,5 @@ # https://github.com/gmodena/nix-flatpak -{nix-flatpak, ...}: { +{home, ...}: { services.flatpak.enable = true; services.flatpak.remotes = [ { @@ -28,11 +28,14 @@ global = { Context = { # Force wayland by default - sockets = ["wayland" "!x11" "!fallback-x11"]; filesystems = [ "/run/current-system/sw/share/fonts:ro" "xdg-config/fontconfig:ro" - # "xdg-data/fonts:ro" + # If user font is set, it is required to access /nix/store + # since flatpak apps cannot read ~/.config/fontconfig/conf.d/* + # TODO: This is a bad practice, trying to look for a better solution + "/nix/store:ro" + "xdg-data/fonts:ro" ]; }; }; @@ -44,5 +47,6 @@ QT_IM_MODULE = "fcitx"; }; }; + "md.obsidian.Obsidian".Context.sockets = ["wayland"]; }; } diff --git a/nixcfgs/users/js0ny/packages/fonts.nix b/nixcfgs/users/js0ny/packages/fonts.nix new file mode 100644 index 0000000..b2f2bc1 --- /dev/null +++ b/nixcfgs/users/js0ny/packages/fonts.nix @@ -0,0 +1,13 @@ +{pkgs, ...}: { + fonts.fontconfig.enable = true; + fonts.fontconfig = { + defaultFonts = { + monospace = [ + "Maple Mono NF" + "JetBrainsMono Nerd Font" + ]; + serif = ["LXGW WenKai"]; + sansSerif = ["LXGW Neo XiHei"]; + }; + }; +} diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix index 7ef0962..5ae8b87 100644 --- a/nixcfgs/users/js0ny/packages/gui.nix +++ b/nixcfgs/users/js0ny/packages/gui.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { home.packages = with pkgs; [ kitty ghostty @@ -33,5 +32,6 @@ proton-pass protonmail-bridge-gui mpv + neovim-qt ]; } diff --git a/nixcfgs/users/js0ny/programs/mime.nix b/nixcfgs/users/js0ny/programs/mime.nix index a8b56d6..29dae43 100644 --- a/nixcfgs/users/js0ny/programs/mime.nix +++ b/nixcfgs/users/js0ny/programs/mime.nix @@ -1,7 +1,13 @@ { + xdg.mime.enable = true; xdg.mimeApps = { + enable = true; defaultApplications = { "application/pdf" = "org.kde.okular.desktop"; + "text/plain" = "nvim-qt.desktop"; + "text/x-csrc" = "nvim-qt.desktop"; + "text/x-chdr" = "nvim-qt.desktop"; + "inode/directory" = "org.kde.dolphin.desktop"; }; }; } diff --git a/nixcfgs/users/js0ny/programs/plasma.nix b/nixcfgs/users/js0ny/programs/plasma.nix index 414b352..24267be 100644 --- a/nixcfgs/users/js0ny/programs/plasma.nix +++ b/nixcfgs/users/js0ny/programs/plasma.nix @@ -1,6 +1,8 @@ {pkgs, ...}: { - home.packages = with pkgs.kdePackages; [ - yakuake + home.packages = with pkgs; [ + kdePackages.yakuake + krunner-vscodeprojects + jetbrains-runner ]; programs.plasma = { enable = true; @@ -28,6 +30,11 @@ ]; }; }; + shortcuts = { + yakuake = { + "toggle-window-state" = "Meta+`"; + }; + }; input.touchpads = [ { disableWhileTyping = true; @@ -101,7 +108,7 @@ "org.kde.plasma.marginsseparator" ]; opacity = "translucent"; - hiding = "dodgewindows"; + hiding = "none"; } ]; }; diff --git a/nixcfgs/users/js0ny/zephyrus.nix b/nixcfgs/users/js0ny/zephyrus.nix index f712faa..144e17c 100644 --- a/nixcfgs/users/js0ny/zephyrus.nix +++ b/nixcfgs/users/js0ny/zephyrus.nix @@ -4,13 +4,26 @@ nix-flatpak, plasma-manager, ... -}: -{ +}: let + my-catppuccin-kde = pkgs.catppuccin-kde.override { + flavour = [ + "mocha" + "latte" + ]; + accents = ["pink"]; + winDecStyles = ["classic"]; + }; + my-catppuccin-gtk = pkgs.catppuccin-gtk.override { + accents = ["pink"]; + variant = "mocha"; + }; +in { imports = [ ./default.nix ./packages/cli.nix ./packages/gui.nix ./packages/flatpak.nix + ./packages/fonts.nix ./programs/chromium.nix ./programs/gnome.nix ./programs/plasma.nix @@ -37,5 +50,12 @@ # ./flatpak.nix ]; + home.packages = with pkgs; [ + catppuccin + my-catppuccin-gtk + my-catppuccin-kde + catppuccin-fcitx5 + ]; + home.stateVersion = "25.05"; }