Attempt to fix gtk theme setting

Add minimal nvim install as backup editor
Add bind to toggle swaync
This commit is contained in:
Evie Litherland-Smith 2023-09-07 14:34:24 +01:00
parent e3b655a538
commit b0de17462a
6 changed files with 40 additions and 14 deletions

View file

@ -13,6 +13,7 @@
./firefox/default.nix ./firefox/default.nix
./zathura/default.nix ./zathura/default.nix
./emacs/default.nix ./emacs/default.nix
./neovim/default.nix
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
bitwarden bitwarden

View file

@ -81,6 +81,7 @@ in ''
bind = SUPER, F1, exec, ${swaylockPackage}/bin/swaylock bind = SUPER, F1, exec, ${swaylockPackage}/bin/swaylock
bind = SUPER, M, fullscreen, 0 bind = SUPER, M, fullscreen, 0
bind = SUPER, P, exec, pkill rofi || ${pkgs.rofi-pass}/bin/rofi-pass 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, M, fullscreen, 1
bind = SUPER SHIFT, Q, killactive, bind = SUPER SHIFT, Q, killactive,
bind = SUPER SHIFT, Space, togglefloating bind = SUPER SHIFT, Space, togglefloating

View file

@ -18,13 +18,14 @@ let
gsettings set $gnome_schema cursor-theme '${cursor-theme}' gsettings set $gnome_schema cursor-theme '${cursor-theme}'
''; '';
}; };
catppuccin-gtk-lavender = pkgs.catppuccin-gtk.override {
accents = [ "lavender" ];
size = "standard";
tweaks = [ ];
variant = "mocha";
};
in { in {
home.packages = with pkgs; [ home.packages = [ configure-gtk ];
glib
configure-gtk
gnome.adwaita-icon-theme
papirus-folders
];
gtk = { gtk = {
enable = true; enable = true;
cursorTheme = { cursorTheme = {
@ -36,13 +37,8 @@ in {
name = "cat-mocha-lavender"; name = "cat-mocha-lavender";
}; };
theme = { theme = {
package = catppuccin-gtk-lavender;
name = "Catppuccin-Mocha-Standard-Lavender"; name = "Catppuccin-Mocha-Standard-Lavender";
package = pkgs.catppuccin-gtk.override {
accents = [ "lavender" ];
size = "standard";
tweaks = [ ];
variant = "mocha";
};
}; };
}; };
} }

13
home/neovim/default.nix Normal file
View file

@ -0,0 +1,13 @@
{ pkgs, ... }:
{
programs.neovim = {
enable = true;
viAlias = true;
vimAlias = true;
plugins = with pkgs.vimPlugins; [{
plugin = catppuccin-nvim;
config = "colorscheme catppuccin-mocha";
}];
};
}

View file

@ -7,7 +7,7 @@
enable = true; enable = true;
defaultCacheTtl = 7200; defaultCacheTtl = 7200;
defaultCacheTtlSsh = 7200; defaultCacheTtlSsh = 7200;
pinentryFlavor = "curses"; pinentryFlavor = "gtk2";
extraConfig = '' extraConfig = ''
no-allow-external-cache no-allow-external-cache
allow-emacs-pinentry allow-emacs-pinentry

View file

@ -2,7 +2,16 @@
{ {
imports = [ ./common.nix ]; 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; security.rtkit.enable = true;
sound.enable = true; sound.enable = true;
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
@ -21,4 +30,10 @@
console.keyMap = "uk"; console.keyMap = "uk";
programs.ssh.startAgent = true; programs.ssh.startAgent = true;
programs.dconf.enable = true; programs.dconf.enable = true;
gtk.iconCache.enable = true;
qt = {
enable = true;
style = "gtk2";
platformTheme = "gtk2";
};
} }