nullbite/nixfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert home-manager modules to options

Browse Source
This commit is contained in:
NullBite 2024-02-09 07:56:12 +01:00
parent 1044a3f92f
commit 787b5855b1
Signed by: nullbite
GPG Key ID: 6C4D545385D4925A
5 changed files with 255 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
home/comma.nix
View File

@ -1,10 +1,20 @@
{ lib, pkgs, config, inputs, ... } @args: { lib, pkgs, config, inputs, ... } @args:
let
cfg = config.nixfiles.programs.comma;
in
{ {
imports = [ imports = [
inputs.nix-index-database.hmModules.nix-index inputs.nix-index-database.hmModules.nix-index
]; ];
home.packages = with pkgs; [ options.nixfiles.programs.comma = {
comma enable = lib.mkEnableOption "comma";
]; };
config = {
programs.nix-index.symlinkToCacheHome = lib.mkDefault cfg.enable;
home.packages = with pkgs; lib.optionals cfg.enable [
comma
];
};
} }

24
home/common.nix
View File

@ -1,12 +1,22 @@
{ lib, pkgs, osConfig, ... }: { lib, pkgs, config, osConfig, ... }:
let
cfg = config.nixfiles.profile.base;
in
{ {
imports = [ # imports = [
./comma.nix # ./comma.nix
]; # ];
# home.username = "nullbite"; # home.username = "nullbite";
# home.homeDirectory = "/home/nullbite"; # home.homeDirectory = "/home/nullbite";
home.packages = with pkgs; [ options.nixfiles.profile.base = {
btop enable = lib.mkEnableOption "base profile";
]; };
config = lib.mkIf cfg.enable {
nixfiles.programs.comma.enable = true;
home.packages = with pkgs; [
btop
];
};
} }

5
home/default.nix
View File

