SebastianStork/nixos-config
1
0
Fork 0
mirror of https://github.com/SebastianStork/nixos-config.git synced 2026-01-21 23:11:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modularize the DE config

Browse source
This commit is contained in:
SebastianStork 2024-04-16 22:05:20 +02:00
parent 38a5b3cbb1
commit 4b650721b0
11 changed files with 285 additions and 252 deletions
Download patch file Download diff file Expand all files Collapse all files

103
modules/home/de/default.nix
View file

@ -1,23 +1,16 @@
{
config,
pkgs,
lib,
...
}: let
cfg = config.myConfig.de;
in {
{lib, ...}: {
imports = [
./qtile.nix
./hyprland
./theming.nix
./rofi
./tray.nix
./waybar.nix
./hypridlelock.nix
];
options.myConfig.de = {
theming.enable = lib.mkEnableOption "";
wallpaper = lib.mkOption {
type = lib.types.path;
};
widget = {
backlight = {
enable = lib.mkEnableOption "";
@ -27,87 +20,5 @@ in {
};
battery.enable = lib.mkEnableOption "";
};
tray = {
syncthing.enable = lib.mkEnableOption "";
networkmanager.enable = lib.mkEnableOption "";
};
};
config = lib.mkMerge [
(lib.mkIf cfg.theming.enable {
dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
gtk = {
enable = true;
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
theme.name = "Adwaita-dark";
theme.package = pkgs.gnome.gnome-themes-extra;
iconTheme.name = "Adwaita";
iconTheme.package = pkgs.gnome.adwaita-icon-theme;
font.name = "Open Sans";
font.package = pkgs.open-sans;
};
qt = {
enable = true;
platformTheme = "gtk";
style.name = "adwaita-dark";
style.package = pkgs.adwaita-qt;
};
home.pointerCursor = {
name = "Bibata-Original-Classic";
package = pkgs.bibata-cursors;
size = 24;
gtk.enable = true;
};
})
(lib.mkIf cfg.tray.syncthing.enable {
home.packages = [pkgs.syncthingtray-minimal];
systemd.user.services = {
syncthingtray = {
Unit = {
Description = "Syncthingtray";
Requires = ["tray.target"];
After = ["graphical-session-pre.target" "tray.target"];
PartOf = ["graphical-session.target"];
};
Service = {
ExecStart = "${lib.getExe' pkgs.syncthingtray-minimal "syncthingtray"} --wait";
};
Install = {
WantedBy = ["graphical-session.target"];
};
};
};
})
(lib.mkIf cfg.tray.networkmanager.enable {
home.packages = [pkgs.networkmanagerapplet];
systemd.user.services = {
nm-applet = {
Unit = {
Description = "Networkmanager-applet";
Requires = ["tray.target"];
After = ["graphical-session-pre.target" "tray.target"];
PartOf = ["graphical-session.target"];
};
Service = {
ExecStart = "${lib.getExe pkgs.networkmanagerapplet}";
};
Install = {
WantedBy = ["graphical-session.target"];
};
};
};
})
];
}

7
modules/home/de/hyprland/hypridlelock.nix → modules/home/de/hypridlelock.nix
View file

@ -10,9 +10,12 @@
inputs.hypridle.homeManagerModules.hypridle
];
config = lib.mkIf config.myConfig.de.hyprland.enable {
options.myConfig.de.hypridlelock.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.de.hypridlelock.enable {
programs.hyprlock = {
enable = true;
backgrounds = [
{
path = "screenshot";
@ -26,9 +29,11 @@
hyprlockExe = "${lib.getExe inputs.hyprlock.packages.${pkgs.system}.default}";
in {
enable = true;
lockCmd = "pidof ${hyprlockExe} || ${hyprlockExe}";
# beforeSleepCmd = "loginctl lock-session";
afterSleepCmd = "hyprctl dispatch dpms on";
listeners = [
{
timeout = 600;

154
modules/home/de/hyprland/config.nix Normal file
View file

@ -0,0 +1,154 @@
{
config,
pkgs,
lib,
...
}: {
config = lib.mkIf config.myConfig.de.hyprland.enable {
wayland.windowManager.hyprland = {
enable = true;
settings = {
exec-once = ["hyprpaper"];
input = {
kb_layout = "de";
kb_variant = "nodeadkeys";
accel_profile = "flat";
};
input.touchpad = {
disable_while_typing = true;
natural_scroll = true;
middle_button_emulation = true;
};
device = {
name = "dell0b9f:00-27c6:0d43-touchpad";
accel_profile = "adaptive";
};
general = {
gaps_in = 5;
gaps_out = 10;
border_size = 1;
layout = "master";
};
master = {
new_is_master = false;
no_gaps_when_only = 1;
mfact = "0.5";
};
decoration = {
rounding = 6;
drop_shadow = false;
};
animations.enabled = false;
misc = {
disable_hyprland_logo = true;
disable_splash_rendering = true;
force_default_wallpaper = 0;
};
"$mod" = "SUPER";
"$terminal" = "kitty";
"$browser" = "brave";
"$fileManager" = "nemo";
"$editor" = "codium";
bind =
[
# Essentials
"$mod CONTROL, Q, exit,"
"$mod CONTROL, S, exec, systemctl suspend"
"$mod CONTROL, L, exec, loginctl lock-session"
"$mod SHIFT, C, killactive,"
"$mod, TAB, cyclenext,"
"$mod SHIFT, V, togglefloating,"
"$mod SHIFT, F, fullscreen, 0"
# Launch programs
"$mod, RETURN, exec, $terminal"
"$mod, V, exec, ${lib.getExe pkgs.cliphist} list | rofi -dmenu | ${lib.getExe pkgs.cliphist} decode | ${lib.getExe' pkgs.wl-clipboard "wl-copy"}"
"$mod, B, exec, $browser"
"$mod, F, exec, $fileManager"
"$mod, C, exec, $editor"
"$mod, S, exec, spotify"
# Move focus
"$mod, left, movefocus, l"
"$mod, right, movefocus, r"
"$mod, up, movefocus, u"
"$mod, down, movefocus, d"
# Move window
"$mod SHIFT, left, movewindow, l"
"$mod SHIFT, right, movewindow, r"
"$mod SHIFT, up, movewindow, u"
"$mod SHIFT, down, movewindow, d"
# Scroll through workspaces
"$mod, mouse_down, workspace, e-1"
"$mod, mouse_up, workspace, e+1"
]
# Switch workspace
++ (
builtins.concatLists (builtins.genList (
x: [
"$mod, ${toString (x + 1)}, workspace, ${toString (x + 1)}"
"$mod SHIFT, ${toString (x + 1)}, movetoworkspacesilent, ${toString (x + 1)}"
]
)
9)
);
# Release
bindr = [
# Launcher
"$mod, R, exec, pkill rofi || rofi -show drun"
];
# Repeat
binde = [
# Resize window
"$mod CONTROL, left, resizeactive, -100 0"
"$mod CONTROL, right, resizeactive, 100 0"
"$mod CONTROL, up, resizeactive, 0 -100"
"$mod CONTROL, down, resizeactive, 0 100"
];
# Locked
bindl = [
", switch:on:Lid Switch, exec, systemctl suspend"
# Media
", XF86AudioPlay, exec, ${lib.getExe pkgs.playerctl} --player=spotify play-pause"
", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
];
# Repeat + Locked
bindel = [
# Adjust volume
", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
# Adjust brightness
", XF86MonBrightnessUp, exec, brillo -q -u 20000 -A 4"
", XF86MonBrightnessDown, exec, brillo -q -u 20000 -U 4"
];
# Mouse
bindm = [
# Move/resize windows
"$mod, mouse:272, movewindow"
"$mod, mouse:273, resizewindow"
];
};
};
};
}

154
modules/home/de/hyprland/default.nix
View file

@ -6,10 +6,7 @@
}: let
cfg = config.myConfig.de;
in {
imports = [
./waybar.nix
./hypridlelock.nix
];
imports = [./config.nix];
options.myConfig.de.hyprland.enable = lib.mkEnableOption "";
@ -21,155 +18,14 @@ in {
splash=false
'';
myConfig.rofi.enable = true;
services.cliphist.enable = true;
services.dunst.enable = true;
wayland.windowManager.hyprland = {
enable = true;
settings = {
exec-once = ["hyprpaper"];
input = {
kb_layout = "de";
kb_variant = "nodeadkeys";
accel_profile = "flat";
};
input.touchpad = {
disable_while_typing = true;
natural_scroll = true;
middle_button_emulation = true;
};
device = {
name = "dell0b9f:00-27c6:0d43-touchpad";
accel_profile = "adaptive";
};
general = {
gaps_in = 5;
gaps_out = 10;
border_size = 1;
layout = "master";
};
master = {
new_is_master = false;
no_gaps_when_only = 1;
mfact = "0.5";
};
decoration = {
rounding = 6;
drop_shadow = false;
};
animations.enabled = false;
misc = {
disable_hyprland_logo = true;
disable_splash_rendering = true;
force_default_wallpaper = 0;
};
"$mod" = "SUPER";
"$terminal" = "kitty";
"$browser" = "brave";
"$fileManager" = "nemo";
"$editor" = "codium";
bind =
[
# Essentials
"$mod CONTROL, Q, exit,"
"$mod CONTROL, S, exec, systemctl suspend"
"$mod CONTROL, L, exec, loginctl lock-session"
"$mod SHIFT, C, killactive,"
"$mod, TAB, cyclenext,"
"$mod SHIFT, V, togglefloating,"
"$mod SHIFT, F, fullscreen, 0"
# Launch programs
"$mod, RETURN, exec, $terminal"
"$mod, V, exec, ${lib.getExe pkgs.cliphist} list | rofi -dmenu | ${lib.getExe pkgs.cliphist} decode | ${lib.getExe' pkgs.wl-clipboard "wl-copy"}"
"$mod, B, exec, $browser"
"$mod, F, exec, $fileManager"
"$mod, C, exec, $editor"
"$mod, S, exec, spotify"
# Move focus
"$mod, left, movefocus, l"
"$mod, right, movefocus, r"
"$mod, up, movefocus, u"
"$mod, down, movefocus, d"
# Move window
"$mod SHIFT, left, movewindow, l"
"$mod SHIFT, right, movewindow, r"
"$mod SHIFT, up, movewindow, u"
"$mod SHIFT, down, movewindow, d"
# Scroll through workspaces
"$mod, mouse_down, workspace, e-1"
"$mod, mouse_up, workspace, e+1"
]
# Switch workspace
++ (
builtins.concatLists (builtins.genList (
x: [
"$mod, ${toString (x + 1)}, workspace, ${toString (x + 1)}"
"$mod SHIFT, ${toString (x + 1)}, movetoworkspacesilent, ${toString (x + 1)}"
]
)
9)
);
# Release
bindr = [
# Launcher
"$mod, R, exec, pkill rofi || rofi -show drun"
];
# Repeat
binde = [
# Resize window
"$mod CONTROL, left, resizeactive, -100 0"
"$mod CONTROL, right, resizeactive, 100 0"
"$mod CONTROL, up, resizeactive, 0 -100"
"$mod CONTROL, down, resizeactive, 0 100"
];
# Locked
bindl = [
", switch:on:Lid Switch, exec, systemctl suspend"
# Media
", XF86AudioPlay, exec, ${lib.getExe pkgs.playerctl} --player=spotify play-pause"
", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
];
# Repeat + Locked
bindel = [
# Adjust volume
", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
# Adjust brightness
", XF86MonBrightnessUp, exec, brillo -q -u 20000 -A 4"
", XF86MonBrightnessDown, exec, brillo -q -u 20000 -U 4"
];
# Mouse
bindm = [
# Move/resize windows
"$mod, mouse:272, movewindow"
"$mod, mouse:273, resizewindow"
];
};
myConfig.de = {
rofi.enable = true;
hypridlelock.enable = true;
waybar.enable = true;
};
};
}

2
modules/home/de/qtile.nix
View file

@ -23,7 +23,7 @@ in {
xsession.enable = true;
myConfig.rofi.enable = true;
myConfig.de.rofi.enable = true;
services.clipmenu = {
enable = true;
launcher = "rofi";

20
modules/home/de/rofi/default.nix Normal file
View file

@ -0,0 +1,20 @@
{
config,
pkgs,
lib,
...
}: let
cfg = config.myConfig.de.rofi;
in {
options.myConfig.de.rofi = {
enable = lib.mkEnableOption "";
};
config = lib.mkIf cfg.enable {
programs.rofi = {
enable = true;
package = pkgs.rofi-wayland;
theme = ./theme.rasi;
};
};
}

319
modules/home/de/rofi/theme.rasi Normal file
View file

@ -0,0 +1,319 @@
/**
*
* Author : Aditya Shakya (adi1090x)
* Github : @adi1090x
*
* Rofi Theme File
* Rofi Version: 1.7.3
**/
/*****----- Configuration -----*****/
configuration {
modi: "drun,run,filebrowser,window";
show-icons: true;
display-drun: "";
display-run: "";
display-filebrowser: "";
display-window: "";
drun-display-format: "{name}";
window-format: "{w} · {c} · {t}";
}
/*****----- Global Properties -----*****/
* {
background: #1E2127FF;
background-alt: #282B31FF;
foreground: #FFFFFFFF;
selected: #61AFEFFF;
active: #98C379FF;
urgent: #E06C75FF;
}
* {
font: "Open Sans 12, Symbols Nerd Font 12";
}
* {
border-colour: var(selected);
handle-colour: var(selected);
background-colour: var(background);
foreground-colour: var(foreground);
alternate-background: var(background-alt);
normal-background: var(background);
normal-foreground: var(foreground);
urgent-background: var(urgent);
urgent-foreground: var(background);
active-background: var(active);
active-foreground: var(background);
selected-normal-background: var(selected);
selected-normal-foreground: var(background);
selected-urgent-background: var(active);
selected-urgent-foreground: var(background);
selected-active-background: var(urgent);
selected-active-foreground: var(background);
alternate-normal-background: var(background);
alternate-normal-foreground: var(foreground);
alternate-urgent-background: var(urgent);
alternate-urgent-foreground: var(background);
alternate-active-background: var(active);
alternate-active-foreground: var(background);
}
/*****----- Main Window -----*****/
window {
/* properties for window widget */
transparency: "real";
location: center;
anchor: center;
fullscreen: false;
width: 600px;
x-offset: 0px;
y-offset: 0px;
/* properties for all widgets */
enabled: true;
margin: 0px;
padding: 0px;
border: 0px solid;
border-radius: 10px;
border-color: @border-colour;
cursor: "default";
/* Backgroud Colors */
background-color: @background-colour;
/* Backgroud Image */
//background-image: url("/path/to/image.png", none);
/* Simple Linear Gradient */
//background-image: linear-gradient(red, orange, pink, purple);
/* Directional Linear Gradient */
//background-image: linear-gradient(to bottom, pink, yellow, magenta);
/* Angle Linear Gradient */
//background-image: linear-gradient(45, cyan, purple, indigo);
}
/*****----- Main Box -----*****/
mainbox {
enabled: true;
spacing: 10px;
margin: 0px;
padding: 30px;
border: 0px solid;
border-radius: 0px 0px 0px 0px;
border-color: @border-colour;
background-color: transparent;
children: [ "inputbar", "message", "listview" ];
}
/*****----- Inputbar -----*****/
inputbar {
enabled: true;
spacing: 10px;
margin: 0px;
padding: 0px;
border: 0px solid;
border-radius: 0px;
border-color: @border-colour;
background-color: transparent;
text-color: @foreground-colour;
children: [ "textbox-prompt-colon", "entry", "mode-switcher" ];
}
prompt {
enabled: true;
background-color: inherit;
text-color: inherit;
}
textbox-prompt-colon {
enabled: true;
padding: 5px 0px;
expand: false;
str: "";
background-color: inherit;
text-color: inherit;
}
entry {
enabled: true;
padding: 5px 0px;
background-color: inherit;
text-color: inherit;
cursor: text;
placeholder: "Search...";
placeholder-color: inherit;
}
num-filtered-rows {
enabled: true;
expand: false;
background-color: inherit;
text-color: inherit;
}
textbox-num-sep {
enabled: true;
expand: false;
str: "/";
background-color: inherit;
text-color: inherit;
}
num-rows {
enabled: true;
expand: false;
background-color: inherit;
text-color: inherit;
}
case-indicator {
enabled: true;
background-color: inherit;
text-color: inherit;
}
/*****----- Listview -----*****/
listview {
enabled: true;
columns: 1;
lines: 8;
cycle: true;
dynamic: true;
scrollbar: true;
layout: vertical;
reverse: false;
fixed-height: true;
fixed-columns: true;
spacing: 5px;
margin: 0px;
padding: 0px;
border: 0px solid;
border-radius: 0px;
border-color: @border-colour;
background-color: transparent;
text-color: @foreground-colour;
cursor: "default";
}
scrollbar {
handle-width: 5px ;
handle-color: @handle-colour;
border-radius: 10px;
background-color: @alternate-background;
}
/*****----- Elements -----*****/
element {
enabled: true;
spacing: 10px;
margin: 0px;
padding: 5px 10px;
border: 0px solid;
border-radius: 10px;
border-color: @border-colour;
background-color: transparent;
text-color: @foreground-colour;
cursor: pointer;
}
element normal.normal {
background-color: var(normal-background);
text-color: var(normal-foreground);
}
element normal.urgent {
background-color: var(urgent-background);
text-color: var(urgent-foreground);
}
element normal.active {
background-color: var(active-background);
text-color: var(active-foreground);
}
element selected.normal {
background-color: var(selected-normal-background);
text-color: var(selected-normal-foreground);
}
element selected.urgent {
background-color: var(selected-urgent-background);
text-color: var(selected-urgent-foreground);
}
element selected.active {
background-color: var(selected-active-background);
text-color: var(selected-active-foreground);
}
element alternate.normal {
background-color: var(alternate-normal-background);
text-color: var(alternate-normal-foreground);
}
element alternate.urgent {
background-color: var(alternate-urgent-background);
text-color: var(alternate-urgent-foreground);
}
element alternate.active {
background-color: var(alternate-active-background);
text-color: var(alternate-active-foreground);
}
element-icon {
background-color: transparent;
text-color: inherit;
size: 24px;
cursor: inherit;
}
element-text {
background-color: transparent;
text-color: inherit;
highlight: inherit;
cursor: inherit;
vertical-align: 0.5;
horizontal-align: 0.0;
}
/*****----- Mode Switcher -----*****/
mode-switcher{
enabled: true;
spacing: 10px;
margin: 0px;
padding: 0px;
border: 0px solid;
border-radius: 0px;
border-color: @border-colour;
background-color: transparent;
text-color: @foreground-colour;
}
button {
padding: 5px 10px;
border: 0px solid;
border-radius: 10px;
border-color: @border-colour;
background-color: @alternate-background;
text-color: inherit;
cursor: pointer;
}
button selected {
background-color: var(selected-normal-background);
text-color: var(selected-normal-foreground);
}
/*****----- Message -----*****/
message {
enabled: true;
margin: 0px;
padding: 0px;
border: 0px solid;
border-radius: 0px 0px 0px 0px;
border-color: @border-colour;
background-color: transparent;
text-color: @foreground-colour;
}
textbox {
padding: 8px 10px;
border: 0px solid;
border-radius: 10px;
border-color: @border-colour;
background-color: @alternate-background;
text-color: @foreground-colour;
vertical-align: 0.5;
horizontal-align: 0.0;
highlight: none;
placeholder-color: @foreground-colour;
blink: true;
markup: true;
}
error-message {
padding: 10px;
border: 2px solid;
border-radius: 10px;
border-color: @border-colour;
background-color: @background-colour;
text-color: @foreground-colour;
}

48
modules/home/de/theming.nix Normal file
View file

@ -0,0 +1,48 @@
{
config,
pkgs,
lib,
...
}: let
cfg = config.myConfig.de;
in {
options.myConfig.de = {
theming.enable = lib.mkEnableOption "";
wallpaper = lib.mkOption {
type = lib.types.path;
};
};
config = lib.mkIf cfg.theming.enable {
dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
gtk = {
enable = true;
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
theme.name = "Adwaita-dark";
theme.package = pkgs.gnome.gnome-themes-extra;
iconTheme.name = "Adwaita";
iconTheme.package = pkgs.gnome.adwaita-icon-theme;
font.name = "Open Sans";
font.package = pkgs.open-sans;
};
qt = {
enable = true;
platformTheme = "gtk";
style.name = "adwaita-dark";
style.package = pkgs.adwaita-qt;
};
home.pointerCursor = {
name = "Bibata-Original-Classic";
package = pkgs.bibata-cursors;
size = 24;
gtk.enable = true;
};
};
}

59
modules/home/de/tray.nix Normal file
View file

@ -0,0 +1,59 @@
{
config,
pkgs,
lib,
...
}: let
cfg = config.myConfig.de;
in {
options.myConfig.de = {
tray = {
syncthing.enable = lib.mkEnableOption "";
networkmanager.enable = lib.mkEnableOption "";
};
};
config = lib.mkMerge [
(lib.mkIf cfg.tray.syncthing.enable {
home.packages = [pkgs.syncthingtray-minimal];
systemd.user.services = {
syncthingtray = {
Unit = {
Description = "Syncthingtray";
Requires = ["tray.target"];
After = ["graphical-session-pre.target" "tray.target"];
PartOf = ["graphical-session.target"];
};
Service = {
ExecStart = "${lib.getExe' pkgs.syncthingtray-minimal "syncthingtray"} --wait";
};
Install = {
WantedBy = ["graphical-session.target"];
};
};
};
})
(lib.mkIf cfg.tray.networkmanager.enable {
home.packages = [pkgs.networkmanagerapplet];
systemd.user.services = {
nm-applet = {
Unit = {
Description = "Networkmanager-applet";
Requires = ["tray.target"];
After = ["graphical-session-pre.target" "tray.target"];
PartOf = ["graphical-session.target"];
};
Service = {
ExecStart = "${lib.getExe pkgs.networkmanagerapplet}";
};
Install = {
WantedBy = ["graphical-session.target"];
};
};
};
})
];
}

4
modules/home/de/hyprland/waybar.nix → modules/home/de/waybar.nix
View file

@ -4,7 +4,9 @@
lib,
...
}: {
config = lib.mkIf config.myConfig.de.hyprland.enable {
options.myConfig.de.waybar.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.de.waybar.enable {
programs.waybar = {
enable = true;
systemd.enable = true;