diff --git a/home/default.nix b/home/default.nix index 67c8acbc..7cda817d 100644 --- a/home/default.nix +++ b/home/default.nix @@ -13,6 +13,7 @@ ./firefox/default.nix ./zathura/default.nix ./emacs/default.nix + ./neovim/default.nix ]; home.packages = with pkgs; [ bitwarden diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix index 6be69f2a..33c90865 100644 --- a/home/hyprland/config.nix +++ b/home/hyprland/config.nix @@ -81,6 +81,7 @@ in '' bind = SUPER, F1, exec, ${swaylockPackage}/bin/swaylock bind = SUPER, M, fullscreen, 0 bind = SUPER, P, exec, pkill rofi || ${pkgs.rofi-pass}/bin/rofi-pass + bind = SUPER, X, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -t bind = SUPER SHIFT, M, fullscreen, 1 bind = SUPER SHIFT, Q, killactive, bind = SUPER SHIFT, Space, togglefloating diff --git a/home/hyprland/gtk.nix b/home/hyprland/gtk.nix index 02188336..0c21c1fa 100644 --- a/home/hyprland/gtk.nix +++ b/home/hyprland/gtk.nix @@ -18,13 +18,14 @@ let gsettings set $gnome_schema cursor-theme '${cursor-theme}' ''; }; + catppuccin-gtk-lavender = pkgs.catppuccin-gtk.override { + accents = [ "lavender" ]; + size = "standard"; + tweaks = [ ]; + variant = "mocha"; + }; in { - home.packages = with pkgs; [ - glib - configure-gtk - gnome.adwaita-icon-theme - papirus-folders - ]; + home.packages = [ configure-gtk ]; gtk = { enable = true; cursorTheme = { @@ -36,13 +37,8 @@ in { name = "cat-mocha-lavender"; }; theme = { + package = catppuccin-gtk-lavender; name = "Catppuccin-Mocha-Standard-Lavender"; - package = pkgs.catppuccin-gtk.override { - accents = [ "lavender" ]; - size = "standard"; - tweaks = [ ]; - variant = "mocha"; - }; }; }; } diff --git a/home/neovim/default.nix b/home/neovim/default.nix new file mode 100644 index 00000000..a909fa20 --- /dev/null +++ b/home/neovim/default.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: + +{ + programs.neovim = { + enable = true; + viAlias = true; + vimAlias = true; + plugins = with pkgs.vimPlugins; [{ + plugin = catppuccin-nvim; + config = "colorscheme catppuccin-mocha"; + }]; + }; +} diff --git a/home/pass/service.nix b/home/pass/service.nix index fe9479f7..f4ad3cfa 100644 --- a/home/pass/service.nix +++ b/home/pass/service.nix @@ -7,7 +7,7 @@ enable = true; defaultCacheTtl = 7200; defaultCacheTtlSsh = 7200; - pinentryFlavor = "curses"; + pinentryFlavor = "gtk2"; extraConfig = '' no-allow-external-cache allow-emacs-pinentry diff --git a/hosts/desktop.nix b/hosts/desktop.nix index 3723d43f..1838cfa9 100644 --- a/hosts/desktop.nix +++ b/hosts/desktop.nix @@ -2,7 +2,16 @@ { imports = [ ./common.nix ]; - environment.systemPackages = with pkgs; [ libnotify ]; + environment.systemPackages = with pkgs; [ + libnotify + glib + gsettings-desktop-schemas + gnome.adwaita-icon-theme + papirus-folders + catppuccin-cursors + catppuccin-papirus-folders + catppuccin-gtk + ]; security.rtkit.enable = true; sound.enable = true; hardware.pulseaudio.enable = false; @@ -21,4 +30,10 @@ console.keyMap = "uk"; programs.ssh.startAgent = true; programs.dconf.enable = true; + gtk.iconCache.enable = true; + qt = { + enable = true; + style = "gtk2"; + platformTheme = "gtk2"; + }; }