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

refactor(treewide): format with alejandra

Browse source
This commit is contained in:
ooks-io 2024-07-29 15:00:38 +12:00
parent 7fefb94400
commit 61cef505da
216 changed files with 5995 additions and 3969 deletions
Download patch file Download diff file Expand all files Collapse all files

2284
flake.lock generated
View file

File diff suppressed because it is too large Load diff

19
flake.nix
View file

@ -2,9 +2,12 @@
# ooknet # ooknet
description = "a nix configuration written by an orangutan"; description = "a nix configuration written by an orangutan";
outputs = { flake-parts, self, ... } @ inputs: outputs = {
flake-parts.lib.mkFlake { inherit inputs; } ({withSystem, ... }: { flake-parts,
self,
...
} @ inputs:
flake-parts.lib.mkFlake {inherit inputs;} ({withSystem, ...}: {
systems = import inputs.systems; systems = import inputs.systems;
imports = [ imports = [
@ -16,11 +19,13 @@
nixosConfigurations = import ./outputs/nixos.nix {inherit self inputs withSystem;}; nixosConfigurations = import ./outputs/nixos.nix {inherit self inputs withSystem;};
}; };
perSystem = {pkgs, ...}: {
formatter = pkgs.alejandra;
};
}); });
# External inputs we depend on # External inputs we depend on
inputs = { inputs = {
# unstable because why not # unstable because why not
nixpkgs.url = "github:Nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:Nixos/nixpkgs/nixos-unstable";
nixpkgs-small.url = "github:Nixos/nixpkgs/nixos-unstable-small"; nixpkgs-small.url = "github:Nixos/nixpkgs/nixos-unstable-small";
@ -32,14 +37,14 @@
systems.url = "github:nix-systems/default-linux"; systems.url = "github:nix-systems/default-linux";
# split your flake into... parts? # split your flake into... parts?
flake-parts = { flake-parts = {
url = "github:hercules-ci/flake-parts"; url = "github:hercules-ci/flake-parts";
inputs.nixpkgs-lib.follows = "nixpkgs"; inputs.nixpkgs-lib.follows = "nixpkgs";
}; };
# dotfile configuration # dotfile configuration
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-index-db = { nix-index-db = {
@ -93,7 +98,7 @@
}; };
# neovim configured with nix # neovim configured with nix
ookvim.url = "git+ssh://git@github.com/ooks-io/ookvim"; ooks-vim.url = "git+ssh://git@github.com/ooks-io/ooks-vim";
# packaged firefox addons # packaged firefox addons
firefox-addons = { firefox-addons = {

13
home/modules/appearance/cursor.nix
View file

@ -1,11 +1,11 @@
{ lib, config, ... }: {
lib,
let config,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.cursor; cfg = config.ooknet.cursor;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.pointerCursor = { home.pointerCursor = {
package = cfg.package; package = cfg.package;
@ -16,4 +16,3 @@ in
}; };
}; };
} }

2
home/modules/appearance/default.nix
View file

@ -1,4 +1,4 @@
{ {
imports = [ imports = [
./fonts.nix ./fonts.nix
./cursor.nix ./cursor.nix

18
home/modules/appearance/fonts.nix
View file

@ -1,21 +1,21 @@
{ lib, config, pkgs, ... }: {
lib,
let config,
pkgs,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.fonts; cfg = config.ooknet.fonts;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
home.packages = [ home.packages = [
cfg.monospace.package cfg.monospace.package
cfg.regular.package cfg.regular.package
pkgs.noto-fonts pkgs.noto-fonts
pkgs.noto-fonts-cjk pkgs.noto-fonts-cjk
pkgs.noto-fonts-emoji pkgs.noto-fonts-emoji
]; ];
}; };
} }

22
home/modules/appearance/gtk.nix
View file

@ -1,12 +1,15 @@
{ config, pkgs, inputs, lib, ... }: {
config,
let pkgs,
inherit (inputs.nix-colors.lib-contrib { inherit pkgs; }) gtkThemeFromScheme; inputs,
lib,
...
}: let
inherit (inputs.nix-colors.lib-contrib {inherit pkgs;}) gtkThemeFromScheme;
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.gtk; cfg = config.ooknet.gtk;
in in {
{ config = mkIf cfg.enable rec {
config = mkIf cfg.enable (rec {
gtk = { gtk = {
enable = true; enable = true;
font = { font = {
@ -15,7 +18,7 @@ in
}; };
theme = { theme = {
name = config.colorscheme.slug; name = config.colorscheme.slug;
package = gtkThemeFromScheme { scheme = config.colorscheme; }; package = gtkThemeFromScheme {scheme = config.colorscheme;};
}; };
iconTheme = { iconTheme = {
name = "Papirus-Dark"; name = "Papirus-Dark";
@ -30,6 +33,5 @@ in
"Net/IconThemeName" = gtk.iconTheme.name; "Net/IconThemeName" = gtk.iconTheme.name;
}; };
}; };
}); };
} }

15
home/modules/appearance/qt.nix
View file

@ -1,15 +1,16 @@
{ config, lib, pkgs, ... }: {
config,
let lib,
pkgs,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.qt; cfg = config.ooknet.qt;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
qt = { qt = {
enable = true; enable = true;
style.name = "gtk2"; style.name = "gtk2";
platformTheme.name = "gtk2"; platformTheme.name = "gtk2";
}; };

27
home/modules/appearance/wallpaper.nix
View file

@ -1,19 +1,23 @@
{ lib, config, inputs, pkgs, osConfig, ... }: {
let lib,
inherit (inputs.nix-colors.lib-contrib { inherit pkgs; }) nixWallpaperFromScheme; config,
inputs,
pkgs,
osConfig,
...
}: let
inherit (inputs.nix-colors.lib-contrib {inherit pkgs;}) nixWallpaperFromScheme;
inherit (lib) mkDefault mkIf; inherit (lib) mkDefault mkIf;
monitors = osConfig.ooknet.host.hardware.monitors; monitors = osConfig.ooknet.host.hardware.monitors;
cfg = config.ooknet.wallpaper; cfg = config.ooknet.wallpaper;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
ooknet.wallpaper.path = ooknet.wallpaper.path = let
let largest = f: xs: builtins.head (builtins.sort (a: b: a > b) (map f xs));
largest = f: xs: builtins.head (builtins.sort (a: b: a > b) (map f xs)); largestWidth = largest (x: x.width) monitors;
largestWidth = largest (x: x.width) monitors; largestHeight = largest (x: x.height) monitors;
largestHeight = largest (x: x.height) monitors; in
in
mkDefault (nixWallpaperFromScheme mkDefault (nixWallpaperFromScheme
{ {
scheme = config.colorscheme; scheme = config.colorscheme;
@ -23,4 +27,3 @@ in
}); });
}; };
} }

17
home/modules/base/home-manager.nix
View file

