ooks/ooknet
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(treewide)

Browse source
This commit is contained in:
ooks-io 2024-06-11 22:37:17 +12:00
parent 25d48ac2ac
commit c4fc882042
99 changed files with 634 additions and 477 deletions
Download patch file Download diff file Expand all files Collapse all files

2
home/modules/desktop/communication/discord/default.nix
View file

@ -1,5 +1,5 @@
{
imports = [
./vesktop.nix
]
];
}

3
home/modules/desktop/communication/discord/vesktop.nix
View file

@ -5,7 +5,7 @@ let
inherit (lib) mkIf;
cfg = config.ooknet.communication.discord;
discord = config.ooknet.desktop.discord;
fonts = config.ooknet.theme.fonts;
fonts = config.ooknet.fonts;
in
{
@ -20,7 +20,6 @@ in
*/
:root {
/* Palette */
--nix-bg1: #${palette.base00};
--nix-bg2: #${palette.base01};
--nix-bg3: #${palette.base02};

17
home/modules/desktop/gaming/wine.nix Normal file
View file

@ -0,0 +1,17 @@
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf;
cfg = config.ooknet.gaming.wine;
in
{
config = mkIf cfg.enable {
home.packages = with pkgs; [
winetricks
protontricks
protonup-qt
wineWowPackages.full
];
};
}

2
home/modules/desktop/media/music/default.nix
View file

@ -1,6 +1,6 @@
{
imports = [
#./spotify --- still needs to be implemented
./tui
./tui.nix
];
}

2
home/modules/desktop/media/music/tui.nix
View file

@ -4,7 +4,7 @@ let
inherit (config.colorscheme) palette;
inherit (lib) mkIf;
cfg = config.ooknet.desktop.media.music.tui;
cfg = config.ooknet.media.music.tui;
zellij = config.ooknet.multiplexer.zellij;
multiplexer= config.ooknet.console.multiplexer;

2
home/modules/desktop/terminal/foot.nix
View file

@ -4,7 +4,7 @@ let
inherit (config.colorscheme) palette;
inherit (lib) mkIf;
fonts = config.ooknet.fonts;
cfg = config.ooknet.desktop.terminal.foot;
cfg = config.ooknet.terminal.foot;
terminal = config.ooknet.desktop.terminal;
in

7
home/modules/desktop/tools/kdeconnect.nix
View file

@ -1,13 +1,12 @@
{ lib, config, osConfig, ... }:
{ lib, osConfig, ... }:
let
inherit (lib) mkIf;
inherit (builtins) elem;
host = osConfig.ooknet.host;
cfg = osConfig.ooknet.programs.kdeconnect;
in
{
config = mkIf (elem "workstation" host.function) {
config = mkIf cfg.enable {
services.kdeconnect = {
enable = true;
indicator = true;

2
home/modules/desktop/tools/ookpower.nix
View file

@ -9,6 +9,6 @@ in
{
config = mkIf (launcher == "rofi") {
home.packages = [ inputs.ooks-scripts.packages.${pkgs.system}.powermenu ];
ooknet.binds.powermenu = "powermenu -c dmenu";
ooknet.binds.powerMenu = "powermenu -c dmenu";
};
}

21
home/modules/desktop/wayland/compositor/hyprland/settings/binds.nix
View file

@ -20,30 +20,24 @@ in
"SUPERSHIFT, S, exec, ${binds.steam}"
"SUPER, escape, exec, ${binds.terminalLaunch} --title=BTOP btop"
"SUPER CTRL, return, exec, ${binds.zellijMenu}"
"SUPER, delete, exec, ${binds.powermenu}"
"SUPER, delete, exec, ${binds.powerMenu}"
# Spotify PLayer Controls
"SUPER, bracketright, exec, ${spotifyctl} playback next"
"SUPER, bracketleft, exec, ${spotifyctl} playback previous"
"SUPER, backslash, exec, ${spotifyctl} playback play-pause"
"SUPER, M, exec, ${binds.spotify.launch}"
"SUPER, bracketright, exec, ${binds.spotify.next}"
"SUPER, bracketleft, exec, ${binds.spotify.previous}"
"SUPER, backslash, exec, ${binds.spotify.play}"
# Brightness
",XF86MonBrightnessUp, exec, hyprbrightness up"
",XF86MonBrightnessDown, exec, hyprbrightness down"
# Volume
",XF86AudioRaiseVolume, exec, hyprvolume up"
",XF86AudioLowerVolume, exec, hyprvolume down"
",XF86AudioMute, exec, hyprvolume mute"
# Window Management
"SUPER, Q, killactive"
"SUPER CTRL, backspace, killactive"
"SUPERSHIFT ALT, delete, exec, hyprkillsession"
@ -54,28 +48,24 @@ in
"SUPER, S, togglesplit" # dwindle
# Focus
"SUPER, left, movefocus,l"
"SUPER, right, movefocus,r"
"SUPER, up, movefocus,u"
"SUPER, down, movefocus,d"
# Move
"SUPERSHIFT, left, movewindow,l"
"SUPERSHIFT, right, movewindow,r"
"SUPERSHIFT, up, movewindow,u"
"SUPERSHIFT, down, movewindow,d"
#Resize
"SUPER CTRL, left, resizeactive,-20 0"
"SUPERCTRL, right, resizeactive,20 0"
"SUPER CTRL, up, resizeactive,0 -20"
"SUPERCTRL, down, resizeactive,0 20"
# Switch workspace
"SUPER, 1, workspace,1"
"SUPER, 2, workspace,2"
"SUPER, 3, workspace,3"
@ -91,7 +81,6 @@ in
"SUPER, tab, focusCurrentOrLast"
# Move workspace
"SUPERSHIFT, 1, movetoworkspace,1"
"SUPERSHIFT, 2, movetoworkspace,2"
"SUPERSHIFT, 3, movetoworkspace,3"

32
home/modules/desktop/wayland/default.nix
View file

@ -1,37 +1,11 @@
{ lib, config, osConfig, ... }:
let
inherit (lib) mkIf;
cfg = config.ooknet.desktop.wayland;
gpu = osConfig.ooknet.host.hardware.gpu;
in
{
imports = [
./bar
./compositor
./launcher
./lockscreen
./notification
./utility
./windowManager
./launcher
./variables.nix
];
config = mkIf cfg.enable {
home.sessionVariables = {
CLUTTER_BACKEND = "wayland";
NIXOS_OZONE_WL = "1";
GDK_BACKEND = "wayland";
QT_QPA_PLATFORM = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
MOZ_ENABLE_WAYLAND = "1";
MOZ_DBUS_REMOTE = "1";
XDG_SESSION_TYPE = "wayland";
SDL_VIDEODRIVER = "wayland";
} // mkIf (gpu == "nvidia") {
LIBVA_DRIVER_NAME = "nvidia";
GBM_BACKEND = "nvidia-drm";
__GLX_VENDOR_LIBRARY_NAME = "nvidia";
WLR_NO_HARDWARE_CURSORS = "1";
};
};
}

2
home/modules/desktop/wayland/lockscreen/hyprlock.nix
View file

@ -9,7 +9,7 @@ in
{
config = mkIf (wayland.locker == "hyprlock") {
ooknet.binds.locker = "hyprlock";
ooknet.binds.lock = "hyprlock";
programs.hyprlock = {
settings = {
enable = true;

2
home/modules/desktop/wayland/lockscreen/swaylock.nix
View file

@ -9,7 +9,7 @@ let
in
{
config = mkIf (wayland.locker == "swaylock") {
ooknet.binds.locker = "swaylock";
ooknet.binds.lock = "swaylock";
programs.swaylock = {
enable = true;
settings = {

28
home/modules/desktop/wayland/variables.nix Normal file
View file

@ -0,0 +1,28 @@
{ lib, config, osConfig, ... }:
let
inherit (lib) mkIf;
cfg = config.ooknet.wayland;
gpu = osConfig.ooknet.host.hardware.gpu;
in
{
config = mkIf cfg.enable {
home.sessionVariables = {
CLUTTER_BACKEND = "wayland";
NIXOS_OZONE_WL = "1";
GDK_BACKEND = "wayland";
QT_QPA_PLATFORM = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
MOZ_ENABLE_WAYLAND = "1";
MOZ_DBUS_REMOTE = "1";
XDG_SESSION_TYPE = "wayland";
SDL_VIDEODRIVER = "wayland";
} // mkIf (gpu == "nvidia") {
LIBVA_DRIVER_NAME = "nvidia";
GBM_BACKEND = "nvidia-drm";
__GLX_VENDOR_LIBRARY_NAME = "nvidia";
WLR_NO_HARDWARE_CURSORS = "1";
};
};
}