Merge branch 'nixos' into nixos-work

This commit is contained in:
Moritz Böhme 2023-02-26 13:01:19 +01:00
commit 85d28fcbb8
7 changed files with 12 additions and 7 deletions

View file

@ -5,7 +5,7 @@ let
cfg = config.my.theming; cfg = config.my.theming;
in in
{ {
config = mkIf (cfg.scheme == "catppuccin-frappe") config = mkIf (cfg.enable && cfg.scheme == "catppuccin-frappe")
(import ./catppuccin.nix (import ./catppuccin.nix
{ {
inherit config lib pkgs; inherit config lib pkgs;

View file

@ -5,7 +5,7 @@ let
cfg = config.my.theming; cfg = config.my.theming;
in in
{ {
config = mkIf (cfg.scheme == "catppuccin-latte") config = mkIf (cfg.enable && cfg.scheme == "catppuccin-latte")
(import ./catppuccin.nix (import ./catppuccin.nix
{ {
inherit config lib pkgs; inherit config lib pkgs;

View file

@ -5,7 +5,7 @@ let
cfg = config.my.theming; cfg = config.my.theming;
in in
{ {
config = mkIf (cfg.scheme == "catppuccin-macchiato") config = mkIf (cfg.enable && cfg.scheme == "catppuccin-macchiato")
(import ./catppuccin.nix (import ./catppuccin.nix
{ {
inherit config lib pkgs; inherit config lib pkgs;

View file

@ -5,7 +5,7 @@ let
cfg = config.my.theming; cfg = config.my.theming;
in in
{ {
config = mkIf (cfg.scheme == "catppuccin-mocha") config = mkIf (cfg.enable && cfg.scheme == "catppuccin-mocha")
(import ./catppuccin.nix (import ./catppuccin.nix
{ {
inherit config lib pkgs; inherit config lib pkgs;

View file

@ -17,7 +17,7 @@ let
yellow = "#f1fa8c"; yellow = "#f1fa8c";
in in
{ {
config = mkIf (cfg.scheme == "dracula") { config = mkIf (cfg.enable && cfg.scheme == "dracula") {
home-manager.users.moritz = { home-manager.users.moritz = {
programs = { programs = {
kitty.extraConfig = kitty.extraConfig =

View file

@ -7,6 +7,11 @@ with lib; {
my = { my = {
# config # config
yubikey.enable = true; yubikey.enable = true;
theming = {
enable = true;
scheme = "catppuccin-macchiato";
};
wallpapers.enable = true;
virtualisation = { virtualisation = {
podman.enable = true; podman.enable = true;
@ -17,7 +22,7 @@ with lib; {
code.enable = true; code.enable = true;
firefox.enable = true; firefox.enable = true;
git.identity.email = "moritz.boehme@l.de"; git.identity.email = "moritz.boehme@l.de";
gnome.enable = true; hyprland.enable = true;
python.versions = { python.versions = {
"38".enable = true; "38".enable = true;
"310".enable = true; "310".enable = true;

View file

@ -37,7 +37,7 @@ in
"feh".state = "floating"; "feh".state = "floating";
"Vampire_Survivors".state = "fullscreen"; "Vampire_Survivors".state = "fullscreen";
}; };
settings = with config.scheme.withHashtag; { settings = {
border_width = 2; border_width = 2;
window_gap = 5; window_gap = 5;
borderless_monocle = true; borderless_monocle = true;