@ -1,19 +1,20 @@
{ lib, config, osConfig, ... }: {
lib,
let config,
osConfig,
...
}: let
inherit (lib) mkDefault; inherit (lib) mkDefault;
admin = osConfig.ooknet.host.admin; admin = osConfig.ooknet.host.admin;
in in {
{
programs.home-manager.enable = true; programs.home-manager.enable = true;
systemd.user.startServices = "sd-switch"; systemd.user.startServices = "sd-switch";
home = { home = {
username = admin.name; username = admin.name;
homeDirectory = "/home/${config.home.username}"; homeDirectory = "/home/${config.home.username}";
stateVersion = mkDefault "22.05"; stateVersion = mkDefault "22.05";
sessionPath = [ "${config.home.homeDirectory}/.local/bin" ]; sessionPath = ["${config.home.homeDirectory}/.local/bin"];
sessionVariables = { sessionVariables = {
TZ = "Pacific/Auckland"; TZ = "Pacific/Auckland";
}; };

6
home/modules/base/mime-apps.nix
View file

@ -1,7 +1,5 @@
{ pkgs, ... }: {pkgs, ...}: {
home.packages = [pkgs.xdg-utils];
{
home.packages = [ pkgs.xdg-utils ];
xdg.mimeApps = { xdg.mimeApps = {
enable = true; enable = true;
}; };

4
home/modules/base/user-dirs.nix
View file

@ -1,6 +1,4 @@
{ config, ... }: {config, ...}: {
{
xdg = { xdg = {
enable = true; enable = true;
configHome = "${config.home.homeDirectory}/.config"; configHome = "${config.home.homeDirectory}/.config";

24
home/modules/console/editor/helix/default.nix
View file

@ -1,17 +1,19 @@
{ inputs, config, pkgs, lib, ... }: {
inputs,
let config,
pkgs,
lib,
...
}: let
inherit (config) colorscheme; inherit (config) colorscheme;
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.editor.helix; cfg = config.ooknet.editor.helix;
console = config.ooknet.console; console = config.ooknet.console;
in in {
{
imports = [ imports = [
./languages.nix ./languages.nix
]; ];
config = mkIf (cfg.enable || console.editor == "helix") { config = mkIf (cfg.enable || console.editor == "helix") {
programs.helix = { programs.helix = {
enable = true; enable = true;
@ -49,9 +51,9 @@ in
select = "underline"; select = "underline";
}; };
statusline = { statusline = {
left = [ "mode" "spinner" ]; left = ["mode" "spinner"];
center = [ "file-name" ]; center = ["file-name"];
right = [ "diagnostics" "selections" "position" "file-encoding" "file-line-ending" "file-type" ]; right = ["diagnostics" "selections" "position" "file-encoding" "file-line-ending" "file-type"];
}; };
lsp = { lsp = {
display-messages = true; display-messages = true;
@ -64,7 +66,7 @@ in
W = ":set whitespace.render none"; W = ":set whitespace.render none";
}; };
}; };
themes = import ./theme.nix { inherit colorscheme; }; themes = import ./theme.nix {inherit colorscheme;};
}; };
}; };
} }

13
home/modules/console/editor/helix/languages.nix
View file

@ -1,12 +1,13 @@
{ pkgs, lib, config, ... }: {
pkgs,
let lib,
config,
...
}: let
inherit (lib) mkIf getExe; inherit (lib) mkIf getExe;
cfg = config.ooknet.editor.helix; cfg = config.ooknet.editor.helix;
console = config.ooknet.console; console = config.ooknet.console;
in in {
{
config = mkIf (cfg.enable || console.editor == "helix") { config = mkIf (cfg.enable || console.editor == "helix") {
programs.helix.languages = { programs.helix.languages = {
language = let language = let

145
home/modules/console/editor/helix/theme.nix
View file

@ -1,19 +1,21 @@
{colorscheme}: {
{ colorscheme }: {
"${colorscheme.slug}" = { "${colorscheme.slug}" = {
palette = builtins.mapAttrs (_name: value: "#${value}") colorscheme.colors; # Add leading '#' palette = builtins.mapAttrs (_name: value: "#${value}") colorscheme.colors; # Add leading '#'
"attributes" = "base09"; "attributes" = "base09";
"comment" = { fg = "base03"; modifiers = [ "italic" ]; }; "comment" = {
fg = "base03";
modifiers = ["italic"];
};
"constant" = "base09"; "constant" = "base09";
"constant.character.escape" = "base0C"; "constant.character.escape" = "base0C";
"constant.numeric" = "base09"; "constant.numeric" = "base09";
"constructor" = "base0D"; "constructor" = "base0D";
"debug" = "base03"; "debug" = "base03";
"diagnostic" = { modifiers = [ "underlined" ]; }; "diagnostic" = {modifiers = ["underlined"];};
"diagnostic.error" = { underline = { style = "curl"; }; }; "diagnostic.error" = {underline = {style = "curl";};};
"diagnostic.hint" = { underline = { style = "curl"; }; }; "diagnostic.hint" = {underline = {style = "curl";};};
"diagnostic.info" = { underline = { style = "curl"; }; }; "diagnostic.info" = {underline = {style = "curl";};};
"diagnostic.warning" = { underline = { style = "curl"; }; }; "diagnostic.warning" = {underline = {style = "curl";};};
"diff.delta" = "base09"; "diff.delta" = "base09";
"diff.minus" = "base08"; "diff.minus" = "base08";
"diff.plus" = "base0B"; "diff.plus" = "base0B";
@ -23,49 +25,114 @@
"info" = "base0D"; "info" = "base0D";
"keyword" = "base0E"; "keyword" = "base0E";
"label" = "base0E"; "label" = "base0E";
"markup.bold" = { fg = "base0A"; modifiers = [ "bold" ]; }; "markup.bold" = {
fg = "base0A";
modifiers = ["bold"];
};
"markup.heading" = "base0D"; "markup.heading" = "base0D";
"markup.italic" = { fg = "base0E"; modifiers = [ "italic" ]; }; "markup.italic" = {
fg = "base0E";
modifiers = ["italic"];
};
"markup.link.text" = "base08"; "markup.link.text" = "base08";
"markup.link.url" = { fg = "base09"; modifiers = [ "underlined" ]; }; "markup.link.url" = {
fg = "base09";
modifiers = ["underlined"];
};
"markup.list" = "base08"; "markup.list" = "base08";
"markup.quote" = "base0C"; "markup.quote" = "base0C";
"markup.raw" = "base0B"; "markup.raw" = "base0B";
"markup.strikethrough" = { modifiers = [ "crossed_out" ]; }; "markup.strikethrough" = {modifiers = ["crossed_out"];};
"namespace" = "base0E"; "namespace" = "base0E";
"operator" = "base05"; "operator" = "base05";
"special" = "base0D"; "special" = "base0D";
"string" = "base0B"; "string" = "base0B";
"type" = "base0A"; "type" = "base0A";
"ui.background" = { bg = "base00"; }; "ui.background" = {bg = "base00";};
"ui.bufferline" = { fg = "base04"; bg = "base00"; }; "ui.bufferline" = {
"ui.bufferline.active" = { fg = "base00"; bg = "base03"; modifiers = [ "bold" ]; }; fg = "base04";
"ui.cursor" = { fg = "base04"; modifiers = [ "reversed" ]; }; bg = "base00";
"ui.cursor.insert" = { fg = "base0A"; modifiers = [ "underlined" ]; }; };
"ui.cursor.match" = { fg = "base0A"; modifiers = [ "underlined" ]; }; "ui.bufferline.active" = {
"ui.cursor.select" = { fg = "base0A"; modifiers = [ "underlined" ]; }; fg = "base00";
"ui.cursorline.primary" = { fg = "base05"; bg = "base01"; }; bg = "base03";
"ui.gutter" = { bg = "base00"; }; modifiers = ["bold"];
"ui.help" = { fg = "base06"; bg = "base01"; }; };
"ui.linenr" = { fg = "base03"; bg = "base00"; }; "ui.cursor" = {
"ui.linenr.selected" = { fg = "base04"; bg = "base01"; modifiers = [ "bold" ]; }; fg = "base04";
"ui.menu" = { fg = "base05"; bg = "base01"; }; modifiers = ["reversed"];
"ui.menu.scroll" = { fg = "base03"; bg = "base01"; }; };
"ui.menu.selected" = { fg = "base01"; bg = "base04"; }; "ui.cursor.insert" = {
"ui.popup" = { bg = "base01"; }; fg = "base0A";
"ui.selection" = { bg = "base02"; }; modifiers = ["underlined"];
"ui.selection.primary" = { bg = "base02"; }; };
"ui.statusline" = { fg = "base0B"; bg = "base02"; }; "ui.cursor.match" = {
"ui.statusline.inactive" = { bg = "base01"; fg = "base02"; }; fg = "base0A";
"ui.statusline.insert" = { fg = "base00"; bg = "base0B"; }; modifiers = ["underlined"];
"ui.statusline.normal" = { fg = "base00"; bg = "base04"; }; };
"ui.statusline.select" = { fg = "base00"; bg = "base0E"; }; "ui.cursor.select" = {
fg = "base0A";
modifiers = ["underlined"];
};
"ui.cursorline.primary" = {
fg = "base05";
bg = "base01";
};
"ui.gutter" = {bg = "base00";};
"ui.help" = {
fg = "base06";
bg = "base01";
};
"ui.linenr" = {
fg = "base03";
bg = "base00";
};
"ui.linenr.selected" = {
fg = "base04";
bg = "base01";
modifiers = ["bold"];
};
"ui.menu" = {
fg = "base05";
bg = "base01";
};
"ui.menu.scroll" = {
fg = "base03";
bg = "base01";
};
"ui.menu.selected" = {
fg = "base01";
bg = "base04";
};
"ui.popup" = {bg = "base01";};
"ui.selection" = {bg = "base02";};
"ui.selection.primary" = {bg = "base02";};
"ui.statusline" = {
fg = "base0B";
bg = "base02";
};
"ui.statusline.inactive" = {
bg = "base01";
fg = "base02";
};
"ui.statusline.insert" = {
fg = "base00";
bg = "base0B";
};
"ui.statusline.normal" = {
fg = "base00";
bg = "base04";
};
"ui.statusline.select" = {
fg = "base00";
bg = "base0E";
};
"ui.text" = "base05"; "ui.text" = "base05";
"ui.text.focus" = "base05"; "ui.text.focus" = "base05";
"ui.virtual.indent-guide" = { fg = "base03"; }; "ui.virtual.indent-guide" = {fg = "base03";};
"ui.virtual.ruler" = { bg = "base01"; }; "ui.virtual.ruler" = {bg = "base01";};
"ui.virtual.whitespace" = { fg = "base01"; }; "ui.virtual.whitespace" = {fg = "base01";};
"ui.window" = { bg = "base01"; }; "ui.window" = {bg = "base01";};
"variable" = "base08"; "variable" = "base08";
"variable.other.member" = "base08"; "variable.other.member" = "base08";
"warning" = "base09"; "warning" = "base09";

27
home/modules/console/editor/nvim/default.nix
View file

@ -1,16 +1,19 @@
{ config, lib, inputs, pkgs, ... }:
let
inherit (lib) mkIf;
cfg = config.ooknet.editor.nvim;
console = config.ooknet.console;
ookvim = inputs.ookvim.packages.${pkgs.system}.default;
in
{ {
config,
lib,
inputs,
pkgs,
...
}: let
inherit (lib) mkIf;
inherit (config.ooknet) console;
cfg = config.ooknet.editor.nvim;
ookvim = inputs.ooks-vim.packages.${pkgs.system}.ooks-vim;
in {
config = mkIf (cfg.enable || console.editor == "nvim") { config = mkIf (cfg.enable || console.editor == "nvim") {
home.packages = [ ookvim ]; home.packages = [ookvim];
home.sessionVariables.EDITOR = mkIf (console.editor == "nvim") "nvim";
}; };
} }

83
home/modules/console/multiplexer/tmux/default.nix
View file

@ -1,13 +1,14 @@
{ config, lib, pkgs, ... }: {
config,
let lib,
pkgs,
...
}: let
inherit (config.colorscheme) palette; inherit (config.colorscheme) palette;
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.multiplexer.tmux; cfg = config.ooknet.multiplexer.tmux;
console = config.ooknet.console; console = config.ooknet.console;
in in {
{
config = mkIf (cfg.enable || console.multiplexer == "tmux") { config = mkIf (cfg.enable || console.multiplexer == "tmux") {
programs.tmux = { programs.tmux = {
enable = true; enable = true;
@ -22,39 +23,43 @@ in
plugin = tmuxPlugins.mode-indicator; plugin = tmuxPlugins.mode-indicator;
} }
]; ];
extraConfig = /* sh */ '' extraConfig =
# General Settings /*
set -g set-clipboard on sh
#Appearance */
set -g status-position top ''
set -g status-style "fg=#${palette.base05} bg=#${palette.base00}" # General Settings
#Windows set -g set-clipboard on
set -g status-justify "centre" #Appearance
setw -g window-status-current-format "#[bg=#${palette.base0B},fg=#${palette.base00},bold] #W " set -g status-position top
setw -g window-status-format "#[bg=#${palette.base03},fg=#${palette.base05}] #W " set -g status-style "fg=#${palette.base05} bg=#${palette.base00}"
#Left #Windows
set -g status-left " #{tmux_mode_indicator} #[bg=#${palette.base0B},fg=#${palette.base00}] #S" set -g status-justify "centre"
set -g status-right '%Y-%m-%d %H:%M #{tmux_mode_indicator}' setw -g window-status-current-format "#[bg=#${palette.base0B},fg=#${palette.base00},bold] #W "
#Move to Pane setw -g window-status-format "#[bg=#${palette.base03},fg=#${palette.base05}] #W "
bind -n M-Left select-pane -L #Left
bind -n M-h select-pane -L set -g status-left " #{tmux_mode_indicator} #[bg=#${palette.base0B},fg=#${palette.base00}] #S"
bind -n M-Right select-pane -R set -g status-right '%Y-%m-%d %H:%M #{tmux_mode_indicator}'
bind -n M-l select-pane -R #Move to Pane
bind -n M-Up select-pane -U bind -n M-Left select-pane -L
bind -n M-k select-pane -U bind -n M-h select-pane -L
bind -n M-Down select-pane -D bind -n M-Right select-pane -R
bind -n M-j select-pane -D bind -n M-l select-pane -R
#Split Pane bind -n M-Up select-pane -U
bind -n M-- split-window -h bind -n M-k select-pane -U
bind -n M-= split-window -v bind -n M-Down select-pane -D
#Resize Pane bind -n M-j select-pane -D
bind -n C-M-Up resize-pane -U 5 #Split Pane
bind -n C-M-Down resize-pane -D 5 bind -n M-- split-window -h
bind -n C-M-Left resize-pane -L 5 bind -n M-= split-window -v
bind -n C-M-Right resize-pane -R 5 #Resize Pane
#Move to Window bind -n C-M-Up resize-pane -U 5
bind -n M-1 bind -n C-M-Down resize-pane -D 5
''; bind -n C-M-Left resize-pane -L 5
bind -n C-M-Right resize-pane -R 5
#Move to Window
bind -n M-1
'';
}; };
}; };
} }

193
home/modules/console/multiplexer/zellij/default.nix
View file

@ -1,13 +1,16 @@
{ osConfig, lib, config, pkgs, ... }: {
let osConfig,
lib,
config,
pkgs,
...
}: let
inherit (config.colorscheme) palette; inherit (config.colorscheme) palette;
inherit (lib) mkIf; inherit (lib) mkIf;
inherit (config.ooknet) console;
inherit (osConfig.ooknet.host) admin;
cfg = config.ooknet.multiplexer.zellij; cfg = config.ooknet.multiplexer.zellij;
console = config.ooknet.console; in {
admin = osConfig.ooknet.host.admin;
in
{
config = mkIf (cfg.enable || console.multiplexer == "zellij") { config = mkIf (cfg.enable || console.multiplexer == "zellij") {
programs.zellij = { programs.zellij = {
enable = true; enable = true;
@ -16,6 +19,7 @@ in
default_shell = "${admin.shell}"; default_shell = "${admin.shell}";
default_layout = "default"; default_layout = "default";
pane_frames = false; pane_frames = false;
scrollback_editor = "${console.editor}";
themes = { themes = {
"${config.colorscheme.slug}" = { "${config.colorscheme.slug}" = {
fg = "#${palette.base05}"; fg = "#${palette.base05}";
@ -35,29 +39,160 @@ in
}; };
# Layouts # Layouts
# Default layout xdg.configFile = {
xdg.configFile."zellij/layouts/default.kdl" = import ./layouts/defaultLayout.nix { inherit pkgs config; }; # Default layout
# Layout for bash scripts "zellij/layouts/default.kdl" = import ./layouts/defaultLayout.nix {inherit pkgs config;};
xdg.configFile."zellij/layouts/script.kdl" = import ./layouts/scriptLayout.nix { inherit pkgs config; }; # Layout for bash scripts
# Layout for configuring my flake "zellij/layouts/script.kdl" = import ./layouts/scriptLayout.nix {inherit pkgs config;};
xdg.configFile."zellij/layouts/flake.kdl" = import ./layouts/flakeLayout.nix { inherit pkgs config; }; # Layout for configuring my flake
"zellij/layouts/flake.kdl" = import ./layouts/flakeLayout.nix {inherit pkgs config;};
# Additional keybinds
"zellij/config.kdl".text =
# kdl
''
keybinds clear-defaults=true {
shared_except "locked" {
bind "Alt 1" { GoToTab 1; }
bind "Alt 2" { GoToTab 2; }
bind "Alt 3" { GoToTab 3; }
bind "Alt 4" { GoToTab 4; }
bind "Alt 5" { GoToTab 5; }
bind "Alt 6" { GoToTab 6; }
bind "Alt 7" { GoToTab 7; }
bind "Alt 8" { GoToTab 8; }
bind "Alt 9" { GoToTab 9; }
bind "Alt -" { Resize "Decrease" ; }
bind "Alt =" { Resize "Increase" ; }
}
# Additional keybinds locked {
xdg.configFile."zellij/config.kdl".text = /* kdl */ '' bind "Alt g" { SwitchToMode "Normal" ; }
keybinds { }
shared_except "locked" {
bind "Alt 1" { GoToTab 1; } resize {
bind "Alt 2" { GoToTab 2; } bind "Alt r" { SwitchToMode "Normal" ; }
bind "Alt 3" { GoToTab 3; } bind "h" "Left" { Resize "Increase Left" ; }
bind "Alt 4" { GoToTab 4; } bind "j" "Down" { Resize "Increase Down" ; }
bind "Alt 5" { GoToTab 5; } bind "k" "Up" { Resize "Increase Up" ; }
bind "Alt 6" { GoToTab 6; } bind "l" "Right" { Resize "Increase Right" ; }
bind "Alt 7" { GoToTab 7; } }
bind "Alt 8" { GoToTab 8; }
bind "Alt 9" { GoToTab 9; } pane {
bind "Alt p" { SwitchToMode "Normal" ; }
bind "c" { Clear ; }
bind "e" { TogglePaneEmbedOrFloating ; SwitchToMode "Normal" ; }
bind "f" { ToggleFocusFullscreen ; SwitchToMode "Normal" ; }
bind "j" "Down" { NewPane "Down" ; SwitchToMode "Normal" ; }
bind "l" "Right" { NewPane "Right" ; SwitchToMode "Normal" ; }
bind "n" { NewPane ; SwitchToMode "Normal" ; }
bind "p" { SwitchFocus ; SwitchToMode "Normal" ; }
bind "r" { SwitchToMode "RenamePane" ; PaneNameInput 0 ; }
bind "w" { ToggleFloatingPanes ; SwitchToMode "Normal" ; }
bind "x" { CloseFocus ; SwitchToMode "Normal" ; }
bind "z" { TogglePaneFrames ; SwitchToMode "Normal" ; }
}
move {
bind "Alt m" { SwitchToMode "Normal"; }
bind "h" "Left" { MovePane "Left" ; }
bind "j" "Down" { MovePane "Down" ; }
bind "k" "Up" { MovePane "Up" ; }
bind "l" "Right" { MovePane "Right" ; }
}
tab {
bind "Alt t" { SwitchToMode "Normal" ; }
bind "b" { BreakPane; SwitchToMode "Normal" ; }
bind "h" { MoveTab "Left" ; }
bind "l" { MoveTab "Right" ; }
bind "n" { NewTab ; SwitchToMode "Normal" ; }
bind "r" { SwitchToMode "RenameTab" ; TabNameInput 0 ; }
bind "x" { CloseTab ; SwitchToMode "Normal" ; }
bind "1" { GoToTab 1 ; SwitchToMode "Normal" ; }
bind "2" { GoToTab 2 ; SwitchToMode "Normal" ; }
bind "3" { GoToTab 3 ; SwitchToMode "Normal" ; }
bind "4" { GoToTab 4 ; SwitchToMode "Normal" ; }
bind "5" { GoToTab 5 ; SwitchToMode "Normal" ; }
bind "6" { GoToTab 6 ; SwitchToMode "Normal" ; }
bind "7" { GoToTab 7 ; SwitchToMode "Normal" ; }
bind "8" { GoToTab 8 ; SwitchToMode "Normal" ; }
bind "9" { GoToTab 9 ; SwitchToMode "Normal" ; }
}
scroll {
bind "Alt s" { SwitchToMode "Normal" ; }
bind "e" { EditScrollback; SwitchToMode "Normal" ; }
bind "d" { HalfPageScrollDown ; }
bind "u" { HalfPageScrollUp ; }
bind "j" "Down" { ScrollDown ; }
bind "k" "Up" { ScrollUp ; }
bind "Home" { ScrollToTop ; SwitchToMode "Normal" ; }
bind "End" { ScrollToBottom ; SwitchToMode "Normal" ; }
bind "PageDown" { PageScrollDown ; }
bind "PageUp" { PageScrollUp ; }
bind "s" { SwitchToMode "EnterSearch" ; SearchInput 0 ; }
}
search {
bind "Alt s" { SwitchToMode "Normal" ; }
bind "n" { Search "down" ; }
bind "p" { Search "up" ; }
bind "c" { SearchToggleOption "CaseSensitivity" ; }
bind "w" { SearchToggleOption "Wrap" ; }
bind "o" { SearchToggleOption "WholeWord" ; }
}
entersearch {
bind "Alt c" "Esc" { SwitchToMode "Scroll" ; }
bind "Enter" { SwitchToMode "Search" ; }
}
renametab {
bind "Alt c" { SwitchToMode "Normal" ; }
bind "Esc" { UndoRenameTab ; SwitchToMode "Tab" ; }
}
renamepane {
bind "Alt c" { SwitchToMode "Normal"; }
bind "Esc" { UndoRenamePane; SwitchToMode "Pane"; }
}
session {
bind "Alt o" { SwitchToMode "Normal" ; }
bind "d" { Detach ; }
bind "w" {
LaunchOrFocusPlugin "session-manager" {
floating true
move_to_focused_tab true
};
SwitchToMode "Normal"
}
}
shared_except "locked" {
bind "Alt g" { SwitchToMode "Locked" ; }
bind "Alt q" { Quit ; }
bind "Alt h" "Alt Left" { MoveFocusOrTab "Left" ; }
bind "Alt l" "Alt Right" { MoveFocusOrTab "Right" ; }
bind "Alt j" "Alt Down" { MoveFocus "Down" ; }
bind "Alt k" "Alt Up" { MoveFocus "Up" ; }
bind "Alt [" { PreviousSwapLayout ; }
bind "Alt ]" { NextSwapLayout ; }
}
shared_except "normal" "locked" {
bind "Enter" "Esc" { SwitchToMode "Normal" ; }
}
shared_except "pane" "locked" {
bind "Alt p" { SwitchToMode "Pane" ; }
}
shared_except "resize" "locked" {
bind "Alt r" { SwitchToMode "Resize" ; }
}
shared_except "scroll" "locked" {
bind "Alt s" { SwitchToMode "Scroll" ; }
}
shared_except "session" "locked" {
bind "Alt o" { SwitchToMode "Session" ; }
}
shared_except "tab" "locked" {
bind "Alt t" { SwitchToMode "Tab" ; }
}
shared_except "move" "locked" {
bind "Alt m" { SwitchToMode "Move" ; }
}
} }
} '';
''; };
}; };
} }

104
home/modules/console/multiplexer/zellij/layouts/defaultLayout.nix
View file

@ -1,60 +1,64 @@
{ pkgs, config, ... }:
let
inherit (config.colorscheme) palette;
in
{ {
text = /* kdl */ '' pkgs,
layout { config,
default_tab_template { ...
pane size=2 borderless=true { }: let
plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" { inherit (config.colorscheme) palette;
format_left "{mode}" in {
format_right "{session} {command_git_branch} {datetime}" text =
format_center "#[fg=#${palette.base0D},bold] {tabs}" /*
format_space "" kdl
*/
''
layout {
default_tab_template {
pane size=2 borderless=true {
plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" {
format_left "{mode}"
format_right "{session} {command_git_branch} {datetime}"
format_center "#[fg=#${palette.base0D},bold] {tabs}"
format_space ""
border_enabled "true" border_enabled "true"
border_char "─" border_char "─"
border_format "#[fg=#${palette.base05}]{char}" border_format "#[fg=#${palette.base05}]{char}"
border_position "bottom" border_position "bottom"
hide_frame_for_single_pane "true" hide_frame_for_single_pane "true"
mode_normal "#[fg=#${palette.base0D}] " mode_normal "#[fg=#${palette.base0D}] "
mode_tmux "#[fg=#${palette.base0E}] " mode_tmux "#[fg=#${palette.base0E}] "
mode_pane "#[fg=#${palette.base08}] " mode_pane "#[fg=#${palette.base08}] "
mode_tab "#[fg=#${palette.base08}] " mode_tab "#[fg=#${palette.base08}] "
mode_rename_tab "#[fg=#${palette.base08}] " mode_rename_tab "#[fg=#${palette.base08}] "
mode_rename_pane "#[fg=#${palette.base08}] " mode_rename_pane "#[fg=#${palette.base08}] "
mode_session "#[fg=#${palette.base08}] " mode_session "#[fg=#${palette.base08}] "
mode_locked "#[fg=#${palette.base05}] " mode_locked "#[fg=#${palette.base05}] "
mode_move "#[fg=#${palette.base0B}] " mode_move "#[fg=#${palette.base0B}] "
mode_resize "#[fg=#${palette.base0B}] " mode_resize "#[fg=#${palette.base0B}] "
mode_prompt "#[fg=#${palette.base0A}] " mode_prompt "#[fg=#${palette.base0A}] "
mode_search "#[fg=#${palette.base0A}] " mode_search "#[fg=#${palette.base0A}] "
mode_enter_search "#[fg=#${palette.base0A}] " mode_enter_search "#[fg=#${palette.base0A}] "
tab_normal "#[bg=#${palette.base01}] {name} " tab_normal "#[bg=#${palette.base01}] {name} "
tab_active "#[bg=#${palette.base02}] {name} " tab_active "#[bg=#${palette.base02}] {name} "
tab_separator " " tab_separator " "
command_git_branch_command "git rev-parse --abbrev-ref HEAD" command_git_branch_command "git rev-parse --abbrev-ref HEAD"
command_git_branch_format "#[fg=#${palette.base0C}] {stdout} " command_git_branch_format "#[fg=#${palette.base0C}] {stdout} "
command_git_branch_interval "10" command_git_branch_interval "10"
command_git_branch_rendermode "static" command_git_branch_rendermode "static"
datetime "#[fg=#${palette.base05},bold] {format} " datetime "#[fg=#${palette.base05},bold] {format} "
datetime_format "%I:%M %p" datetime_format "%I:%M %p"
datetime_timezone "${config.home.sessionVariables.TZ}" datetime_timezone "${config.home.sessionVariables.TZ}"
}
} }
} children
children
}
tab name="terminal" focus=true {
pane name="term" focus=true
} }
} tab name="terminal" focus=true {
''; pane name="term" focus=true
}
}
'';
} }

114
home/modules/console/multiplexer/zellij/layouts/flakeLayout.nix
View file

@ -1,66 +1,70 @@
{ pkgs, config, ... }:
let
inherit (config.colorscheme) palette;
in
{ {
text = /* kdl */ '' pkgs,
layout { config,
default_tab_template { ...
pane size=2 borderless=true { }: let
plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" { inherit (config.colorscheme) palette;
format_left "{mode}" in {
format_right "{session} {command_git_branch} {datetime}" text =
format_center "#[fg=#${palette.base0D},bold] {tabs}" /*
format_space "" kdl
*/
''
layout {
default_tab_template {
pane size=2 borderless=true {
plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" {
format_left "{mode}"
format_right "{session} {command_git_branch} {datetime}"
format_center "#[fg=#${palette.base0D},bold] {tabs}"
format_space ""
border_enabled "true" border_enabled "true"
border_char "─" border_char "─"
border_format "#[fg=#${palette.base05}]{char}" border_format "#[fg=#${palette.base05}]{char}"
border_position "bottom" border_position "bottom"
hide_frame_for_single_pane "true" hide_frame_for_single_pane "true"
mode_normal "#[fg=#${palette.base0D}] " mode_normal "#[fg=#${palette.base0D}] "
mode_tmux "#[fg=#${palette.base0E}] " mode_tmux "#[fg=#${palette.base0E}] "
mode_pane "#[fg=#${palette.base08}] " mode_pane "#[fg=#${palette.base08}] "
mode_tab "#[fg=#${palette.base08}] " mode_tab "#[fg=#${palette.base08}] "
mode_rename_tab "#[fg=#${palette.base08}] " mode_rename_tab "#[fg=#${palette.base08}] "
mode_rename_pane "#[fg=#${palette.base08}] " mode_rename_pane "#[fg=#${palette.base08}] "
mode_session "#[fg=#${palette.base08}] " mode_session "#[fg=#${palette.base08}] "
mode_locked "#[fg=#${palette.base05}] " mode_locked "#[fg=#${palette.base05}] "
mode_move "#[fg=#${palette.base0B}] " mode_move "#[fg=#${palette.base0B}] "
mode_resize "#[fg=#${palette.base0B}] " mode_resize "#[fg=#${palette.base0B}] "
mode_prompt "#[fg=#${palette.base0A}] " mode_prompt "#[fg=#${palette.base0A}] "
mode_search "#[fg=#${palette.base0A}] " mode_search "#[fg=#${palette.base0A}] "
mode_enter_search "#[fg=#${palette.base0A}] " mode_enter_search "#[fg=#${palette.base0A}] "
tab_normal "#[bg=#${palette.base01}] {name} " tab_normal "#[bg=#${palette.base01}] {name} "
tab_active "#[bg=#${palette.base02}] {name} " tab_active "#[bg=#${palette.base02}] {name} "
tab_separator " " tab_separator " "
command_git_branch_command "git rev-parse --abbrev-ref HEAD" command_git_branch_command "git rev-parse --abbrev-ref HEAD"
command_git_branch_format "#[fg=#${palette.base0C}] {stdout} " command_git_branch_format "#[fg=#${palette.base0C}] {stdout} "
command_git_branch_interval "10" command_git_branch_interval "10"
command_git_branch_rendermode "static" command_git_branch_rendermode "static"
datetime "#[fg=#${palette.base05},bold] {format} " datetime "#[fg=#${palette.base05},bold] {format} "
datetime_format "%I:%M %p" datetime_format "%I:%M %p"
datetime_timezone "${config.home.sessionVariables.TZ}" datetime_timezone "${config.home.sessionVariables.TZ}"
}
} }
children
}
tab name="terminal" focus=true {
pane name="term" cwd="$FLAKE" focus=true
}
tab name="editor" {
pane name="edit" edit="$FLAKE"
}
tab name="git" {
pane name="git" cwd="$FLAKE" command="lazygit"
} }
children
} }
tab name="terminal" focus=true { '';
pane name="term" cwd="$FLAKE" focus=true
}
tab name="editor" {
pane name="edit" edit="$FLAKE"
}
tab name="git" {
pane name="git" cwd="$FLAKE" command="lazygit"
}
}
'';
} }

112
home/modules/console/multiplexer/zellij/layouts/scriptLayout.nix
View file

@ -1,64 +1,68 @@
{ pkgs, config, ... }:
let
inherit (config.colorscheme) palette;
in
{ {
text = /* kdl */ '' pkgs,
layout { config,
default_tab_template { ...
pane size=2 borderless=true { }: let
plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" { inherit (config.colorscheme) palette;
format_left "{mode}" in {
format_right "{session} {command_git_branch} {datetime}" text =
format_center "#[fg=#${palette.base0D},bold] {tabs}" /*
format_space "" kdl
*/
''
layout {
default_tab_template {
pane size=2 borderless=true {
plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" {
format_left "{mode}"
format_right "{session} {command_git_branch} {datetime}"
format_center "#[fg=#${palette.base0D},bold] {tabs}"
format_space ""
border_enabled "true" border_enabled "true"
border_char "─" border_char "─"
border_format "#[fg=#${palette.base05}]{char}" border_format "#[fg=#${palette.base05}]{char}"
border_position "bottom" border_position "bottom"
hide_frame_for_single_pane "true" hide_frame_for_single_pane "true"
mode_normal "#[fg=#${palette.base0D}] " mode_normal "#[fg=#${palette.base0D}] "
mode_tmux "#[fg=#${palette.base0E}] " mode_tmux "#[fg=#${palette.base0E}] "
mode_pane "#[fg=#${palette.base08}] " mode_pane "#[fg=#${palette.base08}] "
mode_tab "#[fg=#${palette.base08}] " mode_tab "#[fg=#${palette.base08}] "
mode_rename_tab "#[fg=#${palette.base08}] " mode_rename_tab "#[fg=#${palette.base08}] "
mode_rename_pane "#[fg=#${palette.base08}] " mode_rename_pane "#[fg=#${palette.base08}] "
mode_session "#[fg=#${palette.base08}] " mode_session "#[fg=#${palette.base08}] "
mode_locked "#[fg=#${palette.base05}] " mode_locked "#[fg=#${palette.base05}] "
mode_move "#[fg=#${palette.base0B}] " mode_move "#[fg=#${palette.base0B}] "
mode_resize "#[fg=#${palette.base0B}] " mode_resize "#[fg=#${palette.base0B}] "
mode_prompt "#[fg=#${palette.base0A}] " mode_prompt "#[fg=#${palette.base0A}] "
mode_search "#[fg=#${palette.base0A}] " mode_search "#[fg=#${palette.base0A}] "
mode_enter_search "#[fg=#${palette.base0A}] " mode_enter_search "#[fg=#${palette.base0A}] "
tab_normal "#[bg=#${palette.base01}] {name} " tab_normal "#[bg=#${palette.base01}] {name} "
tab_active "#[bg=#${palette.base02}] {name} " tab_active "#[bg=#${palette.base02}] {name} "
tab_separator " " tab_separator " "
command_git_branch_command "git rev-parse --abbrev-ref HEAD" command_git_branch_command "git rev-parse --abbrev-ref HEAD"
command_git_branch_format "#[fg=#${palette.base0C}] {stdout} " command_git_branch_format "#[fg=#${palette.base0C}] {stdout} "
command_git_branch_interval "10" command_git_branch_interval "10"
command_git_branch_rendermode "static" command_git_branch_rendermode "static"
datetime "#[fg=#${palette.base05},bold] {format} " datetime "#[fg=#${palette.base05},bold] {format} "
datetime_format "%I:%M %p" datetime_format "%I:%M %p"
datetime_timezone "${config.home.sessionVariables.TZ}" datetime_timezone "${config.home.sessionVariables.TZ}"
}
}
children
} }
tab name="edit" focus=true {
pane edit="./" name="edit" focus=true size="85%" borderless=true
pane name="term" focus=false size="15%" borderless=false
}
tab name="git" focus=false {
pane name="git" focus=false command="lazygit"
}
} }
children '';
}
tab name="edit" focus=true {
pane edit="./" name="edit" focus=true size="85%" borderless=true
pane name="term" focus=false size="15%" borderless=false
}
tab name="git" focus=false {
pane name="git" focus=false command="lazygit"
}
}
'';
} }

13
home/modules/console/shell/bash/default.nix
View file

@ -1,12 +1,13 @@
{ config, lib, osConfig, ... }: {
config,
let lib,
osConfig,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.shell.bash; cfg = config.ooknet.shell.bash;
admin = osConfig.ooknet.host.admin; admin = osConfig.ooknet.host.admin;
in in {
{
config = mkIf (cfg.enable || admin.shell == "bash") { config = mkIf (cfg.enable || admin.shell == "bash") {
programs.bash.enable = true; programs.bash.enable = true;
}; };

16
home/modules/console/shell/fish/aliases.nix
View file

@ -1,14 +1,16 @@
{ lib, config, osConfig, pkgs, ... }: {
lib,
let config,
osConfig,
pkgs,
...
}: let
inherit (lib) mkIf getExe; inherit (lib) mkIf getExe;
inherit (pkgs) bat eza dust nh; inherit (pkgs) bat eza dust nh;
cfg = config.ooknet.shell.fish; cfg = config.ooknet.shell.fish;
admin = osConfig.ooknet.host.admin; admin = osConfig.ooknet.host.admin;
in in {
{
config = mkIf (cfg.enable || admin.shell == "fish") { config = mkIf (cfg.enable || admin.shell == "fish") {
programs.fish = { programs.fish = {
shellAliases = { shellAliases = {

20
home/modules/console/shell/fish/binds.nix
View file

@ -1,16 +1,18 @@
{ lib, config, osConfig, ... }:
let
inherit (lib) mkIf;
cfg = config.ooknet.shell.fish;
admin = osConfig.ooknet.host.admin;
in
{ {
lib,
config,
osConfig,
...
}: let
inherit (lib) mkIf;
inherit (osConfig.ooknet.host) admin;
cfg = config.ooknet.shell.fish;
in {
config = mkIf (cfg.enable || admin.shell == "fish") { config = mkIf (cfg.enable || admin.shell == "fish") {
programs.fish.functions = { programs.fish.functions = {
fish_user_key_bindings = '' fish_user_key_bindings = ''
bind --preset -M insert \cf fe bind --preset -M insert \cf $EDITOR $FLAKE
bind --preset -M insert \ec fzf_cd_widget bind --preset -M insert \ec fzf_cd_widget
''; '';
}; };

22
home/modules/console/shell/fish/default.nix
View file

@ -1,12 +1,14 @@
{ lib, config, osConfig, ... }:
let
inherit (lib) mkIf;
cfg = config.ooknet.shell.fish;
admin = osConfig.ooknet.host.admin;
in
{ {
lib,
config,
osConfig,
...
}: let
inherit (lib) mkIf;
inherit (osConfig.ooknet.host) admin;
cfg = config.ooknet.shell.fish;
in {
imports = [ imports = [
./plugins.nix ./plugins.nix
./binds.nix ./binds.nix
@ -27,7 +29,8 @@ in
set fish_cursor_insert line blink set fish_cursor_insert line blink
set fish_cursor_replace_one underscore blink set fish_cursor_replace_one underscore blink
set fish_cursor_visual block set fish_cursor_visual block
'' + ''
+
# Use terminal colors # Use terminal colors
'' ''
set -U fish_color_autosuggestion brblack set -U fish_color_autosuggestion brblack
@ -60,4 +63,3 @@ in
}; };
}; };
} }

15
home/modules/console/shell/fish/plugins.nix
View file

@ -1,12 +1,14 @@
{ lib, config, pkgs, osConfig, ... }: {
lib,
let config,
pkgs,
osConfig,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.shell.fish; cfg = config.ooknet.shell.fish;
admin = osConfig.ooknet.host.admin; admin = osConfig.ooknet.host.admin;
in in {
{
config = mkIf (cfg.enable || admin.shell == "fish") { config = mkIf (cfg.enable || admin.shell == "fish") {
programs.fish = { programs.fish = {
plugins = [ plugins = [
@ -26,4 +28,3 @@ in
}; };
}; };
} }

15
home/modules/console/shell/zsh/default.nix
View file

@ -1,16 +1,17 @@
{ lib, config, osConfig, ... }: {
lib,
let config,
osConfig,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.shell.zsh; cfg = config.ooknet.shell.zsh;
admin = osConfig.ooknet.host.admin; admin = osConfig.ooknet.host.admin;
in in {
{
imports = [ imports = [
./plugins.nix ./plugins.nix
]; ];
config = mkIf (cfg.enable || admin.shell == "zsh") { config = mkIf (cfg.enable || admin.shell == "zsh") {
programs.zsh = { programs.zsh = {
enable = true; enable = true;

14
home/modules/console/shell/zsh/plugins.nix
View file

@ -1,12 +1,14 @@
{ lib, pkgs, config, osConfig, ... }: {
lib,
let pkgs,
config,
osConfig,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.shell.zsh; cfg = config.ooknet.shell.zsh;
admin = osConfig.ooknet.host.admin; admin = osConfig.ooknet.host.admin;
in in {
{
config = mkIf (cfg.enable || admin.shell == "zsh") { config = mkIf (cfg.enable || admin.shell == "zsh") {
programs.zsh.plugins = [ programs.zsh.plugins = [
{ {

13
home/modules/console/tools/bat.nix
View file

@ -1,11 +1,12 @@
{ lib, config, pkgs, ... }: {
lib,
let config,
pkgs,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.tools.bat; cfg = config.ooknet.tools.bat;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.bat = { programs.bat = {
enable = true; enable = true;

12
home/modules/console/tools/btop.nix
View file

@ -1,11 +1,11 @@
{ lib, config, ... }: {
lib,
let config,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.tools.btop; cfg = config.ooknet.tools.btop;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.btop = { programs.btop = {
enable = true; enable = true;

12
home/modules/console/tools/direnv.nix
View file

@ -1,11 +1,11 @@
{ lib, config, ... }: {
lib,
let config,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.tools.direnv; cfg = config.ooknet.tools.direnv;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.direnv = { programs.direnv = {
enable = true; enable = true;

12
home/modules/console/tools/eza.nix
View file

@ -1,11 +1,11 @@
{ lib, config, ... }: {
lib,
let config,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.tools.eza; cfg = config.ooknet.tools.eza;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.eza = { programs.eza = {
enable = true; enable = true;

15
home/modules/console/tools/ffmpeg.nix
View file

@ -1,12 +1,13 @@
{ lib, config, pkgs, ... }: {
lib,
let config,
pkgs,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.tools.ffmpeg; cfg = config.ooknet.tools.ffmpeg;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = [ pkgs.ffmpeg ]; home.packages = [pkgs.ffmpeg];
}; };
} }

13
home/modules/console/tools/fzf.nix
View file

@ -1,12 +1,13 @@
{ lib, config, osConfig, ... }: {
lib,
let config,
osConfig,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
admin = osConfig.ooknet.host.admin; admin = osConfig.ooknet.host.admin;
cfg = config.ooknet.tools.fzf; cfg = config.ooknet.tools.fzf;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.fzf = { programs.fzf = {
enable = true; enable = true;

25
home/modules/console/tools/git.nix
View file

@ -1,26 +1,27 @@
{ pkgs, config, lib, osConfig, ... }: {
pkgs,
let config,
inherit (lib) mkIf; lib,
cfg = config.ooknet.tools.git; osConfig,
admin = osConfig.ooknet.host.admin; ...
in }: let
inherit (lib) mkIf;
{ cfg = config.ooknet.tools.git;
admin = osConfig.ooknet.host.admin;
in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.git = { programs.git = {
enable = true; enable = true;
package = pkgs.gitAndTools.gitFull; package = pkgs.gitAndTools.gitFull;
userName = admin.gitName; userName = admin.gitName;
userEmail = admin.gitEmail; userEmail = admin.gitEmail;
ignores = [ ".direnv" "result" ]; ignores = [".direnv" "result"];
lfs.enable = true; lfs.enable = true;
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
lazygit lazygit
gh gh
]; ];
}; };
} }

15
home/modules/console/tools/nixIndex.nix
View file

@ -1,12 +1,13 @@
{ lib, config, inputs, ... }: {
lib,
let config,
inputs,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.tools.nixIndex; cfg = config.ooknet.tools.nixIndex;
in in {
imports = [inputs.nix-index-db.hmModules.nix-index];
{
imports = [ inputs.nix-index-db.hmModules.nix-index ];
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs = { programs = {
nix-index = { nix-index = {

15
home/modules/console/tools/sourcegraph.nix
View file

@ -1,12 +1,13 @@
{ lib, config, pkgs, ... }: {
lib,
let config,
pkgs,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.tools.sourcegraph; cfg = config.ooknet.tools.sourcegraph;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = [ pkgs.src-cli ]; home.packages = [pkgs.src-cli];
}; };
} }

13
home/modules/console/tools/ssh.nix
View file

@ -1,11 +1,12 @@
{ lib, config, osConfig, ... }: {
lib,
let config,
osConfig,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.tools.ssh; cfg = config.ooknet.tools.ssh;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.ssh = { programs.ssh = {
enable = true; enable = true;

13
home/modules/console/tools/starship.nix
View file

@ -1,11 +1,11 @@
{ config, lib, ... }: {
config,
let lib,
...
}: let
cfg = config.ooknet.tools.starship; cfg = config.ooknet.tools.starship;
inherit (lib) concatStrings mkIf; inherit (lib) concatStrings mkIf;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.starship = { programs.starship = {
enable = true; enable = true;
@ -73,4 +73,3 @@ in
}; };
}; };
} }

19
home/modules/console/tools/utils.nix
View file

@ -1,14 +1,15 @@
{ pkgs, lib, config, ... }:
let
cfg = config.ooknet.tools.utils;
in
{ {
pkgs,
lib,
config,
...
}: let
cfg = config.ooknet.tools.utils;
in {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
bc # Calculator bc # Calculator
# file utility # file utility
duf duf
du-dust du-dust
@ -19,7 +20,7 @@ in
zip zip
unzip unzip
unrar unrar
# file transfer # file transfer
wget wget
httpie # Better curl httpie # Better curl
@ -31,7 +32,7 @@ in
gum gum
# audio ctrl # audio ctrl
pamixer pamixer
diffsitter # Better diff diffsitter # Better diff
jq # JSON pretty printer and manipulator jq # JSON pretty printer and manipulator
tldr # Community maintained help pages tldr # Community maintained help pages

23
home/modules/desktop/browser/firefox/default.nix
View file

@ -1,6 +1,11 @@
{ pkgs, lib, inputs, config, osConfig, ... }: {
pkgs,
let lib,
inputs,
config,
osConfig,
...
}: let
inherit (lib) mkIf mkMerge; inherit (lib) mkIf mkMerge;
addons = inputs.firefox-addons.packages.${pkgs.system}; addons = inputs.firefox-addons.packages.${pkgs.system};
@ -22,16 +27,13 @@ let
"application/x-extension-xht" = ["firefox.desktop"]; "application/x-extension-xht" = ["firefox.desktop"];
"application/json" = ["firefox.desktop"]; "application/json" = ["firefox.desktop"];
}; };
in in {
imports = [./tridactyl.nix];
{ config = mkMerge [
imports = [ ./tridactyl.nix ];
config = mkMerge [
(mkIf (cfg.enable || browser == "firefox") { (mkIf (cfg.enable || browser == "firefox") {
programs.firefox = { programs.firefox = {
enable = true; enable = true;
nativeMessagingHosts = [ pkgs.tridactyl-native ]; nativeMessagingHosts = [pkgs.tridactyl-native];
profiles.${admin.name} = { profiles.${admin.name} = {
extensions = with addons; [ extensions = with addons; [
ublock-origin ublock-origin
@ -54,6 +56,5 @@ in
defaultApplications = firefoxMime; defaultApplications = firefoxMime;
}; };
}) })
]; ];
} }

1713
home/modules/desktop/browser/firefox/settings/narsilUserjs.nix
View file

File diff suppressed because it is too large Load diff

4
home/modules/desktop/browser/firefox/settings/ooksJs.nix
View file

@ -35,7 +35,7 @@
"toolkit.telemetry.updatePing.enabled" = false; "toolkit.telemetry.updatePing.enabled" = false;
"toolkit.telemetry.bhrPing.enabled" = false; "toolkit.telemetry.bhrPing.enabled" = false;
"toolkit.telemetry.firstShutdownPing.enabled" = false; "toolkit.telemetry.firstShutdownPing.enabled" = false;
"toolkit.telemetry.coverage.opt-out" = true; "toolkit.telemetry.coverage.opt-out" = true;
"toolkit.coverage.opt-out" = true; "toolkit.coverage.opt-out" = true;
"toolkit.coverage.endpoint.base" = ""; "toolkit.coverage.endpoint.base" = "";
"browser.ping-centre.telemetry" = false; "browser.ping-centre.telemetry" = false;
@ -64,5 +64,5 @@
"geo.provider.use_geoclue" = false; "geo.provider.use_geoclue" = false;
#Calculator #Calculator
"browser.urlbar.suggest.calculator" = true; "browser.urlbar.suggest.calculator" = true;
} }

5
home/modules/desktop/browser/firefox/theme/penguinFox.nix
View file

@ -1,4 +1,6 @@
/* css */ /*
css
*/
'' ''
/* config */ /* config */
@ -177,4 +179,3 @@
/* Removes the annoying rainbow thing from the hamburger */ /* Removes the annoying rainbow thing from the hamburger */
#appMenu-fxa-separator{border-image:none !important;} #appMenu-fxa-separator{border-image:none !important;}
'' ''

5
home/modules/desktop/browser/firefox/theme/penguinFoxContent.nix
View file

@ -1,4 +1,7 @@
/* css */ '' /*
css
*/
''
@-moz-document url-prefix(about:){ @-moz-document url-prefix(about:){
/* Removes the scrollbar on some places */ /* Removes the scrollbar on some places */

337
home/modules/desktop/browser/firefox/tridactyl.nix
View file

@ -1,16 +1,15 @@
{ lib, config, ... }: {
lib,
let config,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
inherit (config.colorscheme) palette; inherit (config.colorscheme) palette;
cfg = config.ooknet.browser.firefox; cfg = config.ooknet.browser.firefox;
browser = config.ooknet.desktop.browser; browser = config.ooknet.desktop.browser;
fonts = config.ooknet.fonts; fonts = config.ooknet.fonts;
in {
in
{
config = mkIf (browser == "firefox" || cfg.enable) { config = mkIf (browser == "firefox" || cfg.enable) {
xdg.configFile = { xdg.configFile = {
"tridactyl/tridactylrc".text = '' "tridactyl/tridactylrc".text = ''
@ -20,14 +19,14 @@ in
unbind --mode=normal t unbind --mode=normal t
unbind --mode=normal gt unbind --mode=normal gt
bind / fillcmdline find bind / fillcmdline find
bind n findnext 1 bind n findnext 1
bind N findnext -1 bind N findnext -1
bind gtr open http://192.168.1.210:9091/transmission/web/ bind gtr open http://192.168.1.210:9091/transmission/web/
bind ttr tabopen http://192.168.1.210:9091/transmission/web/ bind ttr tabopen http://192.168.1.210:9091/transmission/web/
bind gem open https://gmail.com bind gem open https://gmail.com
bind tem tabopen https://gmail.com bind tem tabopen https://gmail.com
@ -37,189 +36,193 @@ in
# based off base16 themes # based off base16 themes
# source: <https://github.com/bezmi/base16-tridactyl> # source: <https://github.com/bezmi/base16-tridactyl>
"tridactyl/themes/ooknet.css".text = /* css */ '' "tridactyl/themes/ooknet.css".text =
:root { /*
--font: ${fonts.monospace.family}; css
--bg: #${palette.base00}; */
--fg: #${palette.base05}; ''
--red: #${palette.base08}; :root {
--green: #${palette.base0B}; --font: ${fonts.monospace.family};
--blue: #${palette.base0D}; --bg: #${palette.base00};
--yellow: #${palette.base0A}; --fg: #${palette.base05};
--purple: #${palette.base0E}; --red: #${palette.base08};
--orange: #${palette.base09}; --green: #${palette.base0B};
--cyan: #${palette.base0C}; --blue: #${palette.base0D};
--comment: #${palette.base04}; --yellow: #${palette.base0A};
--selectedline: #${palette.base02}; --purple: #${palette.base0E};
--orange: #${palette.base09};
--cyan: #${palette.base0C};
--comment: #${palette.base04};
--selectedline: #${palette.base02};
--tridactyl-fg: var(--fg); --tridactyl-fg: var(--fg);
--tridactyl-bg: var(--bg); --tridactyl-bg: var(--bg);
--tridactyl-url-fg: var(--green); --tridactyl-url-fg: var(--green);
--tridactyl-url-bg: var(--bg); --tridactyl-url-bg: var(--bg);
--tridactyl-highlight-box-bg: var(--selectedline);
--tridactyl-highlight-box-fg: var(--fg);
--tridactyl-of-fg: var(--fg); --tridactyl-highlight-box-bg: var(--selectedline);
--tridactyl-of-bg: var(--selectedline); --tridactyl-highlight-box-fg: var(--fg);
--tridactyl-cmdl-fg: var(--bg); --tridactyl-of-fg: var(--fg);
--tridactyl-cmdl-font-family: var(--selectedline); --tridactyl-of-bg: var(--selectedline);
--tridactyl-cmplt-font-family: var(--font); --tridactyl-cmdl-fg: var(--bg);
--tridactyl-cmdl-font-family: var(--selectedline);
--tridactyl-hintspan-font-family: var(--font);
--tridactyl-hintspan-fg: var(--bg) !important;
--tridactyl-hintspan-bg: var(--orange) !important;
--tridactyl-hint-active-fg: none; --tridactyl-cmplt-font-family: var(--font);
--tridactyl-hint-active-bg: var(--tridactyl-bg);
--tridactyl-hint-active-outline: var(--green);
--tridactyl-hint-bg: none;
--tridactyl-hint-outline: none;
}
#tridactyl-colon::before { --tridactyl-hintspan-font-family: var(--font);
content: " "; --tridactyl-hintspan-fg: var(--bg) !important;
font-family: var(--font); --tridactyl-hintspan-bg: var(--orange) !important;
font-size: 1.5rem;
color: var(--green);
display: inline;
margin-left: 15px;
}
#command-line-holder { --tridactyl-hint-active-fg: none;
order: 1; --tridactyl-hint-active-bg: var(--tridactyl-bg);
display: flex; --tridactyl-hint-active-outline: var(--green);
justify-content: center; --tridactyl-hint-bg: none;
align-items: center; --tridactyl-hint-outline: none;
border: 2px solid var(--tridactyl-fg); }
background: var(--tridactyl-bg);
}
#tridactyl-input { #tridactyl-colon::before {
padding: 1rem; content: " ";
color: var(--tridactyl-fg); font-family: var(--font);
width: 90%; font-size: 1.5rem;
font-family: var(--font); color: var(--green);
font-size: 1.5rem; display: inline;
line-height: 1.5; margin-left: 15px;
background: var(--tridactyl-bg); }
padding-left: unset;
padding: 1rem; #command-line-holder {
} order: 1;
display: flex;
justify-content: center;
align-items: center;
border: 2px solid var(--tridactyl-fg);
background: var(--tridactyl-bg);
}
#tridactyl-input {
padding: 1rem;
color: var(--tridactyl-fg);
width: 90%;
font-family: var(--font);
font-size: 1.5rem;
line-height: 1.5;
background: var(--tridactyl-bg);
padding-left: unset;
padding: 1rem;
}
#completions table { #completions table {
font-size: 0.8rem; font-size: 0.8rem;
font-weight: 200; font-weight: 200;
border-spacing: 0; border-spacing: 0;
table-layout: fixed; table-layout: fixed;
padding: 1rem; padding: 1rem;
padding-top: 1rem; padding-top: 1rem;
padding-bottom: 1rem; padding-bottom: 1rem;
} }
#completions > div { #completions > div {
max-height: calc(20 * var(--option-height)); max-height: calc(20 * var(--option-height));
min-height: calc(10 * var(--option-height)); min-height: calc(10 * var(--option-height));
} }
#completions { #completions {
--option-height: 1.4em; --option-height: 1.4em;
color: var(--tridactyl-fg); color: var(--tridactyl-fg);
background: var(--tridactyl-bg); background: var(--tridactyl-bg);
display: inline-block; display: inline-block;
font-size: unset; font-size: unset;
font-weight: 200; font-weight: 200;
overflow: hidden; overflow: hidden;
width: 100%; width: 100%;
border-top: unset; border-top: unset;
order: 2; order: 2;
} }
#completions .HistoryCompletionSource { #completions .HistoryCompletionSource {
max-height: unset; max-height: unset;
min-height: unset; min-height: unset;
} }
#completions .HistoryCompletionSource table { #completions .HistoryCompletionSource table {
width: 100%; width: 100%;
font-size: 9pt; font-size: 9pt;
border-spacing: 0; border-spacing: 0;
table-layout: fixed; table-layout: fixed;
} }
#completions .BmarkCompletionSource { #completions .BmarkCompletionSource {
max-height: unset; max-height: unset;
min-height: unset; min-height: unset;
} }
#completions table tr td.prefix, #completions table tr td.prefix,
#completions table tr td.privatewindow, #completions table tr td.privatewindow,
#completions table tr td.container, #completions table tr td.container,
#completions table tr td.icon { #completions table tr td.icon {
display: none; display: none;
} }
#completions .BufferCompletionSource table { #completions .BufferCompletionSource table {
width: unset; width: unset;
font-size: unset; font-size: unset;
border-spacing: unset; border-spacing: unset;
table-layout: unset; table-layout: unset;
} }
#completions table tr .title { #completions table tr .title {
width: 50%; width: 50%;
} }
#completions table tr { #completions table tr {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
#completions .sectionHeader { #completions .sectionHeader {
background: unset; background: unset;
font-weight: bold; font-weight: bold;
border-bottom: unset; border-bottom: unset;
padding: 1rem !important; padding: 1rem !important;
padding-left: unset; padding-left: unset;
padding-bottom: 0.2rem; padding-bottom: 0.2rem;
} }
#cmdline_iframe { #cmdline_iframe {
position: fixed !important; position: fixed !important;
bottom: unset; bottom: unset;
top: 25% !important; top: 25% !important;
left: 10% !important; left: 10% !important;
z-index: 2147483647 !important; z-index: 2147483647 !important;
width: 80% !important; width: 80% !important;
box-shadow: rgba(0, 0, 0, 0.5) 0px 0px 20px !important; box-shadow: rgba(0, 0, 0, 0.5) 0px 0px 20px !important;
} }
.TridactylStatusIndicator { .TridactylStatusIndicator {
position: fixed !important; position: fixed !important;
bottom: 0 !important; bottom: 0 !important;
background: var(--tridactyl-bg) !important; background: var(--tridactyl-bg) !important;
border: unset !important; border: unset !important;
border: 1px var(--green) solid !important; border: 1px var(--green) solid !important;
font-size: 12pt !important; font-size: 12pt !important;
padding: 0.8ex !important; padding: 0.8ex !important;
} }
#completions .focused { #completions .focused {
background: var(--green); background: var(--green);
color: var(--bg); color: var(--bg);
} }
#completions .focused .url { #completions .focused .url {
background: var(--green); background: var(--green);
color: var(--bg); color: var(--bg);
} }
''; '';
}; };
}; };
} }

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

@ -1,6 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
let lib,
pkgs,
...
}: let
inherit (config.colorscheme) palette; inherit (config.colorscheme) palette;
inherit (lib) mkIf mkMerge; inherit (lib) mkIf mkMerge;
@ -10,157 +13,159 @@ let
vesktopMime = { vesktopMime = {
"x-scheme-handler/discord" = ["vesktop.desktop"]; "x-scheme-handler/discord" = ["vesktop.desktop"];
}; };
in in {
config = mkMerge [
{
config = mkMerge [
(mkIf (cfg.enable || discord == "vesktop") { (mkIf (cfg.enable || discord == "vesktop") {
# <https://github.com/AlephNought0/Faery/blob/main/Home/Programs/Vesktop/patchedvesktop.patch> # <https://github.com/AlephNought0/Faery/blob/main/Home/Programs/Vesktop/patchedvesktop.patch>
home.packages = [ home.packages = [
(pkgs.vesktop.overrideAttrs (old: { (pkgs.vesktop.overrideAttrs (old: {
patches = (old.patches or []) ++ [./vesktop-patch.patch]; patches = (old.patches or []) ++ [./vesktop-patch.patch];
})) }))
]; ];
xdg.configFile."vesktop/themes/nix.css".text = /* css */ '' xdg.configFile."vesktop/themes/nix.css".text =
/** /*
* @name nix-colors-minimal css
* @author aoku
* @description minimal theme designed with nix colors
*/ */
''
:root { /**
--nix-bg1: #${palette.base00}; * @name nix-colors-minimal
--nix-bg2: #${palette.base01}; * @author aoku
--nix-bg3: #${palette.base02}; * @description minimal theme designed with nix colors
*/
--nix-fg1: #${palette.base05};
--nix-fg2: #${palette.base07};
--nix-fg3: #${palette.base03};
--nix-link: #${palette.base0D};
--nix-accent: #${palette.base08}; :root {
--nix-hi: #${palette.base0B}; --nix-bg1: #${palette.base00};
--nix-bg2: #${palette.base01};
--nix-bg3: #${palette.base02};
--nix-fg1: #${palette.base05};
--nix-fg2: #${palette.base07};
--nix-fg3: #${palette.base03};
--nix-link: #${palette.base0D};
--nix-accent: #${palette.base08};
--nix-hi: #${palette.base0B};
--font-mono: ${fonts.monospace.family}, monospace;
--font-regular: ${fonts.regular.family}, sans serif;
/* server collapse */
--sb-collapsed-width: 12px;
--sb-transition-duration: 0s;
}
.theme-dark {
--background-primary: var(--nix-bg1);
--background-secondary: var(--nix-bg1);
--background-secondary-alt: var(--nix-bg1);
--background-accent: var(--nix-accent);
--background-tertiary: var(--nix-bg1);
--background-floating: var(--nix-bg1);
--background-mentioned: var(--nix-bg1);
--background-mentioned-hover: var(--nix-bg1);
--background-mobile: var(--nix-bg1);
--background-mobile-secondary: var(--nix-bg2);
--background-modifier-selected: var(--nix-bg1);
--channeltextarea-background:var(--nix-bg1);
--background-modifier-hover:var(--nix-bg1);
--activity-card-background: var(--nix-bg2);
--header-primary: var(--nix-fg2);
--header-secondary: var(--nix-fg1);
--text-normal: var(--nix-fg1);
--text-muted: var(--nix-fg1);
--text-link: var(--nix-link);
--text-warning: var(--nix-accent);
--font-primary: var(--font-mono);
--font-headline: var(--font-mono);
--font-display: var(--font-mono);
--interactive-normal: var(--nix-fg1); /*base05*/
--interactive-hover: var(--nix-hi); /*base0B*/
--interactive-active: var(--nix-fg2);
--interactive-muted: var(--nix-fg3); /*base03*/
--channels-default: var(--nix-fg1);
--scrollbar-thin-thumb: transparent;
--scrollbar-thin-track: transparent;
--scrollbar-auto-thumb: var(--nix-fg1);
--scrollbar-auto-track:var(--nix-bg1);
--scrollbar-auto-scrollbar-color-thumb: var(--nix-accent);
}
.messagesWrapper_ea2b0b {
font-family: var(--font-regular);
}
.titleWrapper__482dc {
font-family: var(--font-mono);
}
.link__95dc0 /* text channel*/{
border-radius: 0px;
margin-left: -10px;
font-family: var(--font-mono);
}
.container_ca50b9 .avatar_f8541f { /*avatar*/
display: none;
}
.form__13a2c /* text input box resize */ {
height: 50px;
font-family: var(--font-regular);
}
.containerDefault__3187b .wrapper__7bcde:before /* text channel */{
content: "";
display:inline-block;
background: var(--nix-hi);
height: 100%;
position: absolute;
left: 0;
}
--font-mono: ${fonts.monospace.family}, monospace;
--font-regular: ${fonts.regular.family}, sans serif;
/* server collapse */ /* server collapse */
--sb-collapsed-width: 12px; .guilds__2b93a /* servers */{
--sb-transition-duration: 0s; overflow: hidden !important;
} width: var(--sb-collapsed-width, 75px);
transition: width var(--sb-transition-duration);
}
.guilds__2b93a:hover /* expand server bar on hover */{
width: 70px;
overflow: visible !important;
animation: server-bar-overflow 0s linear 0ms forwards
}
.guilds__2b93a ~ .base__3e6af /* friends list, chat */{
position: absolute;
left: var(--sb-collapsed-left, var(--sb-collapsed-width));
top: var(--sb-collapsed-top, 0px);
bottom: var(--sb-collapsed-bottom, 0px);
right: var(--sb-collapsed-right, 0px);
transition-property: var(--sb-transition-property, left);
transition-duration: var(--sb-transition-duration);
}
.guilds__2b93a:hover ~ .base__3e6af /* friends list, chat */{
position: absolute;
left: var(--sb-left, 70px);
top: var(--sb-top, 0px);
bottom: var(--sb-bottom, 0px);
right: var(--sb-right, 0px);
}
@keyframes server-bar-overflow{
from{
overflow: hidden;
}
to{
overflow: visible;
}
}
'';
})
.theme-dark {
--background-primary: var(--nix-bg1);
--background-secondary: var(--nix-bg1);
--background-secondary-alt: var(--nix-bg1);
--background-accent: var(--nix-accent);
--background-tertiary: var(--nix-bg1);
--background-floating: var(--nix-bg1);
--background-mentioned: var(--nix-bg1);
--background-mentioned-hover: var(--nix-bg1);
--background-mobile: var(--nix-bg1);
--background-mobile-secondary: var(--nix-bg2);
--background-modifier-selected: var(--nix-bg1);
--channeltextarea-background:var(--nix-bg1);
--background-modifier-hover:var(--nix-bg1);
--activity-card-background: var(--nix-bg2);
--header-primary: var(--nix-fg2);
--header-secondary: var(--nix-fg1);
--text-normal: var(--nix-fg1);
--text-muted: var(--nix-fg1);
--text-link: var(--nix-link);
--text-warning: var(--nix-accent);
--font-primary: var(--font-mono);
--font-headline: var(--font-mono);
--font-display: var(--font-mono);
--interactive-normal: var(--nix-fg1); /*base05*/
--interactive-hover: var(--nix-hi); /*base0B*/
--interactive-active: var(--nix-fg2);
--interactive-muted: var(--nix-fg3); /*base03*/
--channels-default: var(--nix-fg1);
--scrollbar-thin-thumb: transparent;
--scrollbar-thin-track: transparent;
--scrollbar-auto-thumb: var(--nix-fg1);
--scrollbar-auto-track:var(--nix-bg1);
--scrollbar-auto-scrollbar-color-thumb: var(--nix-accent);
}
.messagesWrapper_ea2b0b {
font-family: var(--font-regular);
}
.titleWrapper__482dc {
font-family: var(--font-mono);
}
.link__95dc0 /* text channel*/{
border-radius: 0px;
margin-left: -10px;
font-family: var(--font-mono);
}
.container_ca50b9 .avatar_f8541f { /*avatar*/
display: none;
}
.form__13a2c /* text input box resize */ {
height: 50px;
font-family: var(--font-regular);
}
.containerDefault__3187b .wrapper__7bcde:before /* text channel */{
content: "";
display:inline-block;
background: var(--nix-hi);
height: 100%;
position: absolute;
left: 0;
}
/* server collapse */
.guilds__2b93a /* servers */{
overflow: hidden !important;
width: var(--sb-collapsed-width, 75px);
transition: width var(--sb-transition-duration);
}
.guilds__2b93a:hover /* expand server bar on hover */{
width: 70px;
overflow: visible !important;
animation: server-bar-overflow 0s linear 0ms forwards
}
.guilds__2b93a ~ .base__3e6af /* friends list, chat */{
position: absolute;
left: var(--sb-collapsed-left, var(--sb-collapsed-width));
top: var(--sb-collapsed-top, 0px);
bottom: var(--sb-collapsed-bottom, 0px);
right: var(--sb-collapsed-right, 0px);
transition-property: var(--sb-transition-property, left);
transition-duration: var(--sb-transition-duration);
}
.guilds__2b93a:hover ~ .base__3e6af /* friends list, chat */{
position: absolute;
left: var(--sb-left, 70px);
top: var(--sb-top, 0px);
bottom: var(--sb-bottom, 0px);
right: var(--sb-right, 0px);
}
@keyframes server-bar-overflow{
from{
overflow: hidden;
}
to{
overflow: visible;
}
}
'';
})
(mkIf (discord == "vesktop") { (mkIf (discord == "vesktop") {
ooknet.binds.discord = "vesktop"; ooknet.binds.discord = "vesktop";
xdg.mimeApps = { xdg.mimeApps = {

15
home/modules/desktop/creative/audacity.nix
View file

@ -1,12 +1,13 @@
{ lib, config, pkgs, ... }: {
lib,
let config,
pkgs,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.creative.audacity; cfg = config.ooknet.creative.audacity;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = [ pkgs.audacity ]; home.packages = [pkgs.audacity];
}; };
} }

16
home/modules/desktop/creative/inkscape.nix
View file

@ -1,13 +1,13 @@
{ lib, config, pkgs, ... }: {
lib,
let config,
pkgs,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.creative.inkscape; cfg = config.ooknet.creative.inkscape;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = [ pkgs.inkscape-with-extensions ]; home.packages = [pkgs.inkscape-with-extensions];
}; };
} }

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

@ -7,7 +7,7 @@
./terminal ./terminal
./wayland ./wayland
./productivity ./productivity
./gaming ./gaming
./security ./security
./tools ./tools
./file-manager ./file-manager

19
home/modules/desktop/file-manager/nemo.nix
View file

@ -1,25 +1,26 @@
{ lib, config, pkgs, ... }: {
lib,
let config,
pkgs,
...
}: let
inherit (lib) mkIf mkMerge; inherit (lib) mkIf mkMerge;
cfg = config.ooknet.fileManager.nemo; cfg = config.ooknet.fileManager.nemo;
fileManager = config.ooknet.desktop.fileManager; fileManager = config.ooknet.desktop.fileManager;
nemoMime = { nemoMime = {
"inode/directory" = ["nemo.desktop"]; "inode/directory" = ["nemo.desktop"];
}; };
in in {
{
config = mkMerge [ config = mkMerge [
(mkIf (cfg.enable || fileManager == "nemo") { (mkIf (cfg.enable || fileManager == "nemo") {
home.packages = [ pkgs.cinnamon.nemo-with-extensions ]; home.packages = [pkgs.cinnamon.nemo-with-extensions];
}) })
(mkIf (fileManager == "nemo") { (mkIf (fileManager == "nemo") {
ooknet.binds.fileManager = "nemo"; ooknet.binds.fileManager = "nemo";
xdg.mimeApps = { xdg.mimeApps = {
associations.added = nemoMime; associations.added = nemoMime;
defaultApplications = nemoMime; defaultApplications = nemoMime;
}; };
}) })
]; ];

14
home/modules/desktop/gaming/bottles.nix
View file

@ -1,15 +1,15 @@
{ lib, config, pkgs, ... }: {
lib,
let config,
pkgs,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.gaming.bottles; cfg = config.ooknet.gaming.bottles;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
bottles bottles
]; ];
}; };
} }

15
home/modules/desktop/gaming/factorio.nix
View file

@ -1,11 +1,12 @@
{ lib, config, pkgs, ... }:
let
cfg = config.ooknet.gaming.factorio;
in
{ {
lib,
config,
pkgs,
...
}: let
cfg = config.ooknet.gaming.factorio;
in {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
home.packages = with pkgs; [ factorio ]; home.packages = with pkgs; [factorio];
}; };
} }

13
home/modules/desktop/gaming/lutris.nix
View file

@ -1,11 +1,12 @@
{ lib, config, pkgs, ... }: {
lib,
let config,
pkgs,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.gaming.lutris; cfg = config.ooknet.gaming.lutris;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
(lutris.override { (lutris.override {

13
home/modules/desktop/gaming/wine.nix
View file

@ -1,11 +1,12 @@
{ lib, config, pkgs, ... }: {
lib,
let config,
pkgs,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.gaming.wine; cfg = config.ooknet.gaming.wine;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
winetricks winetricks

12
home/modules/desktop/media/image/imv.nix
View file

@ -1,14 +1,14 @@
{ lib, config, ... }: {
lib,
let config,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.media.image.imv; cfg = config.ooknet.media.image.imv;
imvMime = { imvMime = {
"image/*" = ["imv.desktop"]; "image/*" = ["imv.desktop"];
}; };
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs = { programs = {
imv = { imv = {

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

@ -1,17 +1,18 @@
{ osConfig, pkgs, config, lib, ... }: {
osConfig,
let pkgs,
config,
lib,
...
}: let
inherit (config.colorscheme) palette; inherit (config.colorscheme) palette;
inherit (lib) mkIf getExe; inherit (lib) mkIf getExe;
cfg = config.ooknet.media.music.tui; cfg = config.ooknet.media.music.tui;
zellij = config.ooknet.multiplexer.zellij; zellij = config.ooknet.multiplexer.zellij;
multiplexer= config.ooknet.console.multiplexer; multiplexer = config.ooknet.console.multiplexer;
hostName = osConfig.networking.hostName; hostName = osConfig.networking.hostName;
in {
in
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
termusic termusic
@ -43,89 +44,97 @@ in
}; };
}; };
xdg.configFile."spotify-player/app.toml".text = /* toml */ '' xdg.configFile."spotify-player/app.toml".text =
theme = "default" /*
client_id = "fc4c3656d7cc4a7ea70c6080965f8b1a" toml
client_port = 8080 */
tracks_playback_limit = 50 ''
playback_format = "{track} • {artists}\n{album}\n{metadata}" theme = "default"
notify_format = { summary = "{track} • {artists}", body = "{album}" } client_id = "fc4c3656d7cc4a7ea70c6080965f8b1a"
app_refresh_duration_in_ms = 32 client_port = 8080
playback_refresh_duration_in_ms = 0 tracks_playback_limit = 50
page_size_in_rows = 20 playback_format = "{track} • {artists}\n{album}\n{metadata}"
enable_media_control = false notify_format = { summary = "{track} • {artists}", body = "{album}" }
enable_streaming = "Always" app_refresh_duration_in_ms = 32
enable_notify = true playback_refresh_duration_in_ms = 0
enable_cover_image_cache = false page_size_in_rows = 20
notify_streaming_only = false enable_media_control = false
default_device = "${hostName}" enable_streaming = "Always"
play_icon = "▶" enable_notify = true
pause_icon = "▌▌" enable_cover_image_cache = false
liked_icon = "♥" notify_streaming_only = false
playback_window_position = "Top" default_device = "${hostName}"
cover_img_length = 9 play_icon = "▶"
cover_img_width = 5 pause_icon = "▌▌"
playback_window_width = 6 liked_icon = "♥"
playback_window_position = "Top"
cover_img_length = 9
cover_img_width = 5
playback_window_width = 6
[device] [device]
name = "${hostName}" name = "${hostName}"
device_type = "speaker" device_type = "speaker"
volume = 100 volume = 100
bitrate = 320 bitrate = 320
audio_cache = false audio_cache = false
normalization = false normalization = false
''; '';
xdg.configFile."zellij/layouts/music.kdl".text = mkIf (zellij.enable || multiplexer == "zellij") /* kdl */ ''
layout {
default_tab_template {
pane size=2 borderless=true {
plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" {
format_left "{mode}"
format_right "{session} {datetime}"
format_center "#[fg=#89B4FA,bold] {tabs}"
format_space ""
border_enabled "true" xdg.configFile."zellij/layouts/music.kdl".text =
border_char "─" mkIf (zellij.enable || multiplexer == "zellij")
border_format "#[fg=#${palette.base0D}]{char}" /*
border_position "bottom" kdl
*/
''
layout {
default_tab_template {
pane size=2 borderless=true {
plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" {
format_left "{mode}"
format_right "{session} {datetime}"
format_center "#[fg=#89B4FA,bold] {tabs}"
format_space ""
hide_frame_for_single_pane "true" border_enabled "true"
border_char "─"
border_format "#[fg=#${palette.base0D}]{char}"
border_position "bottom"
mode_normal "#[fg=${palette.base0D}]󰝚" hide_frame_for_single_pane "true"
tab_normal "#[bg=#${palette.base01}] {name} "
tab_active "#[bg=#${palette.base02}] {name} "
tab_separator " "
datetime "#[fg=#${palette.base05},bold] {format} " mode_normal "#[fg=${palette.base0D}]󰝚"
datetime_format "%I:%M %p"
datetime_timezone "${config.home.sessionVariables.TZ}"
}
}
children
}
tab name="spotify" focus=true { tab_normal "#[bg=#${palette.base01}] {name} "
pane name="spotify" { tab_active "#[bg=#${palette.base02}] {name} "
borderless true tab_separator " "
command "${getExe pkgs.spotify-player}"
focus true datetime "#[fg=#${palette.base05},bold] {format} "
} datetime_format "%I:%M %p"
pane name="Visualizer" { datetime_timezone "${config.home.sessionVariables.TZ}"
borderless false }
split_direction "horizontal" }
size "20%" children
command "${getExe pkgs.cava}" }
}
} tab name="spotify" focus=true {
} pane name="spotify" {
''; borderless true
command "${getExe pkgs.spotify-player}"
focus true
}
pane name="Visualizer" {
borderless false
split_direction "horizontal"
size "20%"
command "${getExe pkgs.cava}"
}
}
}
'';
home.shellAliases = mkIf (zellij.enable || multiplexer == "zellij") { home.shellAliases = mkIf (zellij.enable || multiplexer == "zellij") {
zjm = "zellij --layout music"; zjm = "zellij --layout music";
}; };
}; };
} }

15
home/modules/desktop/media/video/jellyfin-player.nix
View file

@ -1,12 +1,13 @@
{ pkgs, lib, config, ... }: {
pkgs,
let lib,
config,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.media.video.jellyfinPlayer; cfg = config.ooknet.media.video.jellyfinPlayer;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = [ pkgs.jellyfin-media-player ]; home.packages = [pkgs.jellyfin-media-player];
}; };
} }

14
home/modules/desktop/media/video/mpv.nix
View file

@ -1,22 +1,22 @@
{ lib, config, ... }: {
lib,
let config,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.media.video.mpv; cfg = config.ooknet.media.video.mpv;
mpvMime = { mpvMime = {
"audio/*" = ["mpv.desktop"]; "audio/*" = ["mpv.desktop"];
"video/*" = ["mpv.desktop"]; "video/*" = ["mpv.desktop"];
}; };
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.mpv = { programs.mpv = {
enable = true; enable = true;
}; };
xdg.mimeApps = { xdg.mimeApps = {
associations.added = mpvMime; associations.added = mpvMime;
defaultApplications = mpvMime; defaultApplications = mpvMime;
}; };
}; };
} }

15
home/modules/desktop/media/video/youtube.nix
View file

@ -1,13 +1,14 @@
{ lib, config, pkgs, ...}: {
lib,
let config,
pkgs,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.media.video.youtube; cfg = config.ooknet.media.video.youtube;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = [ pkgs.youtube-tui ]; home.packages = [pkgs.youtube-tui];
programs.yt-dlp = { programs.yt-dlp = {
enable = true; enable = true;
}; };

4
home/modules/desktop/productivity/default.nix
View file

@ -1,6 +1,4 @@
{ ... }: {...}: {
{
imports = [ imports = [
./office ./office
./notes ./notes

32
home/modules/desktop/productivity/notes/obsidian.nix
View file

@ -1,6 +1,9 @@
{ lib, config, pkgs, ... }: {
lib,
let config,
pkgs,
...
}: let
inherit (lib) mkIf mkMerge hm; inherit (lib) mkIf mkMerge hm;
cfg = config.ooknet.productivity.notes.obsidian; cfg = config.ooknet.productivity.notes.obsidian;
notes = config.ooknet.desktop.notes; notes = config.ooknet.desktop.notes;
@ -8,17 +11,20 @@ let
# TODO: use admin.githubUsername # TODO: use admin.githubUsername
notesRepo = "git@github.com:ooks-io/notes.git"; notesRepo = "git@github.com:ooks-io/notes.git";
notesPath = "${config.xdg.userDirs.documents}/notes"; notesPath = "${config.xdg.userDirs.documents}/notes";
in in {
config = mkMerge [
{
config = mkMerge [
(mkIf (cfg.enable || notes == "obsidian") { (mkIf (cfg.enable || notes == "obsidian") {
home.packages = [ pkgs.obsidian ]; home.packages = [pkgs.obsidian];
home.activation.cloneObsidianVault = hm.dag.entryAfter ["installPackages"] /* shell */ '' home.activation.cloneObsidianVault =
if ! [ -d "${notesPath}" ]; then hm.dag.entryAfter ["installPackages"]
$DRY_RUN_CMD git clone ${notesRepo} ${notesPath} /*
fi shell
''; */
''
if ! [ -d "${notesPath}" ]; then
$DRY_RUN_CMD git clone ${notesRepo} ${notesPath}
fi
'';
}) })
(mkIf (notes == "obsidian") { (mkIf (notes == "obsidian") {

15
home/modules/desktop/productivity/office/libreoffice.nix
View file

@ -1,13 +1,14 @@
{ lib, config, pkgs, ... }: {
lib,
let config,
pkgs,
...
}: let
inherit (lib) mkIf mkEnableOption; inherit (lib) mkIf mkEnableOption;
cfg = config.ooknet.desktop.productivity.office; cfg = config.ooknet.desktop.productivity.office;
in in {
{
options.ooknet.desktop.productivity.office.enable = mkEnableOption "enable office home module"; options.ooknet.desktop.productivity.office.enable = mkEnableOption "enable office home module";
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = [ pkgs.libreoffice ]; home.packages = [pkgs.libreoffice];
}; };
} }

16
home/modules/desktop/productivity/pdf/zathura.nix
View file

@ -1,16 +1,16 @@
{ lib, config, ... }: {
lib,
let config,
...
}: let
inherit (config.colorscheme) palette; inherit (config.colorscheme) palette;
inherit (lib) mkIf; inherit (lib) mkIf;
zathura = { "application/pdf" = ["org.pwmt.zathura.desktop"]; }; zathura = {"application/pdf" = ["org.pwmt.zathura.desktop"];};
cfg = config.ooknet.productivity.pdf.zathura; cfg = config.ooknet.productivity.pdf.zathura;
pdf = config.ooknet.desktop.pdf; pdf = config.ooknet.desktop.pdf;
fonts = config.ooknet.fonts; fonts = config.ooknet.fonts;
in in {
{
config = mkIf (cfg.enable || pdf == "zathura") { config = mkIf (cfg.enable || pdf == "zathura") {
programs.zathura = { programs.zathura = {
enable = true; enable = true;

27
home/modules/desktop/security/polkit.nix
View file

@ -1,20 +1,21 @@
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf;
polkit = config.ooknet.security.polkit;
in
{ {
lib,
config,
pkgs,
...
}: let
inherit (lib) mkIf;
polkit = config.ooknet.security.polkit;
in {
config = { config = {
systemd.user.services = { systemd.user.services = {
polkit-pantheon-authentication-agent-1 = mkIf (polkit == "pantheon") { polkit-pantheon-authentication-agent-1 = mkIf (polkit == "pantheon") {
Unit.Description = "polkit-pantheon-authentication-agent-1"; Unit.Description = "polkit-pantheon-authentication-agent-1";
Install = { Install = {
WantedBy = [ "graphical-session.target" ]; WantedBy = ["graphical-session.target"];
Wants = [ "graphical-session.target" ]; Wants = ["graphical-session.target"];
After = [ "graphical-session.target" ]; After = ["graphical-session.target"];
}; };
Service = { Service = {
@ -29,9 +30,9 @@ in
polkit-gnome-authentication-agent-1 = mkIf (polkit == "gnome") { polkit-gnome-authentication-agent-1 = mkIf (polkit == "gnome") {
Unit.Description = "polkit-pantheon-authentication-agent-1"; Unit.Description = "polkit-pantheon-authentication-agent-1";
Install = { Install = {
WantedBy = [ "graphical-session.target" ]; WantedBy = ["graphical-session.target"];
Wants = [ "graphical-session.target" ]; Wants = ["graphical-session.target"];
After = [ "graphical-session.target" ]; After = ["graphical-session.target"];
}; };
Service = { Service = {

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

@ -1,82 +1,82 @@
{ config, lib, ... }: {
config,
let lib,
...
}: let
inherit (config.colorscheme) palette; inherit (config.colorscheme) palette;
inherit (lib) mkMerge mkIf; inherit (lib) mkMerge mkIf;
fonts = config.ooknet.fonts; fonts = config.ooknet.fonts;
cfg = config.ooknet.terminal.foot; cfg = config.ooknet.terminal.foot;
desktop = config.ooknet.desktop; desktop = config.ooknet.desktop;
in in {
config = mkMerge [
(mkIf (cfg.enable || desktop.terminal == "foot") {
programs.foot = {
enable = true;
server.enable = true;
settings = {
main = {
term = "xterm-256color";
font = "${fonts.monospace.family}:pixelsize=18:antialias=true";
font-bold = "${fonts.monospace.family}:style=Bold:pixelsize=18:antialias=true";
font-italic = "${fonts.monospace.family}:style=Italic:pixelsize=18:antialias=true";
font-bold-italic = "${fonts.monospace.family}:style=Bold Italic:pixelsize=18:antialias=true";
dpi-aware = "yes";
letter-spacing = "-1px";
bold-text-in-bright = "palette-based";
resize-delay-ms = "80";
pad = "9x9 center";
selection-target = "clipboard";
};
{ tweak = {
config = mkMerge [ sixel = "yes";
(mkIf (cfg.enable || desktop.terminal == "foot") { font-monospace-warn = "no";
programs.foot = { };
enable = true;
server.enable = true;
settings = {
main = {
term = "xterm-256color";
font = "${fonts.monospace.family}:pixelsize=18:antialias=true";
font-bold = "${fonts.monospace.family}:style=Bold:pixelsize=18:antialias=true";
font-italic = "${fonts.monospace.family}:style=Italic:pixelsize=18:antialias=true";
font-bold-italic = "${fonts.monospace.family}:style=Bold Italic:pixelsize=18:antialias=true";
dpi-aware = "yes";
letter-spacing = "-1px";
bold-text-in-bright = "palette-based";
resize-delay-ms = "80";
pad = "9x9 center";
selection-target = "clipboard";
};
tweak = { cursor = {
sixel = "yes"; style = "beam";
font-monospace-warn = "no"; blink = "yes";
}; };
cursor = {
style = "beam";
blink = "yes";
};
colors = { colors = {
alpha = 1.0; alpha = 1.0;
foreground = "${palette.base05}"; foreground = "${palette.base05}";
background = "${palette.base00}"; background = "${palette.base00}";
regular0 = "${palette.base00}"; # black regular0 = "${palette.base00}"; # black
regular1 = "${palette.base08}"; # red regular1 = "${palette.base08}"; # red
regular2 = "${palette.base0B}"; # green regular2 = "${palette.base0B}"; # green
regular3 = "${palette.base0A}"; # yellow regular3 = "${palette.base0A}"; # yellow
regular4 = "${palette.base0D}"; # blue regular4 = "${palette.base0D}"; # blue
regular5 = "${palette.base0E}"; # magenta regular5 = "${palette.base0E}"; # magenta
regular6 = "${palette.base0C}"; # cyan regular6 = "${palette.base0C}"; # cyan
regular7 = "${palette.base05}"; # white regular7 = "${palette.base05}"; # white
bright0 = "${palette.base03}"; # bright black bright0 = "${palette.base03}"; # bright black
bright1 = "${palette.base08}"; # bright red bright1 = "${palette.base08}"; # bright red
bright2 = "${palette.base0B}"; # bright green bright2 = "${palette.base0B}"; # bright green
bright3 = "${palette.base0A}"; # bright yellow bright3 = "${palette.base0A}"; # bright yellow
bright4 = "${palette.base0D}"; # bright blue bright4 = "${palette.base0D}"; # bright blue
bright5 = "${palette.base0E}"; # bright magenta bright5 = "${palette.base0E}"; # bright magenta
bright6 = "${palette.base0C}"; # bright cyan bright6 = "${palette.base0C}"; # bright cyan
bright7 = "${palette.base07}"; # bright white bright7 = "${palette.base07}"; # bright white
"16" = "${palette.base09}"; "16" = "${palette.base09}";
"17" = "${palette.base0F}"; "17" = "${palette.base0F}";
"18" = "${palette.base01}"; "18" = "${palette.base01}";
"19" = "${palette.base02}"; "19" = "${palette.base02}";
"20" = "${palette.base04}"; "20" = "${palette.base04}";
"21" = "${palette.base06}"; "21" = "${palette.base06}";
};
}; };
}; };
}; })
})
(mkIf (desktop.terminal == "foot") { (mkIf (desktop.terminal == "foot") {
home.sessionVariables = { home.sessionVariables = {
TERMINAL = "foot"; TERMINAL = "foot";
TERM = "foot"; TERM = "foot";
}; };
ooknet.binds.terminal = "foot"; ooknet.binds.terminal = "foot";
ooknet.binds.terminalLaunch = "foot"; ooknet.binds.terminalLaunch = "foot";
}) })
]; ];
} }

14
home/modules/desktop/terminal/kitty.nix
View file

@ -1,17 +1,17 @@
{ config, lib, osConfig, ... }: {
config,
let lib,
osConfig,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
inherit (config.colorscheme) palette; inherit (config.colorscheme) palette;
fonts = config.ooknet.fonts; fonts = config.ooknet.fonts;
cfg = config.ooknet.terminal.kitty; cfg = config.ooknet.terminal.kitty;
terminal = config.ooknet.desktop.terminal; terminal = config.ooknet.desktop.terminal;
shell = osConfig.ooknet.host.admin.shell; shell = osConfig.ooknet.host.admin.shell;
in in {
{
config = mkIf (cfg.enable || terminal == "kitty") { config = mkIf (cfg.enable || terminal == "kitty") {
home.sessionVariables = mkIf (terminal == "kitty") { home.sessionVariables = mkIf (terminal == "kitty") {
TERMINAL = "kitty -1"; TERMINAL = "kitty -1";
TERM = "kitty -1"; TERM = "kitty -1";

12
home/modules/desktop/tools/1password.nix
View file

@ -1,11 +1,11 @@
{ osConfig, lib, ... }: {
osConfig,
let lib,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = osConfig.ooknet.programs._1password; cfg = osConfig.ooknet.programs._1password;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
ooknet.binds.password = "1password"; ooknet.binds.password = "1password";
}; };

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

@ -1,11 +1,11 @@
{ lib, osConfig, ... }: {
lib,
let osConfig,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = osConfig.ooknet.programs.kdeconnect; cfg = osConfig.ooknet.programs.kdeconnect;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.kdeconnect = { services.kdeconnect = {
enable = true; enable = true;

67
home/modules/desktop/tools/ookbrightness.nix
View file

@ -1,42 +1,47 @@
{ lib, osConfig, pkgs, ... }: {
lib,
let osConfig,
pkgs,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
inherit (builtins) elem; inherit (builtins) elem;
features = osConfig.ooknet.host.hardware.features; features = osConfig.ooknet.host.hardware.features;
ookbrightness = pkgs.writeShellApplication { ookbrightness = pkgs.writeShellApplication {
name = "ookbrightness"; name = "ookbrightness";
runtimeInputs = with pkgs; [brillo libnotify]; runtimeInputs = with pkgs; [brillo libnotify];
text = /* bash */ '' text =
BRIGHTNESS=$(brillo -G | awk -F'.' '{print$1}') /*
notify() { bash
notify-send --app-name="system-notify" -h string:x-canonical-private-synchronous:sys-notify "󰃠 $BRIGHTNESS%" */
} ''
option() { BRIGHTNESS=$(brillo -G | awk -F'.' '{print$1}')
case "$1" in notify() {
up) notify-send --app-name="system-notify" -h string:x-canonical-private-synchronous:sys-notify "󰃠 $BRIGHTNESS%"
brillo -q -u 30000 -A 5 }
;; option() {
down) case "$1" in
brillo -q -u 30000 -U 5 up)
;; brillo -q -u 30000 -A 5
*) ;;
echo "Invalid argument" down)
;; brillo -q -u 30000 -U 5
esac ;;
} *)
main() { echo "Invalid argument"
option "$@" ;;
notify esac
} }
main "$@" main() {
''; option "$@"
notify
}
main "$@"
'';
}; };
in in {
{
config = mkIf (elem "backlight" features) { config = mkIf (elem "backlight" features) {
home.packages = [ ookbrightness ]; home.packages = [ookbrightness];
ooknet.binds.brightness = { ooknet.binds.brightness = {
up = "ookbrightness up"; up = "ookbrightness up";
down = "ookbrightness down"; down = "ookbrightness down";

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

@ -1,14 +1,15 @@
{ lib, config, inputs, pkgs, ... }: {
lib,
let config,
inputs,
pkgs,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
launcher = config.ooknet.wayland.launcher; launcher = config.ooknet.wayland.launcher;
in in {
{
config = mkIf (launcher == "rofi") { config = mkIf (launcher == "rofi") {
home.packages = [ inputs.ooks-scripts.packages.${pkgs.system}.powermenu ]; home.packages = [inputs.ooks-scripts.packages.${pkgs.system}.powermenu];
ooknet.binds.powerMenu = "powermenu -c dmenu"; ooknet.binds.powerMenu = "powermenu -c dmenu";
}; };
} }

15
home/modules/desktop/tools/ookvolume.nix
View file

@ -1,6 +1,9 @@
{ lib, pkgs, osConfig, ... }: {
lib,
let pkgs,
osConfig,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
inherit (builtins) elem; inherit (builtins) elem;
features = osConfig.ooknet.host.hardware.features; features = osConfig.ooknet.host.hardware.features;
@ -33,11 +36,9 @@ let
main "$@" main "$@"
''; '';
}; };
in in {
{
config = mkIf (elem "audio" features) { config = mkIf (elem "audio" features) {
home.packages = [ ookvolume ]; home.packages = [ookvolume];
ooknet.binds.volume = { ooknet.binds.volume = {
up = "ookvolume up"; up = "ookvolume up";
down = "ookvolume down"; down = "ookvolume down";

401
home/modules/desktop/tools/zellijMenu.nix
View file

@ -1,234 +1,239 @@
{ lib, config, pkgs, ... }: {
lib,
let config,
pkgs,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
multiplexer = config.ooknet.console.multiplexer; multiplexer = config.ooknet.console.multiplexer;
launcher = config.ooknet.wayland.launcher; launcher = config.ooknet.wayland.launcher;
binds = config.ooknet.binds; binds = config.ooknet.binds;
zellijmenu = pkgs.writeShellApplication { zellijmenu = pkgs.writeShellApplication {
name = "zellijmenu"; name = "zellijmenu";
runtimeInputs = with pkgs; [ coreutils rofi-wayland ]; runtimeInputs = with pkgs; [coreutils rofi-wayland];
text = /* bash */ '' text =
set -e /*
bash
*/
''
set -e
type="" type=""
type_dir="" type_dir=""
project_name="" project_name=""
project_dir="" project_dir=""
session_name="" session_name=""
layout="" layout=""
spawn_terminal=0 spawn_terminal=0
while [[ "$#" -gt 0 ]]; do while [[ "$#" -gt 0 ]]; do
case $1 in case $1 in
-n) spawn_terminal=1 ;; -n) spawn_terminal=1 ;;
*) *)
echo "Unknown parameter: $1" >&2 echo "Unknown parameter: $1" >&2
exit 1 exit 1
;;
esac
shift
done
rofi_cmd() {
MSG=$1
rofi -dmenu -i -mesg "$MSG"
}
zellij_cmd() {
if [[ "$spawn_terminal" -eq 1 ]]; then
${binds.terminalLaunch} zellij "$@"
else
zellij "$@"
fi
}
session_manager() {
session_list() {
zellij ls -s | tr ' ' '\n'
}
layout_menu() {
layout_list=$(find ~/.config/zellij/layouts -name "*.kdl" | sed 's|.*/||; s/\.kdl$//' | tr ' ' '\n')
echo -e "$layout_list" | rofi_cmd "Select layout for $session_name:"
}
session_menu() {
echo -e "$(session_list)" | rofi_cmd "Session:"
}
session_select() {
session_name=$(session_menu)
if [[ -z "$session_name" ]]; then
echo "Nothing selected."
exit 0
fi
if session_list | grep -qx "$session_name"; then
session_action="select"
else
session_action="create"
fi
}
selection_menu() {
echo -e "Attach\nDelete\nBack" | rofi_cmd "$session_name action:"
}
while true; do
session_select
case $session_action in
"create")
layout="$(layout_menu)"
if [ -z "$layout" ]; then
echo "No layout given"
continue
fi
zellij_cmd -s "$session_name" --layout "$layout"
break
;; ;;
"select") esac
selection=$(selection_menu) shift
case $selection in done
"Attach")
zellij_cmd attach "$session_name" rofi_cmd() {
MSG=$1
rofi -dmenu -i -mesg "$MSG"
}
zellij_cmd() {
if [[ "$spawn_terminal" -eq 1 ]]; then
${binds.terminalLaunch} zellij "$@"
else
zellij "$@"
fi
}
session_manager() {
session_list() {
zellij ls -s | tr ' ' '\n'
}
layout_menu() {
layout_list=$(find ~/.config/zellij/layouts -name "*.kdl" | sed 's|.*/||; s/\.kdl$//' | tr ' ' '\n')
echo -e "$layout_list" | rofi_cmd "Select layout for $session_name:"
}
session_menu() {
echo -e "$(session_list)" | rofi_cmd "Session:"
}
session_select() {
session_name=$(session_menu)
if [[ -z "$session_name" ]]; then
echo "Nothing selected."
exit 0
fi
if session_list | grep -qx "$session_name"; then
session_action="select"
else
session_action="create"
fi
}
selection_menu() {
echo -e "Attach\nDelete\nBack" | rofi_cmd "$session_name action:"
}
while true; do
session_select
case $session_action in
"create")
layout="$(layout_menu)"
if [ -z "$layout" ]; then
echo "No layout given"
continue
fi
zellij_cmd -s "$session_name" --layout "$layout"
break break
;; ;;
"Delete") zellij delete-session --force "$session_name" ;; "select")
"Back") echo "Going back." ;; selection=$(selection_menu)
*) echo "Going Back." ;; case $selection in
"Attach")
zellij_cmd attach "$session_name"
break
;;
"Delete") zellij delete-session --force "$session_name" ;;
"Back") echo "Going back." ;;
*) echo "Going Back." ;;
esac
;;
*) echo "Going Back" ;;
esac esac
;; done
*) echo "Going Back" ;; }
esac
done
}
project_manager() { project_manager() {
get_project_type() { get_project_type() {
while true; do while true; do
type=$(echo -e "script\nnix" | rofi_cmd "Select project type:") type=$(echo -e "script\nnix" | rofi_cmd "Select project type:")
case "$type" in
script)
type_dir="$SCRIPTS"
break
;;
nix)
type_dir="$NIX_DIR"
break
;;
*)
echo "Invalid selection, try again."
;;
esac
done
}
get_project_name() {
while true; do
project_name=$(rofi_cmd "Enter project name:")
if [ -z "$project_name" ]; then
echo "No name provided, try again."
elif [ -d "$type_dir/$project_name" ]; then
echo "Project already exists, try again."
else
project_dir="$type_dir/$project_name"
break
fi
done
}
get_session_name() {
session_name="$project_name"
if zellij ls | grep -q "^$session_name$"; then
session_name=$(rofi_cmd "Session name '$project_name' in use, enter a new session name:")
if [ -z "$session_name" ]; then
echo "No session name entered, exiting."
exit 1
fi
fi
}
get_layout() {
case "$type" in case "$type" in
script) script)
type_dir="$SCRIPTS" layout="script"
break
;; ;;
nix) nix)
type_dir="$NIX_DIR" layout="nix"
break
;; ;;
*) *)
echo "Invalid selection, try again." echo "Unknown project type, using default layout."
layout="base"
;; ;;
esac esac
done }
}
get_project_name() { select_project() {
while true; do project_name=$(find "$type_dir" -maxdepth 1 -mindepth 1 -type d ! -name .git -exec basename {} \; | rofi_cmd "Select project:")
project_name=$(rofi_cmd "Enter project name:") project_dir="$type_dir/$project_name"
if [ -z "$project_name" ]; then
echo "No name provided, try again."
elif [ -d "$type_dir/$project_name" ]; then
echo "Project already exists, try again."
else
project_dir="$type_dir/$project_name"
break
fi
done
}
get_session_name() { cd "$project_dir" || return 1
session_name="$project_name" get_session_name
if zellij ls | grep -q "^$session_name$"; then get_layout
session_name=$(rofi_cmd "Session name '$project_name' in use, enter a new session name:") zellij_cmd -s "$session_name" --layout "$layout"
if [ -z "$session_name" ]; then }
echo "No session name entered, exiting."
exit 1
fi
fi
}
get_layout() { create_and_start_project() {
case "$type" in mkdir -p "$project_dir"
script) cd "$project_dir" || return 1
layout="script"
case "$type" in
script)
echo -e "#!/usr/bin/env bash\necho 'hello world'" >"$project_name.sh"
chmod +x "$project_name.sh"
;;
nix)
echo "Creating Nix project..."
# still need to implement
;;
*)
echo "Unknown project type."
return 1
;;
esac
get_session_name
get_layout
zellij_cmd -s "$session_name" --layout "$layout"
}
project_action=$(echo -e "Create Project\nSelect Project" | rofi_cmd "Project action:")
case "$project_action" in
"Create Project")
get_project_type
get_project_name
create_and_start_project
;; ;;
nix) "Select Project")
layout="nix" get_project_type
;; select_project
*)
echo "Unknown project type, using default layout."
layout="base"
;;
esac
}
select_project() {
project_name=$(find "$type_dir" -maxdepth 1 -mindepth 1 -type d ! -name .git -exec basename {} \; | rofi_cmd "Select project:")
project_dir="$type_dir/$project_name"
cd "$project_dir" || return 1
get_session_name
get_layout
zellij_cmd -s "$session_name" --layout "$layout"
}
create_and_start_project() {
mkdir -p "$project_dir"
cd "$project_dir" || return 1
case "$type" in
script)
echo -e "#!/usr/bin/env bash\necho 'hello world'" >"$project_name.sh"
chmod +x "$project_name.sh"
;;
nix)
echo "Creating Nix project..."
# still need to implement
;;
*)
echo "Unknown project type."
return 1
;; ;;
esac esac
get_session_name
get_layout
zellij_cmd -s "$session_name" --layout "$layout"
} }
project_action=$(echo -e "Create Project\nSelect Project" | rofi_cmd "Project action:")
case "$project_action" in
"Create Project")
get_project_type
get_project_name
create_and_start_project
;;
"Select Project")
get_project_type
select_project
;;
esac
} main() {
main_action=$(echo -e "Projects\nSessions" | rofi_cmd "Choose action:")
case "$main_action" in
"Projects") project_manager ;;
"Sessions") session_manager ;;
*) echo "Invalid option, exiting." ;;
esac
}
main() { main
main_action=$(echo -e "Projects\nSessions" | rofi_cmd "Choose action:") '';
case "$main_action" in
"Projects") project_manager ;;
"Sessions") session_manager ;;
*) echo "Invalid option, exiting." ;;
esac
}
main
'';
}; };
in in {
{
config = mkIf (multiplexer == "zellij" && launcher == "rofi") { config = mkIf (multiplexer == "zellij" && launcher == "rofi") {
home.packages = [ zellijmenu ]; home.packages = [zellijmenu];
ooknet.binds.zellijMenu = "zellijmenu -n"; ooknet.binds.zellijMenu = "zellijmenu -n";
}; };
} }

4
home/modules/desktop/wayland/bar/default.nix
View file

@ -1,5 +1,4 @@
{ lib, ... }: {lib, ...}: {
{
imports = [ imports = [
#./eww #./eww
# ./ags # ./ags
@ -17,5 +16,4 @@
enable = lib.mkEnableOption "Enable waybar bar"; enable = lib.mkEnableOption "Enable waybar bar";
}; };
}; };
} }

148
home/modules/desktop/wayland/bar/waybar/default.nix
View file

@ -1,15 +1,17 @@
{ config, lib, pkgs, osConfig, ... }: {
config,
let lib,
pkgs,
osConfig,
...
}: let
inherit (config.colorscheme) palette; inherit (config.colorscheme) palette;
inherit (lib) mkIf head; inherit (lib) mkIf head;
fonts = config.ooknet.fonts; fonts = config.ooknet.fonts;
wayland = config.ooknet.wayland; wayland = config.ooknet.wayland;
monitors = osConfig.ooknet.host.hardware.monitors; monitors = osConfig.ooknet.host.hardware.monitors;
monitorWidth = (head monitors).width - 20; monitorWidth = (head monitors).width - 20;
in in {
{
config = mkIf (wayland.bar == "waybar") { config = mkIf (wayland.bar == "waybar") {
programs.waybar = { programs.waybar = {
enable = true; enable = true;
@ -25,9 +27,9 @@ in
margin-top = 10; margin-top = 10;
margin-bottom = -12; margin-bottom = -12;
modules-left = [ "clock" "battery" "hyprland/workspaces" ]; modules-left = ["clock" "battery" "hyprland/workspaces"];
modules-center = []; modules-center = [];
modules-right = [ "custom/hyprrecord" "tray" ]; modules-right = ["custom/hyprrecord" "tray"];
"hyprland/workspaces" = let "hyprland/workspaces" = let
hyprctl = config.wayland.windowManager.hyprland.package + "/bin/hyprctl"; hyprctl = config.wayland.windowManager.hyprland.package + "/bin/hyprctl";
@ -60,7 +62,7 @@ in
}; };
bat = "BAT0"; bat = "BAT0";
interval = 10; interval = 10;
format-icons = [ "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ]; format-icons = ["󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
format = "{icon} {capacity}%"; format = "{icon} {capacity}%";
format-charging = "󱐋{icon} {capacity}%"; format-charging = "󱐋{icon} {capacity}%";
tooltip-format = "{timeTo} {power}W"; tooltip-format = "{timeTo} {power}W";
@ -79,77 +81,81 @@ in
signal = 12; signal = 12;
}; };
}; };
style = /* css */ '' style =
* { /*
font-family: "${fonts.monospace.family}"; css
font-size: 19px; */
border: solid #${palette.base05}; ''
} * {
font-family: "${fonts.monospace.family}";
font-size: 19px;
border: solid #${palette.base05};
}
window#waybar { window#waybar {
background-color: transparent; background-color: transparent;
margin: 10px; margin: 10px;
} }
#clock, #clock,
#battery, #battery,
#workspaces { #workspaces {
background-color: #${palette.base00}; background-color: #${palette.base00};
padding-right: 10px; padding-right: 10px;
} }
#clock { #clock {
padding-left: 10px; padding-left: 10px;
border: 2px solid #${palette.base05}; border: 2px solid #${palette.base05};
border-right: 0px; border-right: 0px;
border-top-left-radius: 10px; border-top-left-radius: 10px;
} }
#battery { #battery {
padding-left: 10px; padding-left: 10px;
border-top: 2px solid #${palette.base05}; border-top: 2px solid #${palette.base05};
border-bottom: 2px solid #${palette.base05}; border-bottom: 2px solid #${palette.base05};
border-left: 0px; border-left: 0px;
} }
#battery.good { #battery.good {
color: #${palette.base0B}; color: #${palette.base0B};
} }
#battery.warning { #battery.warning {
color: #${palette.base0A}; color: #${palette.base0A};
} }
#battery.critical { #battery.critical {
color: #${palette.base08}; color: #${palette.base08};
} }
#tray { #tray {
padding-right: 10px; padding-right: 10px;
padding-left: 10px; padding-left: 10px;
background-color: transparent; background-color: transparent;
border: 0; border: 0;
} }
#workspaces { #workspaces {
border: 2px solid #${palette.base05}; border: 2px solid #${palette.base05};
border-left: 0; border-left: 0;
border-top-right-radius: 10px; border-top-right-radius: 10px;
} }
#workspace button, #workspace button,
#workspaces button.active, #workspaces button.active,
#workspaces button.visible { #workspaces button.visible {
color: #${palette.base0B}; color: #${palette.base0B};
} }
#workspaces button.urgent { #workspaces button.urgent {
color: #${palette.base08}; color: #${palette.base08};
} }
#custom-hyprrecord { #custom-hyprrecord {
color: #${palette.base08}; color: #${palette.base08};
padding-right: 20px; padding-right: 20px;
} }
''; '';
}; };
}; };
} }

