faukah/nichts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

moved awesome and hyprland

Browse source
This commit is contained in:
Charlie Root 2024-05-21 00:04:49 +02:00
commit cfa27ccec4
8 changed files with 111 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hosts/vali/mars/configuration.nix
View file

@ -40,10 +40,10 @@
}; };
}; };
wms = { wms = {
wayland = { wayland = {
enable = true; enable = true;
hyprland.enable = true; hyprland.enable = true;
}; };
}; };
programs = { programs = {
vesktop.enable = true; vesktop.enable = true;

3
hosts/vali/mars/default.nix
View file

@ -4,8 +4,5 @@ _: {
./programs.nix ./programs.nix
./hardware-configuration.nix ./hardware-configuration.nix
./profile.nix ./profile.nix
./awesome/awesome.nix
./hyprland/hyprland.nix
]; ];
} }

2
modules/gui/default.nix
View file

@ -4,7 +4,7 @@ _: {
./gtk.nix ./gtk.nix
./foot.nix ./foot.nix
./mpv.nix ./mpv.nix
# ./kakoune # ./kakoune
./qt.nix ./qt.nix
./zathura.nix ./zathura.nix
./stylix.nix ./stylix.nix

177
modules/wms/wayland/niri/config.nix
View file

@ -1,9 +1,4 @@
{ { pkgs, theme, config, ... }:
pkgs,
theme,
config,
...
}:
with theme.colors; { with theme.colors; {
programs.niri.settings = { programs.niri.settings = {
outputs."eDP-1".position = { outputs."eDP-1".position = {
@ -36,18 +31,18 @@ with theme.colors; {
}; };
focus-follows-mouse = true; focus-follows-mouse = true;
warp-mouse-to-focus = true; warp-mouse-to-focus = true;
trackpoint.accel-speed = 0.001; trackpoint.accel-speed = 1.0e-3;
}; };
layout = { layout = {
gaps = 16; gaps = 16;
center-focused-column = "never"; center-focused-column = "never";
preset-column-widths = [ preset-column-widths = [
{proportion = 0.333;} { proportion = 0.333; }
{proportion = 0.5;} { proportion = 0.5; }
{proportion = 0.666;} { proportion = 0.666; }
]; ];
default-column-width = {proportion = 0.5;}; default-column-width = { proportion = 0.5; };
focus-ring = { focus-ring = {
enable = true; enable = true;
@ -61,14 +56,14 @@ with theme.colors; {
butter = { butter = {
spring = { spring = {
damping-ratio = 0.75; damping-ratio = 0.75;
epsilon = 0.00010; epsilon = 1.0e-4;
stiffness = 400; stiffness = 400;
}; };
}; };
smooth = { smooth = {
spring = { spring = {
damping-ratio = 0.58; damping-ratio = 0.58;
epsilon = 0.00010; epsilon = 1.0e-4;
stiffness = 735; stiffness = 735;
}; };
}; };
@ -81,87 +76,87 @@ with theme.colors; {
window-close = smooth; window-close = smooth;
}; };
window-rules = [ window-rules = [{
{ geometry-corner-radius = let radius = 8.0;
geometry-corner-radius = let radius =8.0; in{ in {
bottom-left = radius; bottom-left = radius;
bottom-right = radius; bottom-right = radius;
top-left = radius; top-left = radius;
top-right = radius; top-right = radius;
}; };
clip-to-geometry= true; clip-to-geometry = true;
} }];
];
binds = with config.lib.niri.actions; let binds = with config.lib.niri.actions;
sh = spawn "sh" "-c"; let sh = spawn "sh" "-c";
in { in {
"Mod+Return" = { "Mod+Return" = {
action = spawn "${pkgs.foot}/bin/foot"; action = spawn "${pkgs.foot}/bin/foot";
cooldown-ms = 500; cooldown-ms = 500;
};
"Mod+Space".action = spawn "${pkgs.fuzzel}/bin/fuzzel";
"Mod+V".action = sh
"${pkgs.cliphist}/bin/cliphist list | fuzzel --dmenu | cliphist decode | wl-copy";
"Mod+Shift+Period".action = spawn "emoji";
"XF86AudioRaiseVolume".action = spawn "pamixer" "-i" "5";
"XF86AudioLowerVolume".action = spawn "pamixer" "-d" "5";
"XF86AudioMute".action = spawn "pamixer" "-t";
"XF86AudioMicMute".action = spawn "micmute";
"XF86MonBrightnessUp".action = spawn "brightnessctl" "set" "+5%";
"XF86MonBrightnessDown".action = spawn "brightnessctl" "set" "5%-";
"Super+WheelScrollDown".action = focus-workspace-down;
"Super+WheelScrollDown".cooldown-ms = 500;
"Super+WheelScrollUp".action = focus-workspace-up;
"Super+WheelScrollUp".cooldown-ms = 500;
"Super+WheelScrollRight".action = focus-column-right;
"Super+WheelScrollLeft".action = focus-column-left;
"Super+H".action = focus-column-left;
"Super+L".action = focus-column-right;
"Super+J".action = focus-workspace-down;
"Super+K".action = focus-workspace-up;
"Super+Left".action = focus-column-left;
"Super+Right".action = focus-column-right;
"Super+Down".action = focus-window-down;
"Super+Up".action = focus-window-up;
"Super+Print".action = screenshot-window;
"Super+Shift+Print".action = screenshot-screen;
"Super+Shift+S".action = screenshot;
"Super+Ctrl+H".action = move-column-left;
"Super+Ctrl+J".action = move-window-down;
"Super+Ctrl+K".action = move-window-up;
"Super+Ctrl+L".action = move-column-right;
"Super+U".action = move-workspace-down;
"Super+I".action = move-workspace-up;
"Super+Minus".action = set-column-width "-10%";
"Super+Equal".action = set-column-width "+10%";
"Super+Shift+Minus".action = set-window-height "-10%";
"Super+Shift+Equal".action = set-window-height "+10%";
"Super+Shift+H".action = focus-monitor-left;
"Super+Shift+J".action = focus-monitor-down;
"Super+Shift+K".action = focus-monitor-up;
"Super+Shift+L".action = focus-monitor-right;
"Super+Shift+Ctrl+H".action = move-column-to-monitor-left;
"Super+Shift+Ctrl+J".action = move-column-to-monitor-down;
"Super+Shift+Ctrl+K".action = move-column-to-monitor-up;
"Super+Shift+Ctrl+L".action = move-column-to-monitor-right;
"Super+R".action = switch-preset-column-width;
"Super+F".action = maximize-column;
"Super+Shift+F".action = fullscreen-window;
"Super+C".action = center-column;
"Mod+Q".action = close-window;
}; };
"Mod+Space".action = spawn "${pkgs.fuzzel}/bin/fuzzel";
"Mod+V".action = sh "${pkgs.cliphist}/bin/cliphist list | fuzzel --dmenu | cliphist decode | wl-copy";
"Mod+Shift+Period".action = spawn "emoji";
"XF86AudioRaiseVolume".action = spawn "pamixer" "-i" "5";
"XF86AudioLowerVolume".action = spawn "pamixer" "-d" "5";
"XF86AudioMute".action = spawn "pamixer" "-t";
"XF86AudioMicMute".action = spawn "micmute";
"XF86MonBrightnessUp".action = spawn "brightnessctl" "set" "+5%";
"XF86MonBrightnessDown".action = spawn "brightnessctl" "set" "5%-";
"Super+WheelScrollDown".action = focus-workspace-down;
"Super+WheelScrollDown".cooldown-ms = 500;
"Super+WheelScrollUp".action = focus-workspace-up;
"Super+WheelScrollUp".cooldown-ms = 500;
"Super+WheelScrollRight".action = focus-column-right;
"Super+WheelScrollLeft".action = focus-column-left;
"Super+H".action = focus-column-left;
"Super+L".action = focus-column-right;
"Super+J".action = focus-workspace-down;
"Super+K".action = focus-workspace-up;
"Super+Left".action = focus-column-left;
"Super+Right".action = focus-column-right;
"Super+Down".action = focus-window-down;
"Super+Up".action = focus-window-up;
"Super+Print".action = screenshot-window;
"Super+Shift+Print".action = screenshot-screen;
"Super+Shift+S".action = screenshot;
"Super+Ctrl+H".action = move-column-left;
"Super+Ctrl+J".action = move-window-down;
"Super+Ctrl+K".action = move-window-up;
"Super+Ctrl+L".action = move-column-right;
"Super+U".action = move-workspace-down;
"Super+I".action = move-workspace-up;
"Super+Minus".action = set-column-width "-10%";
"Super+Equal".action = set-column-width "+10%";
"Super+Shift+Minus".action = set-window-height "-10%";
"Super+Shift+Equal".action = set-window-height "+10%";
"Super+Shift+H".action = focus-monitor-left;
"Super+Shift+J".action = focus-monitor-down;
"Super+Shift+K".action = focus-monitor-up;
"Super+Shift+L".action = focus-monitor-right;
"Super+Shift+Ctrl+H".action = move-column-to-monitor-left;
"Super+Shift+Ctrl+J".action = move-column-to-monitor-down;
"Super+Shift+Ctrl+K".action = move-column-to-monitor-up;
"Super+Shift+Ctrl+L".action = move-column-to-monitor-right;
"Super+R".action = switch-preset-column-width;
"Super+F".action = maximize-column;
"Super+Shift+F".action = fullscreen-window;
"Super+C".action = center-column;
"Mod+Q".action = close-window;
};
prefer-no-csd = true; prefer-no-csd = true;
hotkey-overlay.skip-at-startup = true; hotkey-overlay.skip-at-startup = true;

20
modules/wms/wayland/niri/default.nix
View file

@ -1,17 +1,13 @@
{ { pkgs, lib, theme, ... }:
pkgs, let
lib,
theme,
...
}: let
mkService = lib.recursiveUpdate { mkService = lib.recursiveUpdate {
Unit.PartOf = ["graphical-session.target"]; Unit.PartOf = [ "graphical-session.target" ];
Unit.After = ["graphical-session.target"]; Unit.After = [ "graphical-session.target" ];
Install.WantedBy = ["graphical-session.target"]; Install.WantedBy = [ "graphical-session.target" ];
}; };
in { in {
imports = [./config.nix]; imports = [ ./config.nix ];
home.packages = with pkgs; [pamixer]; home.packages = with pkgs; [ pamixer ];
services = { services = {
wlsunset = { wlsunset = {
# TODO: fix opaque red screen issue # TODO: fix opaque red screen issue
@ -32,7 +28,7 @@ imports = [./config.nix];
tray = { tray = {
Unit = { Unit = {
Description = "Home Manager System Tray"; Description = "Home Manager System Tray";
Requires = ["graphical-session-pre.target"]; Requires = [ "graphical-session-pre.target" ];
}; };
}; };
}; };

0
hosts/vali/mars/awesome/awesome.nix → modules/wms/x/awesome/awesome.nix
View file

0
modules/wms/x/default.nix Normal file
View file

27
options/desktop/fonts.nix
View file

@ -10,21 +10,18 @@
noto-fonts-emoji noto-fonts-emoji
jetbrains-mono jetbrains-mono
lexend lexend
]; ];
# What does this do? # What does this do?
enableDefaultPackages = false; enableDefaultPackages = false;
# this fixes emoji stuff # this fixes emoji stuff
fontconfig = { fontconfig = {
defaultFonts = { defaultFonts = {
monospace = [ monospace = [ "JetBrainsMono Nerd Font" "Noto Color Emoji" ];
"JetBrainsMono Nerd Font" sansSerif = [ "Lexend" "Noto Color Emoji" ];
"Noto Color Emoji" serif = [ "Noto Serif" "Noto Color Emoji" ];
]; emoji = [ "Noto Color Emoji" ];
sansSerif = ["Lexend" "Noto Color Emoji"];
serif = ["Noto Serif" "Noto Color Emoji"];
emoji = ["Noto Color Emoji"];
};
}; };
} };
};
} }