diff --git a/modules/shells.nix b/modules/shells.nix index 2327294..d1bb3e7 100644 --- a/modules/shells.nix +++ b/modules/shells.nix @@ -43,7 +43,7 @@ #exa is 1 too many letters ls = "exa"; l = "exa -lbF --git"; - ll = "$exa -lbGF --git"; + ll = "exa -lbGF --git"; llm = "exa -lbGd --git --sort=modified"; la = "exa -lbhHigUmuSa --time-style=long-iso --git --color-scale"; lx = "exa -lbhHigUmuSa@ --time-style=long-iso --git --color-scale"; diff --git a/modules/theme.nix b/modules/theme.nix index 6371fc2..33419e6 100644 --- a/modules/theme.nix +++ b/modules/theme.nix @@ -1,48 +1,46 @@ -{pkgs,...}: -{ +{pkgs, ...}: { environment = { - systemPackages = with pkgs; - [ - flat-remix-gtk - flat-remix-icon-theme - quintom-cursor-theme - ]; - etc = { - "xdg/gtk-4.0/settings.ini".text = '' -[Settings] -gtk-cursor-theme-name=Quintom_Ink -gtk-cursor-theme-size=16 -gtk-font-name=Overpass 10 -gtk-icon-theme-name=Flat-Remix-Blue-Dark -gtk-theme-name=Flat-Remix-GTK-Blue-Darkest - ''; - "xdg/gtk-3.0/settings.ini".text = '' -[Settings] -gtk-cursor-theme-name=Quintom_Ink -gtk-cursor-theme-size=16 -gtk-font-name=Overpass 10 -gtk-icon-theme-name=Flat-Remix-Blue-Dark -gtk-theme-name=Flat-Remix-GTK-Blue-Darkest - ''; - "xdg/gtk-2.0/gtkrc".text = '' -gtk-cursor-theme-name = "Quintom_Ink" -gtk-cursor-theme-size = 16 -gtk-font-name = "Overpass 10" -gtk-icon-theme-name = "Flat-Remix-Blue-Dark" -gtk-theme-name = "Flat-Remix-GTK-Blue-Darkest" - ''; - "xdg/Xresources".text = '' -Xcursor.size: 16 -Xcursor.theme: Quintom_Ink - ''; + systemPackages = with pkgs; [ + flat-remix-gtk + flat-remix-icon-theme + quintom-cursor-theme + ]; + etc = { + "xdg/gtk-4.0/settings.ini".text = '' + [Settings] + gtk-cursor-theme-name=Quintom_Ink + gtk-cursor-theme-size=16 + gtk-font-name=Overpass 10 + gtk-icon-theme-name=Flat-Remix-Blue-Dark + gtk-theme-name=Flat-Remix-GTK-Blue-Darkest + ''; + "xdg/gtk-3.0/settings.ini".text = '' + [Settings] + gtk-cursor-theme-name=Quintom_Ink + gtk-cursor-theme-size=16 + gtk-font-name=Overpass 10 + gtk-icon-theme-name=Flat-Remix-Blue-Dark + gtk-theme-name=Flat-Remix-GTK-Blue-Darkest + ''; + "xdg/gtk-2.0/gtkrc".text = '' + gtk-cursor-theme-name = "Quintom_Ink" + gtk-cursor-theme-size = 16 + gtk-font-name = "Overpass 10" + gtk-icon-theme-name = "Flat-Remix-Blue-Dark" + gtk-theme-name = "Flat-Remix-GTK-Blue-Darkest" + ''; + "xdg/Xresources".text = '' + Xcursor.size: 16 + Xcursor.theme: Quintom_Ink + ''; + }; }; - }; qt = { enable = true; style = "gtk2"; platformTheme = "gtk2"; }; services.xserver.displayManager.sessionCommands = '' - xrdb -load /etc/xdg/Xresources + xrdb -load /etc/xdg/Xresources ''; }