use foor
This commit is contained in:
parent
221a4d4183
commit
b3d9c44846
@ -1,11 +1,14 @@
|
|||||||
{pkgs, lib, ...}:
|
|
||||||
let
|
|
||||||
l = lib // builtins;
|
|
||||||
mkRule = name: type: l.toJSON {
|
|
||||||
inherit name type;
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
l = lib // builtins;
|
||||||
|
mkRule = name: type:
|
||||||
|
l.toJSON {
|
||||||
|
inherit name type;
|
||||||
|
};
|
||||||
|
in {
|
||||||
services.ananicy = {
|
services.ananicy = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.ananicy-cpp;
|
package = pkgs.ananicy-cpp;
|
||||||
@ -36,6 +39,7 @@ in
|
|||||||
(mkRule "swayidle" "BG_CPUIO")
|
(mkRule "swayidle" "BG_CPUIO")
|
||||||
# term
|
# term
|
||||||
(mkRule "wezterm-gui" "Doc-View")
|
(mkRule "wezterm-gui" "Doc-View")
|
||||||
|
(mkRule "foot" "Doc-View")
|
||||||
# other
|
# other
|
||||||
(mkRule "syncthing" "BG_CPUIO")
|
(mkRule "syncthing" "BG_CPUIO")
|
||||||
];
|
];
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.sharedModules = [
|
home-manager.sharedModules = [
|
||||||
|
"${inputs.self}/users/modules/settings"
|
||||||
{
|
{
|
||||||
home = {
|
home = {
|
||||||
inherit (config.environment) shellAliases sessionVariables;
|
inherit (config.environment) shellAliases sessionVariables;
|
||||||
|
33
users/modules/foot/default.nix
Normal file
33
users/modules/foot/default.nix
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
{config, ...}: {
|
||||||
|
settings.terminal.name = "foot";
|
||||||
|
programs.foot = {
|
||||||
|
enable = true;
|
||||||
|
server.enable = false;
|
||||||
|
settings = {
|
||||||
|
main = {
|
||||||
|
font = "${config.settings.font.name}:size=${toString config.settings.font.size}";
|
||||||
|
dpi-aware = "yes";
|
||||||
|
};
|
||||||
|
colors = {
|
||||||
|
foreground = "cdd6f4"; # Text
|
||||||
|
background = "1e1e2e"; # Base
|
||||||
|
regular0 = "45475a"; # Surface 1
|
||||||
|
regular1 = "f38ba8"; # red
|
||||||
|
regular2 = "a6e3a1"; # green
|
||||||
|
regular3 = "f9e2af"; # yellow
|
||||||
|
regular4 = "89b4fa"; # blue
|
||||||
|
regular5 = "f5c2e7"; # pink
|
||||||
|
regular6 = "94e2d5"; # teal
|
||||||
|
regular7 = "bac2de"; # Subtext 1
|
||||||
|
bright0 = "585b70"; # Surface 2
|
||||||
|
bright1 = "f38ba8"; # red
|
||||||
|
bright2 = "a6e3a1"; # green
|
||||||
|
bright3 = "f9e2af"; # yellow
|
||||||
|
bright4 = "89b4fa"; # blue
|
||||||
|
bright5 = "f5c2e7"; # pink
|
||||||
|
bright6 = "94e2d5"; # teal
|
||||||
|
bright7 = "a6adc8"; # Subtext 0
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
@ -1,4 +1,5 @@
|
|||||||
{
|
{
|
||||||
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
inputs,
|
inputs,
|
||||||
...
|
...
|
||||||
@ -25,7 +26,7 @@
|
|||||||
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
|
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
|
||||||
extraConfig = let
|
extraConfig = let
|
||||||
launcher = "rofi -show drun";
|
launcher = "rofi -show drun";
|
||||||
term = "wezterm";
|
term = config.settings.terminal.name;
|
||||||
|
|
||||||
notify-date = with pkgs;
|
notify-date = with pkgs;
|
||||||
writers.writeBash "notify-date" ''
|
writers.writeBash "notify-date" ''
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
programs.mako = {
|
programs.mako = {
|
||||||
enable = true;
|
enable = true;
|
||||||
anchor = "top-center";
|
anchor = "top-center";
|
||||||
font = "${config.fonts.settings.name} ${toString config.fonts.settings.size}";
|
font = "${config.settings.font.name} ${toString config.settings.font.size}";
|
||||||
borderRadius = 16;
|
borderRadius = 16;
|
||||||
extraConfig = builtins.readFile (
|
extraConfig = builtins.readFile (
|
||||||
builtins.fetchurl {
|
builtins.fetchurl {
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
configuration{
|
configuration{
|
||||||
modi: "drun";
|
modi: "drun";
|
||||||
lines: 5;
|
lines: 5;
|
||||||
font: "${config.fonts.settings.name} ${toString config.fonts.settings.size}";
|
font: "${config.settings.font.name} ${toString config.settings.font.size}";
|
||||||
show-icons: true;
|
show-icons: true;
|
||||||
terminal: "st";
|
terminal: "st";
|
||||||
drun-display-format: "{icon} {name}";
|
drun-display-format: "{icon} {name}";
|
||||||
|
@ -1,12 +1,23 @@
|
|||||||
{
|
{
|
||||||
lib,
|
|
||||||
config,
|
config,
|
||||||
|
lib,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
cfg = config.fonts.settings;
|
cfg = config.settings;
|
||||||
in
|
inherit
|
||||||
with lib; {
|
(lib)
|
||||||
options.fonts.settings = {
|
types
|
||||||
|
mkOption
|
||||||
|
mkIf
|
||||||
|
;
|
||||||
|
in {
|
||||||
|
options = {
|
||||||
|
settings.terminal = {
|
||||||
|
name = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
settings.font = {
|
||||||
enable = mkOption {
|
enable = mkOption {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
default = false;
|
default = false;
|
||||||
@ -21,8 +32,9 @@ in
|
|||||||
type = types.ints.unsigned;
|
type = types.ints.unsigned;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.font.enable {
|
||||||
home.packages = [cfg.package];
|
home.packages = [cfg.font.package];
|
||||||
};
|
};
|
||||||
}
|
}
|
@ -12,6 +12,6 @@
|
|||||||
effect-scale = "0.5";
|
effect-scale = "0.5";
|
||||||
effect-greyscale = true;
|
effect-greyscale = true;
|
||||||
effect-blur = "20x3";
|
effect-blur = "20x3";
|
||||||
font = config.fonts.settings.name;
|
font = config.settings.font.name;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
|
settings.terminal.name = "wezterm";
|
||||||
home.packages = [pkgs.wezterm];
|
home.packages = [pkgs.wezterm];
|
||||||
xdg.enable = true;
|
xdg.enable = true;
|
||||||
xdg.configFile = {
|
xdg.configFile = {
|
||||||
@ -16,8 +17,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
font = wezterm.font("${config.fonts.settings.name}"),
|
font = wezterm.font("${config.settings.font.name}"),
|
||||||
font_size = ${builtins.toJSON config.fonts.settings.size},
|
font_size = ${builtins.toJSON config.settings.font.size},
|
||||||
default_cursor_style = "BlinkingBar",
|
default_cursor_style = "BlinkingBar",
|
||||||
enable_wayland = true,
|
enable_wayland = true,
|
||||||
enable_tab_bar = false,
|
enable_tab_bar = false,
|
||||||
|
@ -1,11 +1,9 @@
|
|||||||
{inputs, ...}:
|
{inputs, ...}: let
|
||||||
let
|
|
||||||
geo = import "${inputs.self}/locale/geo.nix";
|
geo = import "${inputs.self}/locale/geo.nix";
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
services.wlsunset = {
|
services.wlsunset = {
|
||||||
enable = true;
|
enable = true;
|
||||||
latitude = geo.lat;
|
latitude = geo.lat;
|
||||||
longitude = geo.long;
|
longitude = geo.long;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -96,7 +96,7 @@ in {
|
|||||||
imports = let
|
imports = let
|
||||||
modulesToEnable = l.flatten [
|
modulesToEnable = l.flatten [
|
||||||
# desktop stuff
|
# desktop stuff
|
||||||
["firefox" "hyprland" "wezterm" "font" "rofi" "mako" "discord"]
|
["firefox" "hyprland" "foot" "rofi" "mako" "discord"]
|
||||||
# cli stuff
|
# cli stuff
|
||||||
["zoxide" "zsh" "fzf" "starship" "direnv"]
|
["zoxide" "zsh" "fzf" "starship" "direnv"]
|
||||||
# dev stuff
|
# dev stuff
|
||||||
@ -147,7 +147,7 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
fonts.fontconfig.enable = l.mkForce true;
|
fonts.fontconfig.enable = l.mkForce true;
|
||||||
fonts.settings = {
|
settings.font = {
|
||||||
enable = true;
|
enable = true;
|
||||||
name = "Comic Mono";
|
name = "Comic Mono";
|
||||||
size = 13;
|
size = 13;
|
||||||
|
Loading…
Reference in New Issue
Block a user