Compare commits

..

No commits in common. "724594d19a239f837bbe80588f51aceeb8757e12" and "458bce68e6449c232665ae9673c9ced724e3819f" have entirely different histories.

3 changed files with 13 additions and 65 deletions

View File

@ -12,7 +12,6 @@
./gpg.nix ./gpg.nix
./git.nix ./git.nix
./go.nix ./go.nix
./gtk.nix
./helix.nix ./helix.nix
./jq.nix ./jq.nix
./nushell.nix ./nushell.nix

View File

@ -1,55 +0,0 @@
{
config,
lib,
pkgs,
...
}: {
home.pointerCursor = {
name = "catppuccin-cursors";
package = pkgs.catppuccin-cursors.mochaLavender;
size = 24;
};
gtk = {
enable = true;
iconTheme = {
name = "Papirus-Dark";
package = pkgs.catppuccin-papirus-folders.override {
flavor = "mocha";
accent = "lavender";
};
};
theme = {
name = "Catppuccin-Mocha-Compact-Lavender-Dark";
package = pkgs.catppuccin-gtk.override {
accents = ["lavender"];
variant = "mocha";
size = "compact";
};
};
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
gtk2.extraConfig = ''
gtk-xft-antialias=1
gtk-xft-hinting=1
gtk-xft-hintstyle="hintslight"
gtk-xft-rgba="rgb"
'';
gtk3.extraConfig = {
gtk-xft-antialias = 1;
gtk-xft-hinting = 1;
gtk-xft-hintstyle = "hintslight";
gtk-xft-rgba = "rgb";
};
};
xdg = let
themeDir = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}";
in
lib.mkIf config.gtk.enable {
configFile."gtk-4.0/assets" = {
source = "${themeDir}/gtk-4.0/assets";
recursive = true;
};
configFile."gtk-4.0/gtk.css".source = "${themeDir}/gtk-4.0/gtk.css";
configFile."gtk-4.0/gtk-dark.css".source = "${themeDir}/gtk-4.0/gtk-dark.css";
};
}

View File

@ -37,12 +37,7 @@
config, config,
pkgs, pkgs,
... ...
}: let }: {
userSecret = path: {
file = path;
owner = username;
};
in {
config = { config = {
nixpkgs.overlays = [overlays]; nixpkgs.overlays = [overlays];
home-manager = { home-manager = {
@ -54,9 +49,18 @@
}; };
}; };
age.secrets = { age.secrets = {
ssh-config = userSecret ./secrets/shared/ssh-config.age; ssh-config = {
ssh-config-work = userSecret ./secrets/shared/ssh-config-work.age; file = ./secrets/shared/ssh-config.age;
spotify-pw = userSecret ./secrets/shared/spotify-pw.age; owner = username;
};
ssh-config-work = {
file = ./secrets/shared/ssh-config-work.age;
owner = username;
};
spotify-pw = {
file = ./secrets/shared/spotify-pw.age;
owner = username;
};
}; };
}; };
}; };