introduce home-manager gui.enable option
This commit is contained in:
parent
ba2e6a1bfe
commit
e32cb845ac
6 changed files with 538 additions and 506 deletions
22
flake.nix
22
flake.nix
|
@ -233,6 +233,25 @@
|
|||
stylix.nixosModules.stylix
|
||||
];
|
||||
stylix.image = ./nixos/assets/wallpaper.png;
|
||||
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-medium.yaml";
|
||||
stylix.fonts = {
|
||||
serif = {
|
||||
package = pkgs.ubuntu_font_family;
|
||||
name = "Ubuntu";
|
||||
};
|
||||
sansSerif = {
|
||||
package = pkgs.ubuntu_font_family;
|
||||
name = "Ubuntu";
|
||||
};
|
||||
monospace = {
|
||||
package = pkgs.jetbrains-mono;
|
||||
name = "JetBrains Mono";
|
||||
};
|
||||
emoji = {
|
||||
package = pkgs.noto-fonts-emoji;
|
||||
name = "Noto Color Emoji";
|
||||
};
|
||||
};
|
||||
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
|
@ -309,7 +328,9 @@
|
|||
retiolum.nixosModules.retiolum
|
||||
private_assets.nixosModules.jobrad
|
||||
homeManagerModules
|
||||
# { home-manager.users.root = import ./nixos/homes/root; }
|
||||
{ home-manager.users.mainUser = import ./nixos/homes/palo; }
|
||||
{ home-manager.users.mainUser.gui.enable = true; }
|
||||
];
|
||||
};
|
||||
chungus = nixosConfigurationSetup {
|
||||
|
@ -317,6 +338,7 @@
|
|||
modules = [
|
||||
homeManagerModules
|
||||
retiolum.nixosModules.retiolum
|
||||
{ home-manager.users.mainUser = import ./nixos/homes/palo; }
|
||||
];
|
||||
};
|
||||
robi = nixosConfigurationSetup {
|
||||
|
|
4
nixos/homes/common/default.nix
Normal file
4
nixos/homes/common/default.nix
Normal file
|
@ -0,0 +1,4 @@
|
|||
{ lib, ... }:
|
||||
{
|
||||
options.gui.enable = lib.mkEnableOption "should GUI packages be anabled?";
|
||||
}
|
|
@ -1,8 +1,8 @@
|
|||
{ pkgs, ... }: {
|
||||
|
||||
imports = [
|
||||
../common
|
||||
./doom-emacs.nix
|
||||
./dunst.nix
|
||||
./i3.nix
|
||||
./ssh.nix
|
||||
./stylix.nix
|
||||
|
@ -10,7 +10,6 @@
|
|||
|
||||
home.stateVersion = "22.11";
|
||||
|
||||
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = "Ingolf Wagner";
|
||||
|
@ -48,52 +47,6 @@
|
|||
settings.tree_view = true;
|
||||
};
|
||||
|
||||
xdg.configFile."albert/albert.conf".text = ''
|
||||
[General]
|
||||
hotkey=Meta+Space
|
||||
showTray=false
|
||||
telemetry=false
|
||||
terminal=urxvt -e
|
||||
|
||||
[org.albert.extension.applications]
|
||||
enabled=true
|
||||
fuzzy=true
|
||||
use_generic_name=true
|
||||
use_keywords=true
|
||||
|
||||
[org.albert.extension.calculator]
|
||||
enabled=true
|
||||
|
||||
[org.albert.extension.hashgenerator]
|
||||
enabled=true
|
||||
|
||||
[org.albert.frontend.widgetboxmodel]
|
||||
alwaysOnTop=true
|
||||
clearOnHide=false
|
||||
displayIcons=true
|
||||
displayScrollbar=false
|
||||
displayShadow=false
|
||||
hideOnClose=false
|
||||
hideOnFocusLoss=true
|
||||
itemCount=5
|
||||
showCentered=true
|
||||
theme=SolarizedBrightViolet
|
||||
'';
|
||||
|
||||
xdg.configFile."Code/User/settings.json".text = builtins.toJSON {
|
||||
"keyboard.dispatch" = "keyCode";
|
||||
"explorer.confirmDragAndDrop" = false;
|
||||
"editor.tabSize" = 2;
|
||||
"window.zoomLevel" = -1;
|
||||
"git.enableSmartCommit" = true;
|
||||
"files.autoSave" = "onFocusChange";
|
||||
"terminal.integrated.setLocaleVariables" = true;
|
||||
"terminal.external.linuxExec" = "xterm";
|
||||
"explorer.confirmDelete" = false;
|
||||
"todo-tree.tags" = [ "todo" "TODO" "fixme" "FIXME" ];
|
||||
"workbench.colorTheme" = "Solarized Light";
|
||||
};
|
||||
|
||||
xdg.configFile."mimeapps.list".text = ''
|
||||
[Default Applications]
|
||||
text/html=browser-select.desktop
|
||||
|
@ -107,7 +60,6 @@
|
|||
image/jpeg=sxiv.desktop
|
||||
'';
|
||||
|
||||
|
||||
xdg.configFile."khal/config".text = ''
|
||||
[calendars]
|
||||
|
||||
|
@ -146,12 +98,4 @@
|
|||
fileext = ".ics"
|
||||
'';
|
||||
|
||||
home.packages =
|
||||
let
|
||||
fixXhost = pkgs.writers.writeBashBin "fix-xhost" ''
|
||||
${pkgs.xorg.xhost}/bin/xhost + &> /dev/null
|
||||
'';
|
||||
in
|
||||
[ fixXhost ];
|
||||
|
||||
}
|
||||
|
|
|
@ -1,7 +1,11 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
{
|
||||
|
||||
config = mkMerge [
|
||||
{
|
||||
home.packages = [ pkgs.ripgrep ];
|
||||
}
|
||||
(mkIf config.gui.enable {
|
||||
programs.doom-emacs = {
|
||||
enable = lib.mkDefault true;
|
||||
doomPrivateDir = ./doom.d;
|
||||
|
@ -10,19 +14,22 @@ with lib;
|
|||
;; points larger than I'd like, so I specify size 12 here.
|
||||
(setq doom-font
|
||||
(font-spec :family "Jetbrains Mono" :size ${toString 12} :weight 'light))
|
||||
;(setq doom-font
|
||||
; (font-spec :family "Terminus" :size ${toString 10} :weight 'light))
|
||||
;;(setq doom-font
|
||||
;; (font-spec :family "Terminus" :size ${toString 12} :weight 'light))
|
||||
'';
|
||||
|
||||
#emacsPackagesOverlay = self: super: {
|
||||
# # fixes https://github.com/vlaci/nix-doom-emacs/issues/394
|
||||
# gitignore-mode = pkgs.emacsPackages.git-modes;
|
||||
# gitconfig-mode = pkgs.emacsPackages.git-modes;
|
||||
#};
|
||||
};
|
||||
|
||||
home.packages = [
|
||||
pkgs.ripgrep
|
||||
})
|
||||
(mkIf (!config.gui.enable) {
|
||||
programs.doom-emacs = {
|
||||
enable = lib.mkDefault true;
|
||||
doomPrivateDir = ./doom.d;
|
||||
package = pkgs.emacs-nox;
|
||||
};
|
||||
})
|
||||
];
|
||||
|
||||
}
|
||||
|
|
|
@ -1,169 +0,0 @@
|
|||
{ pkgs, config, lib, ... }:
|
||||
{
|
||||
|
||||
services.dunst = {
|
||||
enable = true;
|
||||
settings = {
|
||||
global = {
|
||||
# Allow a small subset of html markup:
|
||||
# <b>bold</b>
|
||||
# <i>italic</i>
|
||||
# <s>strikethrough</s>
|
||||
# <u>underline</u>
|
||||
#
|
||||
# For a complete reference see
|
||||
# <http://developer.gnome.org/pango/stable/PangoMarkupFormat.html>.
|
||||
# If markup is not allowed, those tags will be stripped out of the
|
||||
# message.
|
||||
markup = "yes";
|
||||
plain_text = "no";
|
||||
|
||||
# The format of the message. Possible variables are:
|
||||
# %a appname
|
||||
# %s summary
|
||||
# %b body
|
||||
# %i iconname (including its path)
|
||||
# %I iconname (without its path)
|
||||
# %p progress value if set ([ 0%] to [100%]) or nothing
|
||||
# Markup is allowed
|
||||
format = ''
|
||||
%a
|
||||
<b>%s</b>
|
||||
%b'';
|
||||
|
||||
# Sort messages by urgency.
|
||||
sort = "yes";
|
||||
|
||||
# Show how many messages are currently hidden (because of geometry).
|
||||
indicate_hidden = "yes";
|
||||
|
||||
# Alignment of message text.
|
||||
# Possible values are "left", "center" and "right".
|
||||
alignment = "center";
|
||||
|
||||
# The frequency with wich text that is longer than the notification
|
||||
# window allows bounces back and forth.
|
||||
# This option conflicts with "word_wrap".
|
||||
# Set to 0 to disable.
|
||||
bounce_freq = 0;
|
||||
|
||||
# Show age of message if message is older than show_age_threshold
|
||||
# seconds.
|
||||
# Set to -1 to disable.
|
||||
show_age_threshold = 1;
|
||||
|
||||
# Split notifications into multiple lines if they don't fit into
|
||||
# geometry.
|
||||
word_wrap = "yes";
|
||||
|
||||
# Ignore newlines '\n' in notifications.
|
||||
ignore_newline = "no";
|
||||
|
||||
# Hide duplicate's count and stack them
|
||||
stack_duplicates = "yes";
|
||||
hide_duplicates_count = "no";
|
||||
|
||||
# The geometry of the window:
|
||||
# [{width}]x{height}[+/-{x}+/-{y}]
|
||||
# The geometry of the message window.
|
||||
# The height is measured in number of notifications everything else
|
||||
# in pixels. If the width is omitted but the height is given
|
||||
# ("-geometry x2"), the message window expands over the whole screen
|
||||
# (dmenu-like). If width is 0, the window expands to the longest
|
||||
# message displayed. A positive x is measured from the left, a
|
||||
# negative from the right side of the screen. Y is measured from
|
||||
# the top and down respectevly.
|
||||
# The width can be negative. In this case the actual width is the
|
||||
# screen width minus the width defined in within the geometry option.
|
||||
geometry = "500x10-0+0";
|
||||
|
||||
# Shrink window if it's smaller than the width. Will be ignored if
|
||||
# width is 0.
|
||||
shrink = "no";
|
||||
|
||||
# Don't remove messages, if the user is idle (no mouse or keyboard input)
|
||||
# for longer than idle_threshold seconds.
|
||||
# Set to 0 to disable.
|
||||
idle_threshold = 0;
|
||||
|
||||
# The transparency of the window. Range: [0; 100].
|
||||
# This option will only work if a compositing windowmanager is
|
||||
# present (e.g. xcompmgr, compiz, etc.).
|
||||
# transparency = 5
|
||||
|
||||
# Which monitor should the notifications be displayed on.
|
||||
#monitor = keyboard
|
||||
|
||||
# Display notification on focused monitor. Possible modes are:
|
||||
# mouse: follow mouse pointer
|
||||
# keyboard: follow window with keyboard focus
|
||||
# none: don't follow anything
|
||||
#
|
||||
# "keyboard" needs a windowmanager that exports the
|
||||
# _NET_ACTIVE_WINDOW property.
|
||||
# This should be the case for almost all modern windowmanagers.
|
||||
#
|
||||
# If this option is set to mouse or keyboard, the monitor option
|
||||
# will be ignored.
|
||||
follow = "none";
|
||||
|
||||
# Should a notification popped up from history be sticky or timeout
|
||||
# as if it would normally do.
|
||||
sticky_history = "yes";
|
||||
|
||||
# Maximum amount of notifications kept in history
|
||||
history_length = 15;
|
||||
|
||||
# Display indicators for URLs (U) and actions (A).
|
||||
show_indicators = "no";
|
||||
|
||||
# The height of a single line. If the height is smaller than the
|
||||
# font height, it will get raised to the font height.
|
||||
# This adds empty space above and under the text.
|
||||
line_height = 3;
|
||||
|
||||
# Draw a line of "separatpr_height" pixel height between two
|
||||
# notifications.
|
||||
# Set to 0 to disable.
|
||||
separator_height = 1;
|
||||
|
||||
# Padding between text and separator.
|
||||
padding = 1;
|
||||
|
||||
# Horizontal padding.
|
||||
horizontal_padding = 1;
|
||||
|
||||
# Print a notification on startup.
|
||||
# This is mainly for error detection, since dbus (re-)starts dunst
|
||||
# automatically after a crash.
|
||||
startup_notification = true;
|
||||
|
||||
# Align icons left/right/off
|
||||
icon_position = "off";
|
||||
max_icon_size = 80;
|
||||
frame_width = 2;
|
||||
};
|
||||
shortcuts = {
|
||||
|
||||
# Shortcuts are specified as [modifier+][modifier+]...key
|
||||
# Available modifiers are "ctrl", "mod1" (the alt-key), "mod2",
|
||||
# "mod3" and "mod4" (windows-key).
|
||||
# Xev might be helpful to find names for keys.
|
||||
|
||||
# Close notification.
|
||||
close = "ctrl+space";
|
||||
|
||||
# Close all notifications.
|
||||
close_all = "ctrl+shift+space";
|
||||
|
||||
# Redisplay last message(s).
|
||||
# On the US keyboard layout "grave" is normally above TAB and left
|
||||
# of "1".
|
||||
#history = "ctrl+grave";
|
||||
|
||||
# Context menu.
|
||||
context = "mod4+u";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -25,8 +25,16 @@ in
|
|||
|
||||
{
|
||||
|
||||
home.packages = [
|
||||
# we install this to have a terminal with a dark theme
|
||||
config = lib.mkIf config.gui.enable {
|
||||
|
||||
home.packages =
|
||||
let
|
||||
fixXhost = pkgs.writers.writeBashBin "fix-xhost" ''
|
||||
${pkgs.xorg.xhost}/bin/xhost + &> /dev/null
|
||||
'';
|
||||
in
|
||||
[
|
||||
fixXhost
|
||||
pkgs.kitty
|
||||
];
|
||||
|
||||
|
@ -289,4 +297,220 @@ in
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
# notification tool
|
||||
services.dunst = {
|
||||
enable = true;
|
||||
settings = {
|
||||
global = {
|
||||
# Allow a small subset of html markup:
|
||||
# <b>bold</b>
|
||||
# <i>italic</i>
|
||||
# <s>strikethrough</s>
|
||||
# <u>underline</u>
|
||||
#
|
||||
# For a complete reference see
|
||||
# <http://developer.gnome.org/pango/stable/PangoMarkupFormat.html>.
|
||||
# If markup is not allowed, those tags will be stripped out of the
|
||||
# message.
|
||||
markup = "yes";
|
||||
plain_text = "no";
|
||||
|
||||
# The format of the message. Possible variables are:
|
||||
# %a appname
|
||||
# %s summary
|
||||
# %b body
|
||||
# %i iconname (including its path)
|
||||
# %I iconname (without its path)
|
||||
# %p progress value if set ([ 0%] to [100%]) or nothing
|
||||
# Markup is allowed
|
||||
format = ''
|
||||
%a
|
||||
<b>%s</b>
|
||||
%b'';
|
||||
|
||||
# Sort messages by urgency.
|
||||
sort = "yes";
|
||||
|
||||
# Show how many messages are currently hidden (because of geometry).
|
||||
indicate_hidden = "yes";
|
||||
|
||||
# Alignment of message text.
|
||||
# Possible values are "left", "center" and "right".
|
||||
alignment = "center";
|
||||
|
||||
# The frequency with wich text that is longer than the notification
|
||||
# window allows bounces back and forth.
|
||||
# This option conflicts with "word_wrap".
|
||||
# Set to 0 to disable.
|
||||
bounce_freq = 0;
|
||||
|
||||
# Show age of message if message is older than show_age_threshold
|
||||
# seconds.
|
||||
# Set to -1 to disable.
|
||||
show_age_threshold = 1;
|
||||
|
||||
# Split notifications into multiple lines if they don't fit into
|
||||
# geometry.
|
||||
word_wrap = "yes";
|
||||
|
||||
# Ignore newlines '\n' in notifications.
|
||||
ignore_newline = "no";
|
||||
|
||||
# Hide duplicate's count and stack them
|
||||
stack_duplicates = "yes";
|
||||
hide_duplicates_count = "no";
|
||||
|
||||
# The geometry of the window:
|
||||
# [{width}]x{height}[+/-{x}+/-{y}]
|
||||
# The geometry of the message window.
|
||||
# The height is measured in number of notifications everything else
|
||||
# in pixels. If the width is omitted but the height is given
|
||||
# ("-geometry x2"), the message window expands over the whole screen
|
||||
# (dmenu-like). If width is 0, the window expands to the longest
|
||||
# message displayed. A positive x is measured from the left, a
|
||||
# negative from the right side of the screen. Y is measured from
|
||||
# the top and down respectevly.
|
||||
# The width can be negative. In this case the actual width is the
|
||||
# screen width minus the width defined in within the geometry option.
|
||||
geometry = "500x10-0+0";
|
||||
|
||||
# Shrink window if it's smaller than the width. Will be ignored if
|
||||
# width is 0.
|
||||
shrink = "no";
|
||||
|
||||
# Don't remove messages, if the user is idle (no mouse or keyboard input)
|
||||
# for longer than idle_threshold seconds.
|
||||
# Set to 0 to disable.
|
||||
idle_threshold = 0;
|
||||
|
||||
# The transparency of the window. Range: [0; 100].
|
||||
# This option will only work if a compositing windowmanager is
|
||||
# present (e.g. xcompmgr, compiz, etc.).
|
||||
# transparency = 5
|
||||
|
||||
# Which monitor should the notifications be displayed on.
|
||||
#monitor = keyboard
|
||||
|
||||
# Display notification on focused monitor. Possible modes are:
|
||||
# mouse: follow mouse pointer
|
||||
# keyboard: follow window with keyboard focus
|
||||
# none: don't follow anything
|
||||
#
|
||||
# "keyboard" needs a windowmanager that exports the
|
||||
# _NET_ACTIVE_WINDOW property.
|
||||
# This should be the case for almost all modern windowmanagers.
|
||||
#
|
||||
# If this option is set to mouse or keyboard, the monitor option
|
||||
# will be ignored.
|
||||
follow = "none";
|
||||
|
||||
# Should a notification popped up from history be sticky or timeout
|
||||
# as if it would normally do.
|
||||
sticky_history = "yes";
|
||||
|
||||
# Maximum amount of notifications kept in history
|
||||
history_length = 15;
|
||||
|
||||
# Display indicators for URLs (U) and actions (A).
|
||||
show_indicators = "no";
|
||||
|
||||
# The height of a single line. If the height is smaller than the
|
||||
# font height, it will get raised to the font height.
|
||||
# This adds empty space above and under the text.
|
||||
line_height = 3;
|
||||
|
||||
# Draw a line of "separatpr_height" pixel height between two
|
||||
# notifications.
|
||||
# Set to 0 to disable.
|
||||
separator_height = 1;
|
||||
|
||||
# Padding between text and separator.
|
||||
padding = 1;
|
||||
|
||||
# Horizontal padding.
|
||||
horizontal_padding = 1;
|
||||
|
||||
# Print a notification on startup.
|
||||
# This is mainly for error detection, since dbus (re-)starts dunst
|
||||
# automatically after a crash.
|
||||
startup_notification = true;
|
||||
|
||||
# Align icons left/right/off
|
||||
icon_position = "off";
|
||||
max_icon_size = 80;
|
||||
frame_width = 2;
|
||||
};
|
||||
shortcuts = {
|
||||
|
||||
# Shortcuts are specified as [modifier+][modifier+]...key
|
||||
# Available modifiers are "ctrl", "mod1" (the alt-key), "mod2",
|
||||
# "mod3" and "mod4" (windows-key).
|
||||
# Xev might be helpful to find names for keys.
|
||||
|
||||
# Close notification.
|
||||
close = "ctrl+space";
|
||||
|
||||
# Close all notifications.
|
||||
close_all = "ctrl+shift+space";
|
||||
|
||||
# Redisplay last message(s).
|
||||
# On the US keyboard layout "grave" is normally above TAB and left
|
||||
# of "1".
|
||||
#history = "ctrl+grave";
|
||||
|
||||
# Context menu.
|
||||
context = "mod4+u";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
xdg.configFile."albert/albert.conf".text = ''
|
||||
[General]
|
||||
hotkey=Meta+Space
|
||||
showTray=false
|
||||
telemetry=false
|
||||
terminal=urxvt -e
|
||||
|
||||
[org.albert.extension.applications]
|
||||
enabled=true
|
||||
fuzzy=true
|
||||
use_generic_name=true
|
||||
use_keywords=true
|
||||
|
||||
[org.albert.extension.calculator]
|
||||
enabled=true
|
||||
|
||||
[org.albert.extension.hashgenerator]
|
||||
enabled=true
|
||||
|
||||
[org.albert.frontend.widgetboxmodel]
|
||||
alwaysOnTop=true
|
||||
clearOnHide=false
|
||||
displayIcons=true
|
||||
displayScrollbar=false
|
||||
displayShadow=false
|
||||
hideOnClose=false
|
||||
hideOnFocusLoss=true
|
||||
itemCount=5
|
||||
showCentered=true
|
||||
theme=SolarizedBrightViolet
|
||||
'';
|
||||
|
||||
xdg.configFile."Code/User/settings.json".text = builtins.toJSON {
|
||||
"keyboard.dispatch" = "keyCode";
|
||||
"explorer.confirmDragAndDrop" = false;
|
||||
"editor.tabSize" = 2;
|
||||
"window.zoomLevel" = -1;
|
||||
"git.enableSmartCommit" = true;
|
||||
"files.autoSave" = "onFocusChange";
|
||||
"terminal.integrated.setLocaleVariables" = true;
|
||||
"terminal.external.linuxExec" = "xterm";
|
||||
"explorer.confirmDelete" = false;
|
||||
"todo-tree.tags" = [ "todo" "TODO" "fixme" "FIXME" ];
|
||||
"workbench.colorTheme" = "Solarized Light";
|
||||
};
|
||||
|
||||
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue