@ -6,24 +6,25 @@
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (config.stylix) colors;
|
||||
inherit (lib) mkIf mkEnableOption mkDefault mkForce getExe;
|
||||
cfg = config.desktop.hyprland;
|
||||
hostname = osConfig.networking.hostName;
|
||||
cursorSize = config.stylix.cursor.size;
|
||||
fontName = config.stylix.fonts.sansSerif.name;
|
||||
inherit (config.lib.stylix) colors;
|
||||
keyboard =
|
||||
if hostname == "eldrid"
|
||||
then "chromeos"
|
||||
else "platform";
|
||||
xdgPictures =
|
||||
config.xdg.userDirs.pictures;
|
||||
ifLaptop = lib.mkIf (hostname != "dunamis");
|
||||
ifLaptop = mkIf (hostname != "dunamis");
|
||||
in {
|
||||
options = {
|
||||
desktop.hyprland.enable =
|
||||
lib.mkEnableOption "enable hyprland desktop";
|
||||
mkEnableOption "enable hyprland desktop";
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
config = mkIf cfg.enable {
|
||||
stylix.targets.waybar.enable = false;
|
||||
stylix.targets.hyprland.enable = false;
|
||||
stylix.targets.hyprlock.enable = false;
|
||||
@ -507,7 +508,7 @@ in {
|
||||
};
|
||||
qt = {
|
||||
enable = true;
|
||||
platformTheme.name = lib.mkDefault "gtk3";
|
||||
platformTheme.name = mkDefault "gtk3";
|
||||
};
|
||||
dconf.settings = {
|
||||
"org/gnome/desktop/interface" = {
|
||||
@ -1017,7 +1018,7 @@ in {
|
||||
width = 300;
|
||||
height = 300;
|
||||
icon_theme = "${config.dconf.settings."org/gnome/desktop/interface".icon-theme}";
|
||||
corner_radius = lib.mkDefault 9;
|
||||
corner_radius = mkDefault 9;
|
||||
#corners = "top-right,bottom-left";
|
||||
offset = "16x16";
|
||||
origin = "bottom-right";
|
||||
@ -1230,7 +1231,7 @@ in {
|
||||
Service =
|
||||
graphicalService.Service
|
||||
// {
|
||||
Environment = lib.mkForce "QT_QPA_PLATFORM=wayland";
|
||||
Environment = mkForce "QT_QPA_PLATFORM=wayland";
|
||||
};
|
||||
};
|
||||
hyprpolkitagent = mkGraphicalService {
|
||||
@ -1252,7 +1253,7 @@ in {
|
||||
// {
|
||||
Type = "simple";
|
||||
Slice = "session.slice";
|
||||
ExecStart = "${lib.getExe perSystem.hyprsunset.hyprsunset} -t 6500";
|
||||
ExecStart = "${getExe perSystem.hyprsunset.hyprsunset} -t 6500";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -5,9 +5,10 @@
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
cfg = config.desktop.niri;
|
||||
inherit (lib) mkIf mkEnableOption mkDefault mkForce getExe;
|
||||
inherit (osConfig.networking) hostId;
|
||||
inherit (config.lib.stylix) colors;
|
||||
inherit (config.stylix) colors;
|
||||
cfg = config.desktop.niri;
|
||||
cursorSize = config.stylix.cursor.size;
|
||||
cursorName = config.stylix.cursor.name;
|
||||
keyboard =
|
||||
@ -16,18 +17,18 @@
|
||||
else "platform";
|
||||
xdgPics =
|
||||
config.xdg.userDirs.pictures;
|
||||
ifLaptop = lib.mkIf (hostId != "c7f6c4a1");
|
||||
ifLaptop = mkIf (hostId != "c7f6c4a1");
|
||||
# TODO: make terminal depent on thing outside a module
|
||||
terminal = lib.getExe pkgs.wezterm;
|
||||
launcher = lib.getExe pkgs.fuzzel;
|
||||
terminal = getExe pkgs.wezterm;
|
||||
launcher = getExe pkgs.fuzzel;
|
||||
browser = "app.zen_browser.zen";
|
||||
lockscreen = lib.getExe pkgs.gtklock;
|
||||
lockscreen = getExe pkgs.gtklock;
|
||||
in {
|
||||
options = {
|
||||
desktop.niri.enable =
|
||||
lib.mkEnableOption "enable niri desktop";
|
||||
mkEnableOption "enable niri desktop";
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
config = mkIf cfg.enable {
|
||||
stylix.targets = {
|
||||
waybar.enable = false;
|
||||
wpaperd.enable = true;
|
||||
@ -274,7 +275,7 @@ in {
|
||||
match-mode = "fuzzy";
|
||||
icon-theme = "${config.dconf.settings."org/gnome/desktop/interface".icon-theme}";
|
||||
};
|
||||
border = lib.mkDefault {
|
||||
border = mkDefault {
|
||||
width = 3;
|
||||
radius = 12;
|
||||
};
|
||||
@ -1039,7 +1040,7 @@ in {
|
||||
Service =
|
||||
graphicalService.Service
|
||||
// {
|
||||
Environment = lib.mkForce "QT_QPA_PLATFORM=wayland";
|
||||
Environment = mkForce "QT_QPA_PLATFORM=wayland";
|
||||
};
|
||||
};
|
||||
xwayland-satellite = mkGraphicalService {
|
||||
@ -1047,12 +1048,12 @@ in {
|
||||
graphicalService.Service
|
||||
// {
|
||||
Type = "simple";
|
||||
ExecStart = lib.getExe pkgs.xwayland-satellite + " :123";
|
||||
ExecStart = getExe pkgs.xwayland-satellite + " :123";
|
||||
};
|
||||
};
|
||||
wpaperd = mkGraphicalService {
|
||||
Service =
|
||||
lib.mkDefault graphicalService.Service;
|
||||
mkDefault graphicalService.Service;
|
||||
};
|
||||
gnome-polkit-agent = mkGraphicalService {
|
||||
Service =
|
||||
|
@ -3,8 +3,8 @@
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption;
|
||||
cfg = config.console.joshuto;
|
||||
in {
|
||||
options = {
|
||||
@ -204,7 +204,7 @@ in {
|
||||
# '';
|
||||
# };
|
||||
# in
|
||||
lib.mkIf cfg.enable {
|
||||
mkIf cfg.enable {
|
||||
home.packages = [pkgs.file];
|
||||
programs.joshuto = {
|
||||
enable = true;
|
||||
@ -223,7 +223,7 @@ in {
|
||||
column_ratio = [1 5 2];
|
||||
};
|
||||
preview = {
|
||||
# preview_script = lib.getExe pkgs.pistol;
|
||||
# preview_script = getExe pkgs.pistol;
|
||||
use_xdg_thumbs = true;
|
||||
xdg_thumb_size = "xxlarge";
|
||||
};
|
||||
|
@ -3,8 +3,8 @@
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption getExe;
|
||||
cfg = config.editor.helix;
|
||||
in {
|
||||
options = {
|
||||
@ -61,7 +61,7 @@ in {
|
||||
};
|
||||
};
|
||||
languages = {
|
||||
language-server = with lib; {
|
||||
language-server = {
|
||||
clangd.command = "${pkgs.clang-tools}/bin/clangd";
|
||||
markdown-oxide.command = getExe pkgs.markdown-oxide;
|
||||
# nil.command = getExe pkgs.nil;
|
||||
@ -74,7 +74,7 @@ in {
|
||||
{
|
||||
name = "nix";
|
||||
auto-format = true;
|
||||
formatter.command = lib.getExe pkgs.alejandra;
|
||||
formatter.command = getExe pkgs.alejandra;
|
||||
language-servers = ["nixd"];
|
||||
}
|
||||
# {
|
||||
@ -86,7 +86,7 @@ in {
|
||||
{
|
||||
name = "typst";
|
||||
auto-format = true;
|
||||
formatter.command = lib.getExe pkgs.typstyle;
|
||||
formatter.command = getExe pkgs.typstyle;
|
||||
language-servers = ["tinymist"];
|
||||
}
|
||||
{
|
||||
@ -109,7 +109,7 @@ in {
|
||||
# name = "rust";
|
||||
# auto-format = true;
|
||||
# language-servers = ["rust-analyzer"];
|
||||
# formatter.command = lib.getExe pkgs.rustfmt;
|
||||
# formatter.command = getExe pkgs.rustfmt;
|
||||
# }
|
||||
];
|
||||
};
|
||||
|
@ -1,15 +1,16 @@
|
||||
{
|
||||
pkgs,
|
||||
# pkgs-51b85c,
|
||||
lib,
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption;
|
||||
in {
|
||||
options = {
|
||||
editor.neovim.enable =
|
||||
lib.mkEnableOption "enable neovim text editor";
|
||||
mkEnableOption "enable neovim text editor";
|
||||
};
|
||||
config = lib.mkIf config.editors.neovim.enable {
|
||||
config = mkIf config.editors.neovim.enable {
|
||||
# stylix.targets.nixvim.enable = true;
|
||||
home.packages = with pkgs; [neovide];
|
||||
programs.nixvim = {
|
||||
|
@ -3,8 +3,8 @@
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption mkForce getExe;
|
||||
cfg = config.editor.zed;
|
||||
in {
|
||||
options = {
|
||||
@ -22,8 +22,8 @@ in {
|
||||
];
|
||||
userSettings = {
|
||||
vim_mode = true;
|
||||
ui_font_size = lib.mkForce 16;
|
||||
buffer_font_size = lib.mkForce 16;
|
||||
ui_font_size = mkForce 16;
|
||||
buffer_font_size = mkForce 16;
|
||||
features = {inline_completion_provider = "none";};
|
||||
auto_update = false;
|
||||
languages = {
|
||||
@ -33,13 +33,13 @@ in {
|
||||
"nixd"
|
||||
];
|
||||
formatter = {
|
||||
external.command = lib.getExe pkgs.alejandra;
|
||||
external.command = getExe pkgs.alejandra;
|
||||
};
|
||||
};
|
||||
"Rust" = {
|
||||
formatter = {
|
||||
external = {
|
||||
command = lib.getExe pkgs.rustfmt;
|
||||
command = getExe pkgs.rustfmt;
|
||||
arguments = ["--edition" "2021"];
|
||||
};
|
||||
};
|
||||
@ -49,7 +49,7 @@ in {
|
||||
format_on_save = "on";
|
||||
formatter = {
|
||||
external = {
|
||||
command = lib.getExe pkgs.typstyle;
|
||||
command = getExe pkgs.typstyle;
|
||||
arguments = ["-i" "{buffer_path}"];
|
||||
};
|
||||
};
|
||||
@ -76,39 +76,39 @@ in {
|
||||
rust-analyzer = {
|
||||
binary = {
|
||||
arguments = [];
|
||||
path = lib.getExe pkgs.rust-analyzer;
|
||||
path = getExe pkgs.rust-analyzer;
|
||||
};
|
||||
};
|
||||
ruff = {
|
||||
binary = {
|
||||
arguments = [];
|
||||
path = lib.getExe pkgs.ruff;
|
||||
path = getExe pkgs.ruff;
|
||||
};
|
||||
};
|
||||
nixd = {
|
||||
binary = {
|
||||
arguments = [];
|
||||
path = lib.getExe pkgs.nixd;
|
||||
path = getExe pkgs.nixd;
|
||||
};
|
||||
initialization_options.formatting.command = [(lib.getExe pkgs.alejandra)];
|
||||
initialization_options.formatting.command = [(getExe pkgs.alejandra)];
|
||||
};
|
||||
nil = {
|
||||
binary = {
|
||||
arguments = [];
|
||||
path = lib.getExe pkgs.nil;
|
||||
path = getExe pkgs.nil;
|
||||
};
|
||||
initialization_options.formatting.command = [(lib.getExe pkgs.alejandra)];
|
||||
initialization_options.formatting.command = [(getExe pkgs.alejandra)];
|
||||
};
|
||||
texlab = {
|
||||
binary = {
|
||||
arguments = [];
|
||||
path = lib.getExe pkgs.texlab;
|
||||
path = getExe pkgs.texlab;
|
||||
};
|
||||
};
|
||||
tinymist = {
|
||||
binary = {
|
||||
arguments = [];
|
||||
path = lib.getExe pkgs.tinymist;
|
||||
path = getExe pkgs.tinymist;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
Reference in New Issue
Block a user