aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/desktop/application-launcher/fzf/default.nix2
-rw-r--r--modules/desktop/default.nix1
-rw-r--r--modules/desktop/display-server/compositor/default.nix7
-rw-r--r--modules/desktop/display-server/compositor/picom/default.nix23
-rw-r--r--modules/desktop/display-server/default.nix1
-rw-r--r--modules/desktop/display-server/x11/xinit/default.nix6
-rw-r--r--modules/desktop/window-manager/sxhkd/default.nix4
-rw-r--r--modules/tools/default.nix1
-rw-r--r--modules/tools/file-manager/lf/default.nix4
-rw-r--r--modules/tools/terminal/alacritty/default.nix (renamed from modules/desktop/terminal/alacritty/default.nix)16
-rw-r--r--modules/tools/terminal/default.nix (renamed from modules/desktop/terminal/default.nix)2
-rw-r--r--modules/tools/terminal/kitty/default.nix (renamed from modules/desktop/terminal/kitty/default.nix)23
-rw-r--r--modules/tools/viewer/default.nix1
-rw-r--r--modules/tools/viewer/feh/default.nix11
14 files changed, 80 insertions, 22 deletions
diff --git a/modules/desktop/application-launcher/fzf/default.nix b/modules/desktop/application-launcher/fzf/default.nix
index 2047919..6a1c4a6 100644
--- a/modules/desktop/application-launcher/fzf/default.nix
+++ b/modules/desktop/application-launcher/fzf/default.nix
@@ -16,7 +16,7 @@
desktop.application-launcher.default = lib.mkDefault "fzf";
desktop.application-launcher.command =
if config.desktop.application-launcher.default == "fzf" then
- lib.mkForce "${config.desktop.terminal.command} --title 'Application Launcher' --class floating-termial -e ${(pkgs.writeShellScript "fzf-launch.sh" (builtins.readFile ./launch.sh))}"
+ lib.mkForce "${config.tools.terminal.command} --title 'Application Launcher' --class floating-termial -e ${(pkgs.writeShellScript "fzf-launch.sh" (builtins.readFile ./launch.sh))}"
else "";
};
}
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 43ef865..e015ea9 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -5,7 +5,6 @@
./application-launcher
./display-server
./status-bar
- ./terminal
./window-manager
./xdg-portal
];
diff --git a/modules/desktop/display-server/compositor/default.nix b/modules/desktop/display-server/compositor/default.nix
new file mode 100644
index 0000000..ae5fc6d
--- /dev/null
+++ b/modules/desktop/display-server/compositor/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+ imports = [
+ ./picom
+ ];
+}
diff --git a/modules/desktop/display-server/compositor/picom/default.nix b/modules/desktop/display-server/compositor/picom/default.nix
new file mode 100644
index 0000000..f138793
--- /dev/null
+++ b/modules/desktop/display-server/compositor/picom/default.nix
@@ -0,0 +1,23 @@
+{ lib, config, ... }:
+
+{
+ options.desktop.display-server.compositor.picom = {
+ enable = lib.mkEnableOption "Enables picom.";
+ };
+
+ config = lib.mkIf config.desktop.display-server.compositor.picom.enable {
+ services.picom.enable = true;
+ services.picom.backend = "xrender";
+ services.picom.fade = false;
+ services.picom.shadow = false;
+ services.picom.settings = {
+ blur-background = false;
+ background = "#000000";
+ };
+ services.picom.activeOpacity = 0.8;
+ services.picom.inactiveOpacity = 0.8;
+ services.picom.opacityRules = [
+ "70:class_g = 'Polybar'" # 70% opacity for Polybar
+ ];
+ };
+}
diff --git a/modules/desktop/display-server/default.nix b/modules/desktop/display-server/default.nix
index f81358d..5062f7c 100644
--- a/modules/desktop/display-server/default.nix
+++ b/modules/desktop/display-server/default.nix
@@ -2,6 +2,7 @@
{
imports = [
+ ./compositor
./x11
];
}
diff --git a/modules/desktop/display-server/x11/xinit/default.nix b/modules/desktop/display-server/x11/xinit/default.nix
index b665e0b..9bf7de3 100644
--- a/modules/desktop/display-server/x11/xinit/default.nix
+++ b/modules/desktop/display-server/x11/xinit/default.nix
@@ -12,6 +12,12 @@
''
#!/bin/sh
xsetroot -solid "${config.scheme.withHashtag.base00}"
+${if config.desktop.display-server.compositor.picom.enable then
+ "picom &"
+else ""}
+${if config.tools.viewer.feh.enable then
+ "feh --bg-scale ${../../../../../assets/background.png}"
+else ""}
${if config.desktop.status-bar.polybar.enable then
config.desktop.status-bar.polybar.command
else ""}
diff --git a/modules/desktop/window-manager/sxhkd/default.nix b/modules/desktop/window-manager/sxhkd/default.nix
index 6e5d9bb..953cfd3 100644
--- a/modules/desktop/window-manager/sxhkd/default.nix
+++ b/modules/desktop/window-manager/sxhkd/default.nix
@@ -34,12 +34,12 @@
${(createKeybinding
"t"
"Launch terminal.")}
- = config.desktop.terminal.command;
+ = config.tools.terminal.command;
${(createKeybinding
"f"
"Launch File Manager.")}
- = "${config.desktop.terminal.command} --title 'File Manager' --class floating-termial -e ${config.tools.file-manager.command}";
+ = "${config.tools.terminal.command} --title 'File Manager' --class floating-termial -e ${config.tools.file-manager.command}";
}
];
};
diff --git a/modules/tools/default.nix b/modules/tools/default.nix
index 3916111..0180df9 100644
--- a/modules/tools/default.nix
+++ b/modules/tools/default.nix
@@ -6,6 +6,7 @@
./file-manager
./git
./system-monitor
+ ./terminal
./utils
./viewer
];
diff --git a/modules/tools/file-manager/lf/default.nix b/modules/tools/file-manager/lf/default.nix
index 983b2f2..755ccd7 100644
--- a/modules/tools/file-manager/lf/default.nix
+++ b/modules/tools/file-manager/lf/default.nix
@@ -22,8 +22,8 @@
#!/bin/sh
unset COLORTERM
${if config.tools.viewer.bat.enable then
- "bat -pp --line-range=:500 --color=always $1"
-else "cat"}
+ "bat -pp --line-range=:500 --color=always"
+else "cat"} "$1"
'';
programs.lf.extraConfig = "set icons";
diff --git a/modules/desktop/terminal/alacritty/default.nix b/modules/tools/terminal/alacritty/default.nix
index 151e098..4bffc0b 100644
--- a/modules/desktop/terminal/alacritty/default.nix
+++ b/modules/tools/terminal/alacritty/default.nix
@@ -1,15 +1,15 @@
{ pkgs, config, lib, ... }:
{
- options.desktop.terminal.alacritty = {
+ options.tools.terminal.alacritty = {
enable = lib.mkEnableOption "Enables alacritty.";
};
- config = lib.mkIf config.desktop.terminal.alacritty.enable {
+ config = lib.mkIf config.tools.terminal.alacritty.enable {
programs.alacritty.enable = true;
- desktop.terminal.default = lib.mkDefault "alacritty";
- desktop.terminal.command =
- if config.desktop.terminal.default == "alacritty" then
+ tools.terminal.default = lib.mkDefault "alacritty";
+ tools.terminal.command =
+ if config.tools.terminal.default == "alacritty" then
lib.mkForce "${pkgs.kitty}/bin/alacritty"
else "";
@@ -17,10 +17,10 @@
window = {
opacity = 1.0;
padding = {
- x = 4;
- y = 0;
+ x = config.desktop.window-manager.gap;
+ y = config.desktop.window-manager.gap;
};
- decorations = "full";
+ decorations = "none";
};
font = {
diff --git a/modules/desktop/terminal/default.nix b/modules/tools/terminal/default.nix
index 189c794..b9038e0 100644
--- a/modules/desktop/terminal/default.nix
+++ b/modules/tools/terminal/default.nix
@@ -6,7 +6,7 @@
./kitty
];
- options.desktop.terminal = {
+ options.tools.terminal = {
command = lib.mkOption {
type = lib.types.str;
description = "Command for the terminal.";
diff --git a/modules/desktop/terminal/kitty/default.nix b/modules/tools/terminal/kitty/default.nix
index a34e58a..5508feb 100644
--- a/modules/desktop/terminal/kitty/default.nix
+++ b/modules/tools/terminal/kitty/default.nix
@@ -1,21 +1,21 @@
{ pkgs, config, lib, ... }:
{
- options.desktop.terminal.kitty = {
- enable = lib.mkEnableOption "Enables kitty.";
+ options.tools.terminal.kitty = {
+ enable = lib.mkEnableOption "Enables kitty. WARNING! Currently faces problems with color rendering with picom.";
};
- config = lib.mkIf config.desktop.terminal.kitty.enable {
+ config = lib.mkIf config.tools.terminal.kitty.enable {
assertions = [
{
assertion = config.desktop.xdg-portal.enable;
- message ="Module desktop.terminal.kitty requires desktop.xdg-portal module to be enabled.";
+ message ="Module tools.terminal.kitty requires desktop.xdg-portal module to be enabled.";
}
];
programs.kitty.enable = true;
- desktop.terminal.default = lib.mkDefault "kitty";
- desktop.terminal.command =
- if config.desktop.terminal.default == "kitty" then
+ tools.terminal.default = lib.mkDefault "kitty";
+ tools.terminal.command =
+ if config.tools.terminal.default == "kitty" then
lib.mkForce "${pkgs.kitty}/bin/kitty"
else "";
@@ -33,15 +33,24 @@
background = base00;
foreground = base05;
+ text_composition_strategy = "legacy";
color0 = base00; # Black
+ color8 = base00; # Black
color1 = base08; # Red
+ color9 = base08; # Red
color2 = base0B; # Green
+ color10 = base0B; # Green
color3 = base0A; # Yellow
+ color11 = base0A; # Yellow
color4 = base0D; # Blue
+ color12 = base0D; # Blue
color5 = base0E; # Magenta
+ color13 = base0E; # Magenta
color6 = base0C; # Cyan
+ color14 = base0C; # Cyan
color7 = base05; # White
+ color15 = base05; # White
selection_background = base03;
selection_foreground = base00;
diff --git a/modules/tools/viewer/default.nix b/modules/tools/viewer/default.nix
index 7784a99..01fd204 100644
--- a/modules/tools/viewer/default.nix
+++ b/modules/tools/viewer/default.nix
@@ -3,5 +3,6 @@
{
imports = [
./bat
+ ./feh
];
}
diff --git a/modules/tools/viewer/feh/default.nix b/modules/tools/viewer/feh/default.nix
new file mode 100644
index 0000000..d90e8b1
--- /dev/null
+++ b/modules/tools/viewer/feh/default.nix
@@ -0,0 +1,11 @@
+{ config, lib, pkgs, ... }:
+
+{
+ options.tools.viewer.feh = {
+ enable = lib.mkEnableOption "Enables feh.";
+ };
+
+ config = lib.mkIf config.tools.viewer.feh.enable {
+ programs.feh.enable = true;
+ };
+}
generated by cgit v1.2.3 (git 2.39.1) at 2026-10-11 04:42:40 +0000