works again, mostly done, now we can start with server
This commit is contained in:
parent
784f214fb7
commit
270e1a0be4
38 changed files with 623 additions and 381 deletions
|
|
@ -8,12 +8,20 @@
|
|||
}:
|
||||
|
||||
{
|
||||
config = lib.mkIf osConfig.desktop.shell.noctalia.enable {
|
||||
imports =
|
||||
if true then
|
||||
[
|
||||
inputs.noctalia.homeModules.default
|
||||
]
|
||||
else
|
||||
[ ];
|
||||
config = {
|
||||
programs.noctalia-shell =
|
||||
if osConfig.desktop.shell.noctalia.enable then
|
||||
{
|
||||
enable = true;
|
||||
}
|
||||
else
|
||||
{ };
|
||||
};
|
||||
|
||||
imports = lib.mkIf osConfig.desktop.shell.noctalia.enable [
|
||||
inputs.noctalia.homeModules.default
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -8,19 +8,27 @@
|
|||
}:
|
||||
|
||||
{
|
||||
config = lib.mkIf osConfig.desktop.shell.walker.enable {
|
||||
programs = {
|
||||
walker = {
|
||||
enable = true;
|
||||
runAsService = true;
|
||||
config = {
|
||||
theme = "noctalia";
|
||||
config =
|
||||
if osConfig.desktop.shell.walker.enable then
|
||||
{
|
||||
programs = {
|
||||
walker = {
|
||||
enable = true;
|
||||
runAsService = true;
|
||||
config = {
|
||||
theme = "noctalia";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
else
|
||||
{ };
|
||||
|
||||
imports = lib.mkIf osConfig.desktop.shell.walker.enable [
|
||||
inputs.walker.homeManagerModules.default
|
||||
]
|
||||
imports =
|
||||
if osConfig.desktop.shell.walker.enable then
|
||||
[
|
||||
inputs.walker.homeManagerModules.default
|
||||
]
|
||||
else
|
||||
[ ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
options = {
|
||||
desktop = {
|
||||
hyprland = {
|
||||
enable = lib.mkEnableOption "enable hyprland";
|
||||
monitors = lib.mkOption {
|
||||
default = [
|
||||
",preferred,auto,1"
|
||||
|
|
@ -44,7 +45,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf osConfig.desktop.hyprland.enable {
|
||||
config = lib.mkIf osConfig.desktop.window-managers.hyprland.enable {
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
configPackages = [
|
||||
|
|
@ -97,9 +98,9 @@
|
|||
(lib.mkIf (osConfig.desktop.shell.rofi.enable) "$mod, D, exec, rofi -show drun")
|
||||
"$mod, return, exec, ${osConfig.apps.terminal.binary}"
|
||||
(lib.mkIf (osConfig.desktop.utilities.grimblast.enable) ", print, exec, GRIMBLAST_EDITOR=gradia grimblast edit area")
|
||||
(lib.mkIf (osConfig.desktop.shell.walker.enable) (
|
||||
lib.mkIf (osConfig.misc.bitwarden.enable) "$mod, B, exec, rbw unlocked || kitty --class kitty-floating -e rbw unlock; selected=$(rbw list | walker -d); wl-copy $(rbw get \"$selected\"); sleep 30; rbw lock"
|
||||
))
|
||||
(lib.mkIf (osConfig.desktop.shell.walker.enable && osConfig.misc.bitwarden.enable)
|
||||
"$mod, B, exec, rbw unlocked || kitty --class kitty-floating -e rbw unlock; selected=$(rbw list | walker -d); wl-copy $(rbw get \"$selected\"); sleep 30; rbw lock"
|
||||
)
|
||||
"$mod, F, fullscreen, 1"
|
||||
"$shiftmod, F, fullscreen, 0"
|
||||
"$shiftmod, Q, killactive,"
|
||||
|
|
|
|||
|
|
@ -7,106 +7,103 @@
|
|||
...
|
||||
}:
|
||||
|
||||
let
|
||||
modifier = lib.mkIf (${osConfig.keybinds.modifier} == "Meta") "Mod";
|
||||
let
|
||||
modifier = if (osConfig.keybinds.modifier == "Meta") then "Mod" else null;
|
||||
kb-layout = builtins.substring 0 2 osConfig.system.locale;
|
||||
in
|
||||
in
|
||||
|
||||
{
|
||||
options = {
|
||||
desktop.window-managers = {
|
||||
niri = {
|
||||
};
|
||||
};
|
||||
config =
|
||||
if osConfig.desktop.window-managers.niri.enable then
|
||||
{
|
||||
home.file = {
|
||||
"~/.config/niri/config.kdl" = ''
|
||||
input {
|
||||
|
||||
};
|
||||
config = lib.mkIf osConfig.desktop.window-managers.niri.enable {
|
||||
home.file = {
|
||||
"~/.config/niri/config.kdl" = ''
|
||||
input {
|
||||
keyboard {
|
||||
xkb {
|
||||
layout "${kb-layout}"
|
||||
}
|
||||
repeat-delay 600
|
||||
repeat-rate 20
|
||||
track-layout "global"
|
||||
}
|
||||
touchpad {
|
||||
tap
|
||||
dwt
|
||||
accel-profile "flat"
|
||||
accel-speed 0.0
|
||||
scroll-method "two-finger"
|
||||
|
||||
|
||||
keyboard {
|
||||
xkb {
|
||||
layout "${kb-layout}"
|
||||
}
|
||||
repeat-delay 600
|
||||
repeat-rate 20
|
||||
track-layout "global"
|
||||
}
|
||||
touchpad {
|
||||
tap
|
||||
dwt
|
||||
accel-profile "flat"
|
||||
accel-speed 0.0
|
||||
scroll-method "two-finger"
|
||||
|
||||
}
|
||||
mouse {
|
||||
accel-speed 0.5
|
||||
accel-profile "flat"
|
||||
|
||||
}
|
||||
mouse {
|
||||
accel-speed 0.5
|
||||
accel-profile "flat"
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
gestures {
|
||||
hot-corners {
|
||||
off
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
cursor {
|
||||
hide-when-typing
|
||||
hide-after-inactive-ms 2000
|
||||
}
|
||||
|
||||
xwayland-satellite {
|
||||
path "xwayland-satellite"
|
||||
}
|
||||
|
||||
hotkey-overlay {
|
||||
hide-not-bound
|
||||
}
|
||||
|
||||
binds {
|
||||
${modifier}+Down cooldown-ms=150 { focus-workspace-down; }
|
||||
${modifier}+Up cooldown-ms=150 { focus-workspace-up; }
|
||||
${modifier}+${osConfig.keybinds.hotkeys.terminal} { spawn "${osConfig.terminal.binary}";}
|
||||
${modifier}+Left {focus-column-left; }
|
||||
${modifier}+Right {focus-column-right; }
|
||||
${modifier}+${osConfig.keybinds.hotkeys.browser} { spawn "${osConfig.apps.browser.default}";}
|
||||
${modifier}+${osConfig.keybinds.hotkeys.launcher} { spawn "${osConfig.desktop.window-managers.shell.launcher.default}";}
|
||||
Print { screenshot;}
|
||||
${modifier}+Shift+${osConfig.keybinds.hotkeys.close-window} { close-window; }
|
||||
${modifier}+Shift+${osConfig.keybinds.hotkeys.editor} { spawn "${osConfig.apps.development.editor.default}";}
|
||||
}
|
||||
|
||||
spawn-at-startup "elephant"
|
||||
spawn-at-startup "noctalia-shell"
|
||||
|
||||
|
||||
layout {
|
||||
gaps 20
|
||||
focus-ring {
|
||||
width 5
|
||||
}
|
||||
border {
|
||||
off
|
||||
}
|
||||
}
|
||||
window-rule {
|
||||
geometry-corner-radius 20
|
||||
clip-to-geometry true
|
||||
}
|
||||
|
||||
|
||||
prefer-no-csd
|
||||
|
||||
include "noctalia.kdl"
|
||||
|
||||
|
||||
'';
|
||||
};
|
||||
};
|
||||
gestures {
|
||||
hot-corners {
|
||||
off
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
cursor {
|
||||
hide-when-typing
|
||||
hide-after-inactive-ms 2000
|
||||
}
|
||||
|
||||
xwayland-satellite {
|
||||
path "xwayland-satellite"
|
||||
}
|
||||
|
||||
hotkey-overlay {
|
||||
hide-not-bound
|
||||
}
|
||||
|
||||
binds {
|
||||
${modifier}+Down cooldown-ms=150 { focus-workspace-down; }
|
||||
${modifier}+Up cooldown-ms=150 { focus-workspace-up; }
|
||||
${modifier}+${osConfig.keybinds.hotkeys.terminal} { spawn "${osConfig.terminal.binary}";}
|
||||
${modifier}+Left {focus-column-left; }
|
||||
${modifier}+Right {focus-column-right; }
|
||||
${modifier}+${osConfig.keybinds.hotkeys.browser} { spawn "${osConfig.apps.browser.default}";}
|
||||
${modifier}+${osConfig.keybinds.hotkeys.launcher} { spawn "${osConfig.desktop.window-managers.shell.launcher.default}";}
|
||||
Print { screenshot;}
|
||||
${modifier}+Shift+${osConfig.keybinds.hotkeys.close-window} { close-window; }
|
||||
${modifier}+Shift+${osConfig.keybinds.hotkeys.editor} { spawn "${osConfig.apps.development.editor.default}";}
|
||||
}
|
||||
|
||||
spawn-at-startup "elephant"
|
||||
spawn-at-startup "noctalia-shell"
|
||||
|
||||
|
||||
layout {
|
||||
gaps 20
|
||||
focus-ring {
|
||||
width 5
|
||||
}
|
||||
border {
|
||||
off
|
||||
}
|
||||
}
|
||||
window-rule {
|
||||
geometry-corner-radius 20
|
||||
clip-to-geometry true
|
||||
}
|
||||
|
||||
|
||||
prefer-no-csd
|
||||
|
||||
include "noctalia.kdl"
|
||||
|
||||
|
||||
'';
|
||||
};
|
||||
}
|
||||
else
|
||||
{ };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,70 +3,68 @@
|
|||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
osConfig,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
options = {
|
||||
desktop.window-managers = {
|
||||
sway = {
|
||||
};
|
||||
};
|
||||
config =
|
||||
if osConfig.desktop.window-managers.sway.enable then
|
||||
{
|
||||
wayland.windowManager.sway = {
|
||||
enable = true;
|
||||
package = pkgs.swayfx;
|
||||
config = {
|
||||
modifier = "Mod4";
|
||||
startup = [
|
||||
{ command = "elephant"; }
|
||||
];
|
||||
keybindings =
|
||||
let
|
||||
modifier = config.wayland.windowManager.sway.config.modifier;
|
||||
in
|
||||
{
|
||||
"${modifier}+Return" = "exec ${config.wayland.windowManager.sway.config.terminal}";
|
||||
"${modifier}+Shift+q" = "kill";
|
||||
"${modifier}+d" = "exec walker";
|
||||
"${modifier}+o" = "exec zen";
|
||||
"${modifier}+Control+right" = "exec /home/marty/.config/sway/scripts/workspaceswitcher right";
|
||||
"${modifier}+Control+left" = "exec /home/marty/.config/sway/scripts/workspaceswitcher left";
|
||||
"${modifier}+f" = "fullscreen";
|
||||
|
||||
};
|
||||
config = lib.mkIf osConfig.desktop.window-managers.sway.enable {
|
||||
wayland.windowManager.sway = {
|
||||
enable = true;
|
||||
package = pkgs.swayfx;
|
||||
config = {
|
||||
modifier = "Mod4";
|
||||
startup = [
|
||||
{ command = "elephant"; }
|
||||
];
|
||||
keybindings =
|
||||
let
|
||||
modifier = config.wayland.windowManager.sway.config.modifier;
|
||||
in
|
||||
{
|
||||
"${modifier}+Return" = "exec ${config.wayland.windowManager.sway.config.terminal}";
|
||||
"${modifier}+Shift+q" = "kill";
|
||||
"${modifier}+d" = "exec walker";
|
||||
"${modifier}+o" = "exec zen";
|
||||
"${modifier}+Control+right" = "exec /home/marty/.config/sway/scripts/workspaceswitcher right";
|
||||
"${modifier}+Control+left" = "exec /home/marty/.config/sway/scripts/workspaceswitcher left";
|
||||
"${modifier}+f" = "fullscreen";
|
||||
"${modifier}+1" = "workspace number 1";
|
||||
"${modifier}+2" = "workspace number 2";
|
||||
"${modifier}+3" = "workspace number 3";
|
||||
"${modifier}+4" = "workspace number 4";
|
||||
"${modifier}+5" = "workspace number 5";
|
||||
"${modifier}+6" = "workspace number 6";
|
||||
"${modifier}+7" = "workspace number 7";
|
||||
"${modifier}+8" = "workspace number 8";
|
||||
"${modifier}+9" = "workspace number 9";
|
||||
"${modifier}+s" = "workspace number 0";
|
||||
|
||||
"${modifier}+1" = "workspace number 1";
|
||||
"${modifier}+2" = "workspace number 2";
|
||||
"${modifier}+3" = "workspace number 3";
|
||||
"${modifier}+4" = "workspace number 4";
|
||||
"${modifier}+5" = "workspace number 5";
|
||||
"${modifier}+6" = "workspace number 6";
|
||||
"${modifier}+7" = "workspace number 7";
|
||||
"${modifier}+8" = "workspace number 8";
|
||||
"${modifier}+9" = "workspace number 9";
|
||||
"${modifier}+s" = "workspace number 0";
|
||||
|
||||
"${modifier}+Shift+1" = "move container to workspace number 1";
|
||||
"${modifier}+Shift+2" = "move container to workspace number 2";
|
||||
"${modifier}+Shift+3" = "move container to workspace number 3";
|
||||
"${modifier}+Shift+4" = "move container to workspace number 4";
|
||||
"${modifier}+Shift+5" = "move container to workspace number 5";
|
||||
"${modifier}+Shift+6" = "move container to workspace number 6";
|
||||
"${modifier}+Shift+7" = "move container to workspace number 7";
|
||||
"${modifier}+Shift+8" = "move container to workspace number 8";
|
||||
"${modifier}+Shift+9" = "move container to workspace number 9";
|
||||
"${modifier}+Shift+s" = "move container to workspace number 0";
|
||||
};
|
||||
input = {
|
||||
"*" = {
|
||||
xkb_layout = builtins.substring 0 2 osConfig.system.locale;
|
||||
"${modifier}+Shift+1" = "move container to workspace number 1";
|
||||
"${modifier}+Shift+2" = "move container to workspace number 2";
|
||||
"${modifier}+Shift+3" = "move container to workspace number 3";
|
||||
"${modifier}+Shift+4" = "move container to workspace number 4";
|
||||
"${modifier}+Shift+5" = "move container to workspace number 5";
|
||||
"${modifier}+Shift+6" = "move container to workspace number 6";
|
||||
"${modifier}+Shift+7" = "move container to workspace number 7";
|
||||
"${modifier}+Shift+8" = "move container to workspace number 8";
|
||||
"${modifier}+Shift+9" = "move container to workspace number 9";
|
||||
"${modifier}+Shift+s" = "move container to workspace number 0";
|
||||
};
|
||||
input = {
|
||||
"*" = {
|
||||
xkb_layout = builtins.substring 0 2 osConfig.system.locale;
|
||||
};
|
||||
};
|
||||
defaultWorkspace = "workspace number 1";
|
||||
terminal = osConfig.desktop.defaults.terminal.binary;
|
||||
};
|
||||
checkConfig = false;
|
||||
};
|
||||
defaultWorkspace = "workspace number 1";
|
||||
terminal = osConfig.desktop.defaults.terminal.binary;
|
||||
};
|
||||
checkConfig = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
else
|
||||
{ };
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue