mirror of
https://github.com/Jokiller230/puzzlevision.git
synced 2025-09-12 13:50:04 +00:00
Compare commits
3 commits
4dd0860251
...
6dc0e02a92
Author | SHA1 | Date | |
---|---|---|---|
6dc0e02a92 | |||
01b1273012 | |||
2f5395dc64 |
4 changed files with 42 additions and 16 deletions
|
@ -4,8 +4,28 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
zed-editor
|
## GENERAL
|
||||||
|
youtube-music
|
||||||
|
discord
|
||||||
|
ghostty
|
||||||
|
teams-for-linux
|
||||||
|
enpass
|
||||||
|
|
||||||
|
## WEB
|
||||||
firefox
|
firefox
|
||||||
|
ungoogled-chromium
|
||||||
|
|
||||||
|
## EDITORS
|
||||||
|
nano
|
||||||
|
zed-editor
|
||||||
|
apostrophe
|
||||||
|
jetbrains.phpstorm
|
||||||
|
arduino-ide
|
||||||
|
obsidian
|
||||||
|
|
||||||
|
## RUNTIMES and CLIs for development
|
||||||
|
bun
|
||||||
|
git
|
||||||
];
|
];
|
||||||
|
|
||||||
home.stateVersion = "25.05";
|
home.stateVersion = "25.05";
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
self,
|
self,
|
||||||
|
pkgs,
|
||||||
config,
|
config,
|
||||||
osConfig,
|
osConfig,
|
||||||
namespace,
|
namespace,
|
||||||
|
@ -9,12 +10,15 @@
|
||||||
inherit (lib) mkEnableOption types mkIf;
|
inherit (lib) mkEnableOption types mkIf;
|
||||||
inherit (self.lib) mkOpt;
|
inherit (self.lib) mkOpt;
|
||||||
|
|
||||||
|
palette = (pkgs.lib.importJSON (config.catppuccin.sources.palette + "/palette.json")).${config.catppuccin.flavor}.colors;
|
||||||
|
|
||||||
cfg = config.${namespace}.themes.catppuccin;
|
cfg = config.${namespace}.themes.catppuccin;
|
||||||
in {
|
in {
|
||||||
options.${namespace}.themes.catppuccin = {
|
options.${namespace}.themes.catppuccin = {
|
||||||
enable = mkEnableOption "the Catppuccin theme, globally.";
|
enable = mkEnableOption "the Catppuccin theme, globally.";
|
||||||
accent = mkOpt types.str "blue" "The accent colour to use.";
|
accent = mkOpt types.str "blue" "The accent colour to use.";
|
||||||
flavor = mkOpt types.str "macchiato" "The flavor to use.";
|
flavor = mkOpt types.str "macchiato" "The flavor to use.";
|
||||||
|
palette = mkOpt (lib.types.attrsOf lib.types.raw) palette "a reference to the current active Catppuccin palette.";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
|
@ -28,6 +32,8 @@ in {
|
||||||
cursors.flavor = cfg.flavor;
|
cursors.flavor = cfg.flavor;
|
||||||
};
|
};
|
||||||
|
|
||||||
${namespace}.themes.catppuccin.gtk.enable = mkIf osConfig.${namespace}.desktop.gnome.enable true;
|
${namespace}.themes.catppuccin = {
|
||||||
|
gtk.enable = mkIf osConfig.${namespace}.desktop.gnome.enable true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,14 +0,0 @@
|
||||||
{
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
namespace,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (lib) mkOption mkIf;
|
|
||||||
palette = (pkgs.lib.importJSON (config.catppuccin.sources.palette + "/palette.json")).${config.catppuccin.flavor}.colors;
|
|
||||||
in {
|
|
||||||
options.${namespace}.themes.catppuccin.palette = mkOption {type = lib.types.attrsOf lib.types.raw;};
|
|
||||||
|
|
||||||
config.${namespace}.themes.catppuccin.palette = mkIf config.${namespace}.themes.catppuccin.enable palette;
|
|
||||||
}
|
|
14
modules/nixos/services/home-manager/default.nix
Normal file
14
modules/nixos/services/home-manager/default.nix
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
{...}: {
|
||||||
|
# Todo: rewrite as recursive operation, based on ${namespace}.users
|
||||||
|
system.userActivationScripts = {
|
||||||
|
removeConflictingHomeManagerBackups = {
|
||||||
|
text = ''
|
||||||
|
rm -f /home/jo/.gtkrc-2.0.homeManagerBackupFileExtension
|
||||||
|
rm -f /home/jo/.config/gtk-3.0/gtk.css.homeManagerBackupFileExtension
|
||||||
|
rm -f /home/jo/.config/gtk-4.0/gtk.css.homeManagerBackupFileExtension
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
home-manager.backupFileExtension = "homeManagerBackupFileExtension";
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue