feat(nix): ✨⬆️ magic

0x50F1A · 0x50F1A · commit 5dee1501afd9 · 2024-06-24T15:14:36.000-06:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "nixEnvSelector.nixFile": "${workspaceFolder}/flake.nix"
+}
diff --git a/home/alacritty/default.nix b/home/alacritty/default.nix
@@ -59,7 +59,7 @@ in
             animation = "EaseOutQuint";
             duration = 0;
           };
-          inherit (aura_theme) colors;
+          colors = lib.mkIf (!config.sof.catppuccin.enable) aura_theme.colors;
           cursor = {
             style = {
               shape = "Beam";
diff --git a/home/aws/default.nix b/home/aws/default.nix
@@ -13,49 +13,47 @@
     };
   };
 
-  config =
-    lib.mkIf config.sof.aws.enable {
-      home.packages = builtins.attrValues {
-        inherit (pkgs)
-          awsbck
-          awsls
-          awsume
-          cw
-          e1s
-          pacu
-          rain
-          ssmsh
-          yatas
-          ;
-      };
+  config = lib.mkIf config.sof.aws.enable {
+    home.packages = builtins.attrValues {
+      inherit (pkgs)
+        awsbck
+        awsls
+        awsume
+        cw
+        e1s
+        pacu
+        rain
+        ssmsh
+        yatas
+        ;
+    };
 
-      programs = {
-        awscli = {
-          enable = true;
-        };
+    programs = {
+      awscli = {
+        enable = true;
       };
+    };
 
-      # aws-cli does not work well with xdg base directories
-      # https://github.com/aws/aws-sdk/issues/30#issuecomment-532208981
-      home.sessionVariables = {
-        AWS_CONFIG_FILE = "${config.xdg.configHome}/aws/config";
-        AWS_CLI_HISTORY_FILE = "${config.xdg.dataHome}/aws/history";
-        AWS_CREDENTIALS_FILE = "${config.xdg.dataHome}/aws/credentials";
-        AWS_SHARED_CREDENTIALS_FILE = "${config.xdg.dataHome}/aws/shared-credentials";
-        AWS_WEB_IDENTITY_TOKEN_FILE = "${config.xdg.dataHome}/aws/token";
-      };
-    }
-    // lib.mkIf config.sof.boxxy.enable {
-      programs.boxxy = lib.mkIf config.sof.boxxy.enable {
-        rules = {
+    # aws-cli does not work well with xdg base directories
+    # https://github.com/aws/aws-sdk/issues/30#issuecomment-532208981
+    home.sessionVariables = {
+      AWS_CONFIG_FILE = "${config.xdg.configHome}/aws/config";
+      AWS_CLI_HISTORY_FILE = "${config.xdg.dataHome}/aws/history";
+      AWS_CREDENTIALS_FILE = "${config.xdg.dataHome}/aws/credentials";
+      AWS_SHARED_CREDENTIALS_FILE = "${config.xdg.dataHome}/aws/shared-credentials";
+      AWS_WEB_IDENTITY_TOKEN_FILE = "${config.xdg.dataHome}/aws/token";
+    };
+
+    programs.boxxy = lib.mkIf config.sof.boxxy.enable {
+      rules = [
+        {
           name = "redirect aws-cli from ~/.aws to ${config.xdg.configHome}/aws";
           target = "~/.aws";
           rewrite = "${config.xdg.configHome}/aws";
-        };
-      };
-
-      home.shellAliases = {
-        aws = "boxxy aws";
-      };
+        }
+      ];
     };
+
+    home.shellAliases = lib.mkIf config.sof.boxxy.enable { aws = "boxxy aws"; };
+  };
 }
diff --git a/home/bat/default.nix b/home/bat/default.nix
@@ -18,7 +18,7 @@
       bat = {
         enable = true;
         config = {
-          theme = "Dracula";
+          theme = lib.mkIf (!config.sof.catppuccin.enable) "Dracula";
         };
         # https://github.com/eth-p/bat-extras
         extraPackages = builtins.attrValues {
diff --git a/home/catppuccin/default.nix b/home/catppuccin/default.nix
@@ -13,16 +13,100 @@
     };
   };
 
-  config = lib.mkIf config.sof.catppuccin.enable {
-    catppuccin = {
-      enable = lib.mkForce false;
+  config =
+    let
       accent = flake.config.affineUser.theme.catppuccinAccent;
       flavor = flake.config.affineUser.theme.catppuccinFlavor;
-    };
-    programs = {
-      gitui = {
-        catppuccin.enable = true;
+    in
+    lib.mkIf config.sof.catppuccin.enable {
+      catppuccin = {
+        inherit accent flavor;
+        enable = lib.mkDefault true;
+      };
+      programs = {
+        bat = {
+          catppuccin.enable = true;
+        };
+        bottom = {
+          catppuccin.enable = true;
+        };
+        cava = {
+          catppuccin.enable = true;
+        };
+        fzf = {
+          catppuccin.enable = true;
+        };
+        gh-dash = {
+          catppuccin.enable = true;
+        };
+        git = {
+          delta = {
+            catppuccin.enable = true;
+          };
+        };
+        gitui = {
+          catppuccin.enable = true;
+        };
+        helix = {
+          catppuccin.enable = true;
+        };
+        kitty = {
+          catppuccin.enable = true;
+        };
+        lazygit = {
+          catppuccin.enable = true;
+        };
+        micro = {
+          catppuccin.enable = true;
+        };
+        mpv = {
+          catppuccin.enable = true;
+        };
+        yazi = {
+          catppuccin.enable = true;
+        };
+        zellij = {
+          catppuccin.enable = true;
+        };
+        zsh = {
+          syntaxHighlighting = {
+            catppuccin.enable = true;
+          };
+        };
+      };
+      gtk = {
+        catppuccin = {
+          inherit accent flavor;
+          enable = true;
+          cursor = {
+            inherit accent flavor;
+            enable = true;
+          };
+          gnomeShellTheme = true;
+          icon = {
+            inherit accent flavor;
+            enable = true;
+          };
+        };
+      };
+      qt = {
+        style = {
+          catppuccin = {
+            enable = true;
+          };
+        };
+      };
+      services = {
+        dunst = {
+          catppuccin = {
+            enable = true;
+          };
+        };
+        mako = {
+          catppuccin = {
+            enable = true;
+          };
+        };
       };
     };
-  };
 }
diff --git a/home/default.nix b/home/default.nix
@@ -18,6 +18,7 @@
           ./misc/commandline
           ./atuin
           ./autojump
+          ./aws
           ./bat
           ./broot
           ./carapace
diff --git a/home/firefox/default.nix b/home/firefox/default.nix
@@ -15,10 +15,17 @@
   };
 
   config = lib.mkIf config.sof.firefox.enable {
+    home.sessionVariables = {
+      MOZ_ENABLE_WAYLAND = "0";
+    };
+    warnings = lib.optional (config.sof.nushell.enable) ''
+      Firefox currently renders through XWayland due to explicit sync issues.
+    ''; # https://bugzilla.mozilla.org/show_bug.cgi?id=1898476
+
     programs = {
       firefox = {
         enable = true;
-        package = pkgs.firefox-beta;
+        package = pkgs.firefox;
         profiles = {
           default = {
             id = 0;
diff --git a/home/flameshot/default.nix b/home/flameshot/default.nix
@@ -1,14 +1,31 @@
-{ flake, ... }:
 {
-  services = {
-    flameshot = {
-      enable = true;
-      settings = {
-        General = {
-          savePath = "/home/${flake.config.affineUser.name}/Pictures";
-          saveAsFileExtension = ".png";
-          uiColor = "#2d0096";
-          checkForUpdates = false;
+  config,
+  flake,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  _file = ./default.nix;
+
+  options.sof.flameshot = {
+    enable = lib.mkEnableOption "Soaffine Flameshot Home Configuration" // {
+      default = true;
+    };
+  };
+
+  config = lib.mkIf config.sof.flameshot.enable {
+    home.packages = builtins.attrValues { inherit (pkgs) grim; };
+    services = {
+      flameshot = {
+        enable = true;
+        settings = {
+          General = {
+            savePath = "/home/${flake.config.affineUser.name}/Pictures";
+            saveAsFileExtension = ".png";
+            uiColor = "#2d0096";
+            checkForUpdates = false;
+          };
         };
       };
     };
diff --git a/home/fonts/default.nix b/home/fonts/default.nix
@@ -1,5 +1,27 @@
-_: {
-  fonts = {
-    fontconfig.enable = true;
+{ config, lib, ... }:
+{
+  _file = ./default.nix;
+
+  options.sof.fonts = {
+    enable = lib.mkEnableOption "Soaffine Fonts Home Configuration" // {
+      default = true;
+    };
+  };
+
+  config = lib.mkIf config.sof.fonts.enable {
+    fonts = {
+      fontconfig = {
+        enable = true;
+        defaultFonts = {
+          emoji = [ "Noto Color Emoji" ];
+          monospace = [ "Noto Color Emoji" ];
+          sansSerif = [ "Noto Color Emoji" ];
+          serif = [
+            "Noto Serif"
+            "Noto Color Emoji"
+          ];
+        };
+      };
+    };
   };
 }
diff --git a/home/fzf/default.nix b/home/fzf/default.nix
@@ -12,7 +12,7 @@
     programs = {
       fzf = {
         enable = true;
-        colors = {
+        colors = lib.mkIf (!config.sof.catppuccin.enable) {
           fg = "#cbccc6";
           bg = "#1f2430";
           hl = "#707a8c";
diff --git a/home/git/default.nix b/home/git/default.nix
@@ -25,10 +25,6 @@
         delta = {
           enable = true;
           options = {
-            features = "decorations";
-            decorations = {
-              commit-decoration-style = "bold cyan box ul";
-            };
             hyperlinks = true;
             hyperlinks-file-link-format = "vscode://file/{path}:{line}";
             line-numbers = true;
diff --git a/home/gitui/default.nix b/home/gitui/default.nix
@@ -12,7 +12,6 @@
     programs = {
       gitui = {
         enable = true;
-        catppuccin.enable = true;
       };
     };
   };
diff --git a/home/helix/default.nix b/home/helix/default.nix
diff --git a/home/micro/default.nix b/home/micro/default.nix
diff --git a/nixos/fonts/default.nix b/nixos/fonts/default.nix
diff --git a/nixos/nvidia/default.nix b/nixos/nvidia/default.nix
diff --git a/parts/just-flake.nix b/parts/just-flake.nix
diff --git a/users/default.nix b/users/default.nix

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "nixEnvSelector.nixFile": "${workspaceFolder}/flake.nix"`
	`3`	`+}`