16
home/modules/desktop/wayland/compositor/hyprland/default.nix
View file

@ -1,9 +1,13 @@
{ inputs, lib, config, pkgs, ... }: {
let inputs,
lib,
config,
pkgs,
...
}: let
wayland = config.ooknet.wayland; wayland = config.ooknet.wayland;
inherit (lib) mkIf; inherit (lib) mkIf;
in in {
{
imports = [ imports = [
inputs.hyprland.homeManagerModules.default inputs.hyprland.homeManagerModules.default
./settings ./settings
@ -13,8 +17,8 @@ in
config = mkIf (wayland.compositor == "hyprland") { config = mkIf (wayland.compositor == "hyprland") {
home.packages = [ home.packages = [
pkgs.hyprpicker pkgs.hyprpicker
]; ];
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
package = inputs.hyprland.packages.${pkgs.system}.hyprland; package = inputs.hyprland.packages.${pkgs.system}.hyprland;

19
home/modules/desktop/wayland/compositor/hyprland/extras/hyprcapture.nix
View file

@ -1,17 +1,18 @@
{ lib, config, pkgs, inputs, ... }: {
lib,
let config,
pkgs,
inputs,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
wayland = config.ooknet.wayland; wayland = config.ooknet.wayland;
in in {
{
config = mkIf (wayland.compositor == "hyprland") { config = mkIf (wayland.compositor == "hyprland") {
home.packages = with inputs; [ home.packages = with inputs; [
# Screenshot tool # Screenshot tool
hyprland-contrib.packages.${pkgs.system}.grimblast hyprland-contrib.packages.${pkgs.system}.grimblast
# Screen recording tool # Screen recording tool
ooks-scripts.packages.${pkgs.system}.hyprrecord ooks-scripts.packages.${pkgs.system}.hyprrecord
]; ];

15
home/modules/desktop/wayland/compositor/hyprland/extras/hyprshade.nix
View file

@ -1,13 +1,14 @@
{ lib, config, pkgs, ... }: {
lib,
let config,
pkgs,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
wayland = config.ooknet.wayland; wayland = config.ooknet.wayland;
in in {
{
config = mkIf (wayland.compositor == "hyprland") { config = mkIf (wayland.compositor == "hyprland") {
home.packages = [ pkgs.hyprshade ]; home.packages = [pkgs.hyprshade];
# TODO: implement hyprshade configuration # TODO: implement hyprshade configuration
}; };
} }

17
home/modules/desktop/wayland/compositor/hyprland/settings/appearance.nix
View file

@ -1,13 +1,13 @@
{ config, lib, ... }: {
config,
let lib,
...
}: let
wayland = config.ooknet.wayland; wayland = config.ooknet.wayland;
pointer = config.home.pointerCursor; pointer = config.home.pointerCursor;
inherit (config.colorscheme) palette; inherit (config.colorscheme) palette;
inherit (lib) mkIf; inherit (lib) mkIf;
in in {
{
config = mkIf (wayland.compositor == "hyprland") { config = mkIf (wayland.compositor == "hyprland") {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
settings = { settings = {
@ -20,14 +20,13 @@ in
border_size = 2; border_size = 2;
"col.active_border" = "0xff${palette.base05}"; "col.active_border" = "0xff${palette.base05}";
"col.inactive_border" = "0xff${palette.base02}"; "col.inactive_border" = "0xff${palette.base02}";
}; };
exec-once = [ exec-once = [
"hyprctl setcursor ${pointer.name} ${toString pointer.size}" "hyprctl setcursor ${pointer.name} ${toString pointer.size}"
]; ];
decoration = { decoration = {
active_opacity = 1.0; active_opacity = 1.0;
inactive_opacity = 1.0; inactive_opacity = 1.0;
fullscreen_opacity = 1.0; fullscreen_opacity = 1.0;
@ -45,7 +44,7 @@ in
"col.shadow" = "0x44000000"; "col.shadow" = "0x44000000";
"col.shadow_inactive" = "0x66000000"; "col.shadow_inactive" = "0x66000000";
}; };
animations = { animations = {
enabled = false; enabled = false;
}; };

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

@ -1,12 +1,12 @@
{ lib, config, ... }: {
lib,
let config,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
wayland = config.ooknet.wayland; wayland = config.ooknet.wayland;
binds = config.ooknet.binds; binds = config.ooknet.binds;
in in {
{
config = mkIf (wayland.compositor == "hyprland") { config = mkIf (wayland.compositor == "hyprland") {
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
bind = [ bind = [
@ -38,7 +38,7 @@ in
",XF86AudioRaiseVolume, exec, ${binds.volume.up}" ",XF86AudioRaiseVolume, exec, ${binds.volume.up}"
",XF86AudioLowerVolume, exec, ${binds.volume.down}" ",XF86AudioLowerVolume, exec, ${binds.volume.down}"
",XF86AudioMute, exec, ${binds.volume.mute}" ",XF86AudioMute, exec, ${binds.volume.mute}"
# Window Management # Window Management
"SUPER, Q, killactive" "SUPER, Q, killactive"
"SUPER CTRL, backspace, killactive" "SUPER CTRL, backspace, killactive"
@ -97,7 +97,7 @@ in
# Lock Screen # Lock Screen
"SUPER, Backspace, exec, ${binds.lock}" "SUPER, Backspace, exec, ${binds.lock}"
]; ];
# Mouse # Mouse
bindm = [ bindm = [
"SUPER, mouse:272, movewindow" "SUPER, mouse:272, movewindow"
"SUPER, mouse:273, resizewindow" "SUPER, mouse:273, resizewindow"

16
home/modules/desktop/wayland/compositor/hyprland/settings/env.nix
View file

@ -1,17 +1,15 @@
{ lib, config, ... }: {
lib,
let config,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
wayland = config.ooknet.wayland; wayland = config.ooknet.wayland;
in in {
{
config = mkIf (wayland.compositor == "hyprland") { config = mkIf (wayland.compositor == "hyprland") {
wayland.windowManager.hyprland.settings.env = [ wayland.windowManager.hyprland.settings.env = [
"XDG_SESSION_DESKTOP,hyprland" "XDG_SESSION_DESKTOP,hyprland"
"XDG_CURRENT_DESKTOP,hyprland" "XDG_CURRENT_DESKTOP,hyprland"
]; ];
}; };
} }

13
home/modules/desktop/wayland/compositor/hyprland/settings/exec.nix
View file

@ -1,11 +1,12 @@
{ config, lib, pkgs, ... }: {
config,
let lib,
pkgs,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
wayland = config.ooknet.wayland; wayland = config.ooknet.wayland;
in in {
{
config = mkIf (wayland.compositor == "hyprland") { config = mkIf (wayland.compositor == "hyprland") {
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
exec = [ exec = [

12
home/modules/desktop/wayland/compositor/hyprland/settings/gestures.nix
View file

@ -1,11 +1,11 @@
{ lib, config, ... }: {
lib,
let config,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
wayland = config.ooknet.wayland; wayland = config.ooknet.wayland;
in in {
{
config = mkIf (wayland.compositor == "hyprland") { config = mkIf (wayland.compositor == "hyprland") {
wayland.windowManager.hyprland.settings.gestures = { wayland.windowManager.hyprland.settings.gestures = {
workspace_swipe = true; workspace_swipe = true;

12
home/modules/desktop/wayland/compositor/hyprland/settings/hyprpaper.nix
View file

@ -1,12 +1,12 @@
{ lib, config, ... }: {
lib,
let config,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
wayland = config.ooknet.wayland; wayland = config.ooknet.wayland;
wallpaperPath = config.ooknet.wallpaper.path; wallpaperPath = config.ooknet.wallpaper.path;
in in {
{
config = mkIf (wayland.compositor == "hyprland") { config = mkIf (wayland.compositor == "hyprland") {
services.hyprpaper = { services.hyprpaper = {
enable = true; enable = true;

13
home/modules/desktop/wayland/compositor/hyprland/settings/inputs.nix
View file

@ -1,11 +1,11 @@
{ lib, config, ... }: {
lib,
let config,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
wayland = config.ooknet.wayland; wayland = config.ooknet.wayland;
in in {
{
config = mkIf (wayland.compositor == "hyprland") { config = mkIf (wayland.compositor == "hyprland") {
wayland.windowManager.hyprland.settings.input = { wayland.windowManager.hyprland.settings.input = {
kb_layout = "us"; kb_layout = "us";
@ -14,5 +14,4 @@ in
mouse_refocus = false; mouse_refocus = false;
}; };
}; };
} }

14
home/modules/desktop/wayland/compositor/hyprland/settings/misc.nix
View file

@ -1,11 +1,11 @@
{ lib, config, ... }: {
lib,
let config,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
wayland = config.ooknet.wayland; wayland = config.ooknet.wayland;
in in {
{
config = mkIf (wayland.compositor == "hyprland") { config = mkIf (wayland.compositor == "hyprland") {
wayland.windowManager.hyprland.settings.misc = { wayland.windowManager.hyprland.settings.misc = {
mouse_move_enables_dpms = true; mouse_move_enables_dpms = true;
@ -19,4 +19,4 @@ in
focus_on_activate = true; focus_on_activate = true;
}; };
}; };
} }

40
home/modules/desktop/wayland/compositor/hyprland/settings/monitor.nix
View file

@ -1,22 +1,34 @@
{ lib, config, osConfig, ... }: {
lib,
let config,
osConfig,
...
}: let
inherit (lib) mkIf concatMap; inherit (lib) mkIf concatMap;
wayland = config.ooknet.wayland; wayland = config.ooknet.wayland;
monitors = osConfig.ooknet.host.hardware.monitors; monitors = osConfig.ooknet.host.hardware.monitors;
in in {
{
config = mkIf (wayland.compositor == "hyprland") { config = mkIf (wayland.compositor == "hyprland") {
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
monitor = concatMap (m: let monitor =
resolution = "${toString m.width}x${toString m.height}@${toString m.refreshRate}"; concatMap (
position = "${toString m.x}x${toString m.y}"; m: let
basicConfig = "${m.name},${if m.enabled then "${resolution},${position},1" else "disable"}"; resolution = "${toString m.width}x${toString m.height}@${toString m.refreshRate}";
in position = "${toString m.x}x${toString m.y}";
[ basicConfig ] ++ (if m.transform != 0 then ["${m.name},transform,${toString m.transform}"] else []) basicConfig = "${m.name},${
) (monitors); if m.enabled
then "${resolution},${position},1"
else "disable"
}";
in
[basicConfig]
++ (
if m.transform != 0
then ["${m.name},transform,${toString m.transform}"]
else []
)
)
monitors;
}; };
}; };
} }

14
home/modules/desktop/wayland/compositor/hyprland/settings/rules.nix
View file

@ -1,11 +1,11 @@
{ lib, config, ... }: {
lib,
let config,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
wayland = config.ooknet.wayland; wayland = config.ooknet.wayland;
in in {
{
config = mkIf (wayland.compositor == "hyprland") { config = mkIf (wayland.compositor == "hyprland") {
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
windowrulev2 = [ windowrulev2 = [
@ -26,7 +26,7 @@ in
"stayfocused,title:^(BTOP)$" "stayfocused,title:^(BTOP)$"
# Tearing # Tearing
"immediate, title:^(TEKKEN™8)$" "immediate, title:^(TEKKEN™8)$"
]; ];
}; };
}; };

15
home/modules/desktop/wayland/launcher/rofi.nix
View file

@ -1,12 +1,13 @@
{ lib, config, pkgs, ... }: {
lib,
let config,
pkgs,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
fonts = config.ooknet.fonts; fonts = config.ooknet.fonts;
wayland = config.ooknet.wayland; wayland = config.ooknet.wayland;
in in {
{
config = mkIf (wayland.launcher == "rofi") { config = mkIf (wayland.launcher == "rofi") {
programs.rofi = { programs.rofi = {
enable = true; enable = true;
@ -14,7 +15,7 @@ in
package = pkgs.rofi-wayland; package = pkgs.rofi-wayland;
terminal = "${config.home.sessionVariables.TERMINAL}"; terminal = "${config.home.sessionVariables.TERMINAL}";
theme = let theme = let
inherit (config.colorscheme ) palette; inherit (config.colorscheme) palette;
inherit (config.lib.formats.rasi) mkLiteral; inherit (config.lib.formats.rasi) mkLiteral;
in { in {
"*" = { "*" = {

70
home/modules/desktop/wayland/launcher/tofi.nix
View file

@ -1,41 +1,45 @@
{ lib, config, pkgs, ... }: {
lib,
let config,
pkgs,
...
}: let
inherit (config.colorscheme) palette; inherit (config.colorscheme) palette;
inherit (lib) mkIf; inherit (lib) mkIf;
wayland = config.ooknet.wayland; wayland = config.ooknet.wayland;
fonts = config.ooknet.fonts; fonts = config.ooknet.fonts;
in in {
{
config = mkIf (wayland.launcher == "tofi") { config = mkIf (wayland.launcher == "tofi") {
home.packages = [pkgs.tofi]; home.packages = [pkgs.tofi];
xdg.configFile."tofi/config".text = /* config */ '' xdg.configFile."tofi/config".text =
history = false /*
clip-to-padding = false config
horizontal = true */
width = 40% ''
height = 35 history = false
anchor = top-left clip-to-padding = false
margin-top = 5 horizontal = true
margin-left = 25% width = 40%
num-results = 1 height = 35
border-width = 0 anchor = top-left
outline-width = 0 margin-top = 5
result-spacing = 10 margin-left = 25%
selection-background-padding = 30 num-results = 1
prompt-padding = 10 border-width = 0
font = "${fonts.monospace.family}" outline-width = 0
font-size = 14 result-spacing = 10
prompt-text = " " selection-background-padding = 30
background-color = #0000 prompt-padding = 10
prompt-background = #0000 font = "${fonts.monospace.family}"
prompt-color = ${palette.base0B} font-size = 14
input-color = ${palette.base05} prompt-text = " "
placeholder-color = ${palette.base03} background-color = #0000
default-result-color = ${palette.base03} prompt-background = #0000
selection-color = ${palette.base04} prompt-color = ${palette.base0B}
''; input-color = ${palette.base05}
placeholder-color = ${palette.base03}
default-result-color = ${palette.base03}
selection-color = ${palette.base04}
'';
}; };
} }

1
home/modules/desktop/wayland/lockscreen/default.nix
View file

@ -4,4 +4,3 @@
./hyprlock.nix ./hyprlock.nix
]; ];
} }

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

@ -1,13 +1,13 @@
{ lib, config, ... }: {
lib,
let config,
...
}: let
inherit (config.colorscheme) palette; inherit (config.colorscheme) palette;
inherit (lib) mkIf; inherit (lib) mkIf;
wayland = config.ooknet.wayland; wayland = config.ooknet.wayland;
fonts = config.ooknet.fonts; fonts = config.ooknet.fonts;
in in {
{
config = mkIf (wayland.locker == "hyprlock") { config = mkIf (wayland.locker == "hyprlock") {
ooknet.binds.lock = "hyprlock"; ooknet.binds.lock = "hyprlock";
programs.hyprlock = { programs.hyprlock = {
@ -29,7 +29,7 @@ in
size = { size = {
width = 300; width = 300;
height = 40; height = 40;
}; };
position = { position = {
x = 0; x = 0;
y = 0; y = 0;
@ -49,7 +49,7 @@ in
text = " "; text = " ";
position = { position = {
x = 0; x = 0;
y = 80; y = 80;
}; };
color = "0xff${palette.base08}"; color = "0xff${palette.base08}";
font_size = 30; font_size = 30;
@ -60,7 +60,7 @@ in
text = "$TIME"; text = "$TIME";
position = { position = {
x = 0; x = 0;
y = -80; y = -80;
}; };
color = "0xff${palette.base0B}"; color = "0xff${palette.base0B}";
font_size = 20; font_size = 20;

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

@ -1,13 +1,14 @@
{ config, lib, ... }: {
config,
let lib,
...
}: let
inherit (config.colorscheme) palette; inherit (config.colorscheme) palette;
inherit (lib) mkIf; inherit (lib) mkIf;
fonts = config.ooknet.fonts; fonts = config.ooknet.fonts;
wallpaperPath = config.ooknet.wallpaper.path; wallpaperPath = config.ooknet.wallpaper.path;
wayland = config.ooknet.wayland; wayland = config.ooknet.wayland;
in in {
{
config = mkIf (wayland.locker == "swaylock") { config = mkIf (wayland.locker == "swaylock") {
ooknet.binds.lock = "swaylock"; ooknet.binds.lock = "swaylock";
programs.swaylock = { programs.swaylock = {

22
home/modules/desktop/wayland/notification/mako.nix
View file

@ -1,21 +1,20 @@
{ config, lib, ... }: {
config,
let lib,
...
}: let
inherit (config.colorscheme) palette variant; inherit (config.colorscheme) palette variant;
inherit (lib) mkIf; inherit (lib) mkIf;
fonts = config.ooknet.fonts; fonts = config.ooknet.fonts;
wayland = config.ooknet.wayland; wayland = config.ooknet.wayland;
in in {
{
config = mkIf (wayland.notification == "mako") { config = mkIf (wayland.notification == "mako") {
services.mako = { services.mako = {
enable = true; enable = true;
iconPath = iconPath =
if variant == "dark" then if variant == "dark"
"${config.gtk.iconTheme.package}/share/icons/Papirus-Dark" then "${config.gtk.iconTheme.package}/share/icons/Papirus-Dark"
else else "${config.gtk.iconTheme.package}/share/icons/Papirus-Light";
"${config.gtk.iconTheme.package}/share/icons/Papirus-Light";
font = "${fonts.regular.family} 12"; font = "${fonts.regular.family} 12";
padding = "10,10"; padding = "10,10";
anchor = "top-right"; anchor = "top-right";
@ -41,4 +40,3 @@ in
}; };
}; };
} }

12
home/modules/desktop/wayland/utility/gammastep.nix
View file

@ -1,11 +1,11 @@
{ lib, config, ... }: {
lib,
let config,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.wayland; cfg = config.ooknet.wayland;
in in {
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.gammastep = { services.gammastep = {
enable = true; enable = true;

15
home/modules/desktop/wayland/utility/tools.nix
View file

@ -1,11 +1,12 @@
{ lib, config, pkgs, ... }: {
lib,
let config,
pkgs,
...
}: let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.ooknet.wayland; cfg = config.ooknet.wayland;
in in {
{
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
home = { home = {
packages = with pkgs; [ packages = with pkgs; [
@ -17,7 +18,7 @@ in
wl-clipboard wl-clipboard
]; ];
}; };
systemd.user.targets.tray = { systemd.user.targets.tray = {
Unit = { Unit = {
Description = "Home Manager System Tray"; Description = "Home Manager System Tray";

51
home/modules/desktop/wayland/variables.nix
View file

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

8
home/options/appearance/cursor.nix
View file

@ -1,10 +1,6 @@
{ lib, ... }: {lib, ...}: let
let
inherit (lib) mkEnableOption mkOption types; inherit (lib) mkEnableOption mkOption types;
in in {
{
options.ooknet.cursor = { options.ooknet.cursor = {
enable = mkEnableOption "Enable cursor module"; enable = mkEnableOption "Enable cursor module";
package = mkOption { package = mkOption {

7
home/options/appearance/fonts.nix
View file

@ -1,6 +1,4 @@
{ lib, ... }: {lib, ...}: let
let
mkFontOption = kind: { mkFontOption = kind: {
family = lib.mkOption { family = lib.mkOption {
type = lib.types.str; type = lib.types.str;
@ -15,8 +13,7 @@ let
example = "pkgs.fira-code"; example = "pkgs.fira-code";
}; };
}; };
in in {
{
options.ooknet.fonts = { options.ooknet.fonts = {
enable = lib.mkEnableOption "Whether to enable font profiles"; enable = lib.mkEnableOption "Whether to enable font profiles";
monospace = mkFontOption "monospace"; monospace = mkFontOption "monospace";

8
home/options/appearance/gtk.nix
View file

@ -1,9 +1,5 @@
{ lib, ... }: {lib, ...}: let
let
inherit (lib) mkEnableOption; inherit (lib) mkEnableOption;
in in {
{
options.ooknet.gtk.enable = mkEnableOption ""; options.ooknet.gtk.enable = mkEnableOption "";
} }

8
home/options/appearance/qt.nix
View file

@ -1,9 +1,5 @@
{ lib, ... }: {lib, ...}: let
let
inherit (lib) mkEnableOption; inherit (lib) mkEnableOption;
in in {
{
options.ooknet.qt.enable = mkEnableOption ""; options.ooknet.qt.enable = mkEnableOption "";
} }

Some files were not shown because too many files have changed in this diff Show more