summaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
Diffstat (limited to 'users')
-rw-r--r--users/seth/default.nix1
-rw-r--r--users/seth/desktop/budgie/default.nix2
-rw-r--r--users/seth/desktop/default.nix2
-rw-r--r--users/seth/desktop/gnome/default.nix145
-rw-r--r--users/seth/desktop/plasma/default.nix47
5 files changed, 109 insertions, 88 deletions
diff --git a/users/seth/default.nix b/users/seth/default.nix
index 4a898e1..586a019 100644
--- a/users/seth/default.nix
+++ b/users/seth/default.nix
@@ -23,6 +23,7 @@
imports = [
./home.nix
];
+
nixpkgs.overlays = overlays;
};
}
diff --git a/users/seth/desktop/budgie/default.nix b/users/seth/desktop/budgie/default.nix
index 30bc497..335ae8d 100644
--- a/users/seth/desktop/budgie/default.nix
+++ b/users/seth/desktop/budgie/default.nix
@@ -27,7 +27,7 @@ in {
rev = "3c808cbb4f9c87be43ba5241bc57373c793d2f17";
sha256 = "sha256-w9XVtEe7TqzxxGUCDUR9BFkzLZjG8XrplXJ3lX6f+x0=";
}
- + "/catppuccin-${cfg.flavour}.yml";
+ + "/catppuccin-mocha.yml";
in
(fromYaml file)
// {
diff --git a/users/seth/desktop/default.nix b/users/seth/desktop/default.nix
index 3984a93..02e56a1 100644
--- a/users/seth/desktop/default.nix
+++ b/users/seth/desktop/default.nix
@@ -1,6 +1,8 @@
{pkgs, ...}: {
imports = [
./budgie
+ ./gnome
+ ./plasma
../programs/mangohud.nix
../programs/firefox.nix
];
diff --git a/users/seth/desktop/gnome/default.nix b/users/seth/desktop/gnome/default.nix
index 59198a2..6579447 100644
--- a/users/seth/desktop/gnome/default.nix
+++ b/users/seth/desktop/gnome/default.nix
@@ -1,75 +1,84 @@
-{pkgs, ...}: {
- imports = [
- ../.
- ];
- home.packages = with pkgs;
- [adw-gtk3]
- ++ (with pkgs.gnomeExtensions; [
- appindicator
- blur-my-shell
- caffeine
- gradience
- ]);
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}: let
+ cfg = config.desktop.gnome;
+ inherit (lib) mkEnableOption mkIf;
+in {
+ options.desktop.gnome.enable = mkEnableOption "enable gnome";
- dconf = {
- enable = true;
- settings = {
- "org/gnome/shell" = {
- disable-user-extensions = false;
- enabled-extensions = [
- "[email protected]"
- "[email protected]"
- ];
- favorite-apps = [
- "firefox.desktop"
- "org.gnome.Nautilus.desktop"
- "discord-canary.desktop"
- ];
- };
- "org/gnome/desktop/interface" = {
- color-scheme = "prefer-dark";
- font-antialiasing = ''rgba'';
- font-name = ''Noto Sans 11'';
- document-font-name = ''Noto Sans 11'';
- monospace-font-name = ''FiraCode Nerd Font 10'';
- };
- "org/gnome/desktop/peripherals/mouse" = {
- accel-profile = ''flat'';
- };
- "org/gnome/desktop/wm/preferences" = {
- titlebar-font = ''Noto Sans Bold 11'';
- };
- "org/gnome/desktop/wm/keybindings" = {
- switch-windows = ["<Alt>Tab"];
- switch-windows-backward = ["<Shift><Alt>Tab"];
- };
- "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
- name = "blackbox";
- command = "blackbox";
- binding = "<Control><Alt>t";
- };
- "com/raggesilver/BlackBox" = {
- font = ''FiraCode Nerd Font 12'';
- theme-dark = ''Catppuccin-Mocha'';
- remember-window-size = true;
+ config = mkIf cfg.enable {
+ home.packages = with pkgs;
+ [adw-gtk3]
+ ++ (with pkgs.gnomeExtensions; [
+ appindicator
+ blur-my-shell
+ caffeine
+ gradience
+ ]);
+
+ dconf = {
+ enable = true;
+ settings = {
+ "org/gnome/shell" = {
+ disable-user-extensions = false;
+ enabled-extensions = [
+ "[email protected]"
+ "[email protected]"
+ ];
+ favorite-apps = [
+ "firefox.desktop"
+ "org.gnome.Nautilus.desktop"
+ "discord-canary.desktop"
+ ];
+ };
+ "org/gnome/desktop/interface" = {
+ color-scheme = "prefer-dark";
+ font-antialiasing = ''rgba'';
+ font-name = ''Noto Sans 11'';
+ document-font-name = ''Noto Sans 11'';
+ monospace-font-name = ''FiraCode Nerd Font 10'';
+ };
+ "org/gnome/desktop/peripherals/mouse" = {
+ accel-profile = ''flat'';
+ };
+ "org/gnome/desktop/wm/preferences" = {
+ titlebar-font = ''Noto Sans Bold 11'';
+ };
+ "org/gnome/desktop/wm/keybindings" = {
+ switch-windows = ["<Alt>Tab"];
+ switch-windows-backward = ["<Shift><Alt>Tab"];
+ };
+ "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
+ name = "blackbox";
+ command = "blackbox";
+ binding = "<Control><Alt>t";
+ };
+ "com/raggesilver/BlackBox" = {
+ font = ''FiraCode Nerd Font 12'';
+ theme-dark = ''Catppuccin-Mocha'';
+ remember-window-size = true;
+ };
};
};
- };
- gtk = {
- enable = true;
- theme = {
- name = "adw-gtk3";
- package = pkgs.adw-gtk3;
+ gtk = {
+ enable = true;
+ theme = {
+ name = "adw-gtk3";
+ package = pkgs.adw-gtk3;
+ };
};
- };
- xdg.dataFile."blackbox/schemes/Catppuccin-Mocha.json".source =
- pkgs.fetchFromGitHub {
- owner = "catppuccin";
- repo = "tilix";
- rev = "3fd05e03419321f2f2a6aad6da733b28be1765ef";
- sha256 = "sha256-SI7QxQ+WBHzeuXbTye+s8pi4tDVZOV4Aa33mRYO276k=";
- }
- + "/src/Catppuccin-Mocha.json";
+ xdg.dataFile."blackbox/schemes/Catppuccin-Mocha.json".source =
+ pkgs.fetchFromGitHub {
+ owner = "catppuccin";
+ repo = "tilix";
+ rev = "3fd05e03419321f2f2a6aad6da733b28be1765ef";
+ sha256 = "sha256-SI7QxQ+WBHzeuXbTye+s8pi4tDVZOV4Aa33mRYO276k=";
+ }
+ + "/src/Catppuccin-Mocha.json";
+ };
}
diff --git a/users/seth/desktop/plasma/default.nix b/users/seth/desktop/plasma/default.nix
index 7863f44..ad9c2fb 100644
--- a/users/seth/desktop/plasma/default.nix
+++ b/users/seth/desktop/plasma/default.nix
@@ -1,21 +1,30 @@
-{pkgs, ...}: {
- imports = [
- ../.
- ];
- home.packages = with pkgs; [
- catppuccin-cursors
- catppuccin-kde
- catppuccin-kvantum
- libsForQt5.qtstyleplugin-kvantum
- papirus-icon-theme
- ];
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}: let
+ cfg = config.desktop.plasma;
+ inherit (lib) mkEnableOption mkIf;
+in {
+ options.desktop.plasma.enable = mkEnableOption "enable plasma";
- xdg.dataFile."konsole/catppuccin-mocha.colorscheme".source =
- pkgs.fetchFromGitHub {
- owner = "catppuccin";
- repo = "konsole";
- rev = "7d86b8a1e56e58f6b5649cdaac543a573ac194ca";
- sha256 = "EwSJMTxnaj2UlNJm1t6znnatfzgm1awIQQUF3VPfCTM=";
- }
- + "/Catppuccin-Mocha.colorscheme";
+ config = mkIf cfg.enable {
+ home.packages = with pkgs; [
+ catppuccin-cursors
+ catppuccin-kde
+ catppuccin-kvantum
+ libsForQt5.qtstyleplugin-kvantum
+ papirus-icon-theme
+ ];
+
+ xdg.dataFile."konsole/catppuccin-mocha.colorscheme".source =
+ pkgs.fetchFromGitHub {
+ owner = "catppuccin";
+ repo = "konsole";
+ rev = "7d86b8a1e56e58f6b5649cdaac543a573ac194ca";
+ sha256 = "EwSJMTxnaj2UlNJm1t6znnatfzgm1awIQQUF3VPfCTM=";
+ }
+ + "/Catppuccin-Mocha.colorscheme";
+ };
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 19:26:19 +0000