@ -5,6 +5,11 @@ let
in in
{ {
imports = [ imports = [
./common
./package-sets
./profile
./programs
./sessions
]; ];
config = {}; config = {};
options.nixfiles = { options.nixfiles = {

402
home/hyprland.nix
View File

@ -1,5 +1,6 @@
{ lib, pkgs, osConfig, outputs, ... }@args: { lib, pkgs, config, osConfig ? {}, outputs, ... }@args:
let let
cfg = config.nixfiles.sessions.hyprland;
mkd = lib.mkDefault; mkd = lib.mkDefault;
terminal = "${pkgs.kitty}/bin/kitty"; terminal = "${pkgs.kitty}/bin/kitty";
files = "${pkgs.dolphin}/bin/dolphin"; files = "${pkgs.dolphin}/bin/dolphin";
@ -24,220 +25,233 @@ in
{ {
# FIXME this is temporary just to get it working, need to make wm-common an # FIXME this is temporary just to get it working, need to make wm-common an
# option first # option first
imports = [ # imports = [
./wm-common.nix # ./wm-common.nix
]; # ];
home.packages = with pkgs; [
kitty
dolphin
rofi-wayland
wev
dunst
pkgs.brightnessctl
];
wayland.windowManager.hyprland = { options.nixfiles.sessions.hyprland = {
enable = true; enable = lib.mkOption {
settings = { type = lib.types.bool;
default = if (builtins.hasAttr "home-manager" osConfig) then osConfig.nixfiles.sessions.hyprland.enable else false;
example = true;
description = "Whether to enable hyprland.";
};
};
# Xwayland fix config = lib.mkIf cfg.enable {
xwayland.force_zero_scaling = mkd true; nixfiles.common.wm.enable = true;
home.packages = with pkgs; [
kitty
dolphin
rofi-wayland
wev
dunst
pkgs.brightnessctl
];
# See https://wiki.hyprland.org/Configuring/Monitors/ wayland.windowManager.hyprland = {
monitor = mkd ",preferred,auto,auto"; enable = true;
settings = {
# See https://wiki.hyprland.org/Configuring/Keywords/ for more # Xwayland fix
xwayland.force_zero_scaling = mkd true;
# Execute your favorite apps at launch # See https://wiki.hyprland.org/Configuring/Monitors/
# exec-once = waybar & hyprpaper & firefox monitor = mkd ",preferred,auto,auto";
exec-once = [ # See https://wiki.hyprland.org/Configuring/Keywords/ for more
notifydaemon
polkit-agent
];
# Source a file (multi-file configs) # Execute your favorite apps at launch
# source = ~/.config/hypr/myColors.conf # exec-once = waybar & hyprpaper & firefox
# Some default env vars. exec-once = [
env = mkd "XCURSOR_SIZE,24"; notifydaemon
polkit-agent
];
# Source a file (multi-file configs)
# source = ~/.config/hypr/myColors.conf
# Some default env vars.
env = mkd "XCURSOR_SIZE,24";
# For all categories, see https://wiki.hyprland.org/Configuring/Variables/ # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
input = { input = {
kb_layout = mkd "us"; kb_layout = mkd "us";
# kb_variant = # kb_variant =
# kb_model = # kb_model =
# kb_options = # kb_options =
# kb_rules = # kb_rules =
follow_mouse = mkd true; follow_mouse = mkd true;
touchpad.natural_scroll = mkd true; touchpad.natural_scroll = mkd true;
sensitivity = mkd 0; # -1.0 - 1.0, 0 means no modification. sensitivity = mkd 0; # -1.0 - 1.0, 0 means no modification.
};
general = {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
gaps_in = mkd 5;
gaps_out = mkd 20;
border_size = mkd 2;
"col.active_border" = mkd "rgba(33ccffee) rgba(00ff99ee) 45deg";
"col.inactive_border" = mkd "rgba(595959aa)";
layout = mkd "dwindle";
# Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
allow_tearing = mkd false;
};
decoration = {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
rounding = mkd 10;
blur = {
enabled = mkd true;
size = mkd 3;
passes = mkd 1;
}; };
drop_shadow = mkd true; general = {
shadow_range = mkd 4; # See https://wiki.hyprland.org/Configuring/Variables/ for more
shadow_render_power = mkd 3;
"col.shadow" = mkd "rgba(1a1a1aee)";
};
animations = { gaps_in = mkd 5;
enabled = mkd true; gaps_out = mkd 20;
border_size = mkd 2;
"col.active_border" = mkd "rgba(33ccffee) rgba(00ff99ee) 45deg";
"col.inactive_border" = mkd "rgba(595959aa)";
# Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more layout = mkd "dwindle";
bezier = mkd "myBezier, 0.05, 0.9, 0.1, 1.05"; # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
allow_tearing = mkd false;
};
animation = [ decoration = {
"windows, 1, 7, myBezier" # See https://wiki.hyprland.org/Configuring/Variables/ for more
"windowsOut, 1, 7, default, popin 80%" rounding = mkd 10;
"border, 1, 10, default"
"borderangle, 1, 8, default" blur = {
"fade, 1, 7, default" enabled = mkd true;
"workspaces, 1, 6, default" size = mkd 3;
passes = mkd 1;
};
drop_shadow = mkd true;
shadow_range = mkd 4;
shadow_render_power = mkd 3;
"col.shadow" = mkd "rgba(1a1a1aee)";
};
animations = {
enabled = mkd true;
# Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
bezier = mkd "myBezier, 0.05, 0.9, 0.1, 1.05";
animation = [
"windows, 1, 7, myBezier"
"windowsOut, 1, 7, default, popin 80%"
"border, 1, 10, default"
"borderangle, 1, 8, default"
"fade, 1, 7, default"
"workspaces, 1, 6, default"
];
};
dwindle = {
# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
pseudotile = mkd true; # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
preserve_split = mkd true; # you probably want this
};
master = {
# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
new_is_master = mkd "true";
};
gestures = {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
workspace_swipe = mkd "false";
};
misc = {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
force_default_wallpaper = mkd 0; # Set to 0 to disable the anime mascot wallpapers
};
"$mod" = mkd "SUPER";
# Example windowrule v1
# windowrule = float, ^(kitty)$
# Example windowrule v2
# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
bind = [
"$mod, Q, exec, ${terminal}"
"$mod, Return, exec, ${terminal}"
"$mod, C, killactive, "
"$mod, M, exit, "
"$mod, E, exec, ${files}"
"$mod, V, togglefloating, "
"$mod, R, exec, ${rofi} -show drun"
"$mod, P, pseudo," # dwindle"
"$mod, O, togglesplit," # dwindle"
# Move focus with mod + arrow keys
"$mod, left, movefocus, l"
"$mod, right, movefocus, r"
"$mod, up, movefocus, u"
"$mod, down, movefocus, d"
"$mod, h, movefocus, l"
"$mod, j, movefocus, d"
"$mod, k, movefocus, u"
"$mod, l, movefocus, r"
# Switch workspaces with mod + [0-9]
"$mod, 1, workspace, 1"
"$mod, 2, workspace, 2"
"$mod, 3, workspace, 3"
"$mod, 4, workspace, 4"
"$mod, 5, workspace, 5"
"$mod, 6, workspace, 6"
"$mod, 7, workspace, 7"
"$mod, 8, workspace, 8"
"$mod, 9, workspace, 9"
"$mod, 0, workspace, 10"
#] ++ map () [] ++ TODO reconfigure these with workspace helper function
#[
# Move active window to a workspace with mod + SHIFT + [0-9]
"$mod SHIFT, 1, movetoworkspace, 1"
"$mod SHIFT, 2, movetoworkspace, 2"
"$mod SHIFT, 3, movetoworkspace, 3"
"$mod SHIFT, 4, movetoworkspace, 4"
"$mod SHIFT, 5, movetoworkspace, 5"
"$mod SHIFT, 6, movetoworkspace, 6"
"$mod SHIFT, 7, movetoworkspace, 7"
"$mod SHIFT, 8, movetoworkspace, 8"
"$mod SHIFT, 9, movetoworkspace, 9"
"$mod SHIFT, 0, movetoworkspace, 10"
# Example special workspace (scratchpad)
"$mod, S, togglespecialworkspace, magic"
"$mod SHIFT, S, movetoworkspace, special:magic"
# Scroll through existing workspaces with mod + scroll
"$mod, mouse_down, workspace, e+1"
"$mod, mouse_up, workspace, e-1"
# show this file (help)
("$mod, slash, exec, ${terminal} -e ${pkgs.neovim}/bin/nvim '+set nomodifiable' '+noremap q :q<CR>' " + args.vars.self.outPath + "/home/hyprland.nix")
];
# repeat, ignore mods
bindei = [
# Volume controls
",XF86AudioRaiseVolume, exec, ${keysetting} volumeup"
",XF86AudioLowerVolume, exec, ${keysetting} volumedown"
",XF86AudioMute, exec, ${keysetting} mute"
",XF86AudioMicMute, exec, ${keysetting} micmute"
# brightness
",XF86KbdBrightnessDown, exec, ${keysetting} keydown"
",XF86KbdBrightnessUp, exec, ${keysetting} keyup"
",XF86MonBrightnessDown, exec, ${keysetting} mondown"
",XF86MonBrightnessUp, exec, ${keysetting} monup"
];
bindm = [
# Move/resize windows with mod + LMB/RMB and dragging
"$mod, mouse:272, movewindow"
"$mod, mouse:273, resizewindow"
# RMB sucks on laptop
"$mod SHIFT, mouse:272, resizewindow"
]; ];
}; };
dwindle = {
# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
pseudotile = mkd true; # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
preserve_split = mkd true; # you probably want this
};
master = {
# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
new_is_master = mkd "true";
};
gestures = {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
workspace_swipe = mkd "false";
};
misc = {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
force_default_wallpaper = mkd 0; # Set to 0 to disable the anime mascot wallpapers
};
"$mod" = mkd "SUPER";
# Example windowrule v1
# windowrule = float, ^(kitty)$
# Example windowrule v2
# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
bind = [
"$mod, Q, exec, ${terminal}"
"$mod, Return, exec, ${terminal}"
"$mod, C, killactive, "
"$mod, M, exit, "
"$mod, E, exec, ${files}"
"$mod, V, togglefloating, "
"$mod, R, exec, ${rofi} -show drun"
"$mod, P, pseudo," # dwindle"
"$mod, O, togglesplit," # dwindle"
# Move focus with mod + arrow keys
"$mod, left, movefocus, l"
"$mod, right, movefocus, r"
"$mod, up, movefocus, u"
"$mod, down, movefocus, d"
"$mod, h, movefocus, l"
"$mod, j, movefocus, d"
"$mod, k, movefocus, u"
"$mod, l, movefocus, r"
# Switch workspaces with mod + [0-9]
"$mod, 1, workspace, 1"
"$mod, 2, workspace, 2"
"$mod, 3, workspace, 3"
"$mod, 4, workspace, 4"
"$mod, 5, workspace, 5"
"$mod, 6, workspace, 6"
"$mod, 7, workspace, 7"
"$mod, 8, workspace, 8"
"$mod, 9, workspace, 9"
"$mod, 0, workspace, 10"
#] ++ map () [] ++ TODO reconfigure these with workspace helper function
#[
# Move active window to a workspace with mod + SHIFT + [0-9]
"$mod SHIFT, 1, movetoworkspace, 1"
"$mod SHIFT, 2, movetoworkspace, 2"
"$mod SHIFT, 3, movetoworkspace, 3"
"$mod SHIFT, 4, movetoworkspace, 4"
"$mod SHIFT, 5, movetoworkspace, 5"
"$mod SHIFT, 6, movetoworkspace, 6"
"$mod SHIFT, 7, movetoworkspace, 7"
"$mod SHIFT, 8, movetoworkspace, 8"
"$mod SHIFT, 9, movetoworkspace, 9"
"$mod SHIFT, 0, movetoworkspace, 10"
# Example special workspace (scratchpad)
"$mod, S, togglespecialworkspace, magic"
"$mod SHIFT, S, movetoworkspace, special:magic"
# Scroll through existing workspaces with mod + scroll
"$mod, mouse_down, workspace, e+1"
"$mod, mouse_up, workspace, e-1"
# show this file (help)
("$mod, slash, exec, ${terminal} -e ${pkgs.neovim}/bin/nvim '+set nomodifiable' '+noremap q :q<CR>' " + args.vars.self.outPath + "/home/hyprland.nix")
];
# repeat, ignore mods
bindei = [
# Volume controls
",XF86AudioRaiseVolume, exec, ${keysetting} volumeup"
",XF86AudioLowerVolume, exec, ${keysetting} volumedown"
",XF86AudioMute, exec, ${keysetting} mute"
",XF86AudioMicMute, exec, ${keysetting} micmute"
# brightness
",XF86KbdBrightnessDown, exec, ${keysetting} keydown"
",XF86KbdBrightnessUp, exec, ${keysetting} keyup"
",XF86MonBrightnessDown, exec, ${keysetting} mondown"
",XF86MonBrightnessUp, exec, ${keysetting} monup"
];
bindm = [
# Move/resize windows with mod + LMB/RMB and dragging
"$mod, mouse:272, movewindow"
"$mod, mouse:273, resizewindow"
# RMB sucks on laptop
"$mod SHIFT, mouse:272, resizewindow"
];
}; };
}; };
} }

18
home/wm-common.nix
View File

@ -1,14 +1,20 @@
{ pkgs, lib, config, osConfig, options, ...}: { pkgs, lib, config, osConfig, options, ...}:
let let
cfg = config.nixfiles.common.wm;
inherit (lib) mkDefault; inherit (lib) mkDefault;
in in
{ {
# Common options for standalone window managers; many of these (or options.nixfiles.common.wm = {
# alternatives thereof) are pulled in by desktop environments. enable = lib.mkEnableOption "common window manager config";
services = { };
udiskie = { config = lib.mkIf cfg.enable {
enable = mkDefault true; # Common options for standalone window managers; many of these (or
automount = mkDefault false; # alternatives thereof) are pulled in by desktop environments.
services = {
udiskie = {
enable = mkDefault true;
automount = mkDefault false;
};
}; };
}; };
} }