cnst/cnix
1
0
Fork 0
Code Issues Pull Requests Activity

fmt

Browse Source
This commit is contained in:
cnst
2025-08-29 15:25:40 +02:00
parent 26440bfeee
commit f3821f0dfa
201 changed files with 2461 additions and 1546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
flake.nix
View File

@@ -1,22 +1,36 @@
{
description = "cnix nix";
outputs = inputs:
outputs =
inputs:
inputs.flake-parts.lib.mkFlake { inherit inputs; } {
systems = ["x86_64-linux" "aarch64-linux"];
systems = [
"x86_64-linux"
"aarch64-linux"
];
imports = [
./users
./hosts
./modules
./pkgs
./fmt-hooks.nix
];
perSystem = {pkgs, ...}: {
devShells = import ./nix/shell {
inherit pkgs inputs;
perSystem =
{ config, pkgs, ... }:
{
devShells.default = pkgs.mkShell {
packages = [
pkgs.git
config.packages.repl
];
name = "dots";
env.DIRENV_LOG_FORMAT = "";
shellHook = ''
${config.pre-commit.installationScript}
'';
};
formatter = pkgs.alejandra;
};
};

3
fmt-hooks.nix
View File

@@ -1,4 +1,5 @@
{inputs, ...}: {
{ inputs, ... }:
{
imports = [
inputs.git-hooks.flakeModule
inputs.treefmt-nix.flakeModule

6
hosts/bunk/default.nix
View File

@@ -3,9 +3,11 @@
config,
pkgs,
...
}: let
}:
let
ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
in {
in
{
users.users.cnst = {
isNormalUser = true;
shell = pkgs.fish;

11
hosts/bunk/hardware-configuration.nix
View File

@@ -6,7 +6,8 @@
lib,
modulesPath,
...
}: {
}:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot = {
initrd = {
@@ -30,12 +31,16 @@
fsType = "ext4";
};
boot.initrd.luks.devices."luks-e75ac560-748f-4071-bbe7-479678400be3".device = "/dev/disk/by-uuid/e75ac560-748f-4071-bbe7-479678400be3";
boot.initrd.luks.devices."luks-e75ac560-748f-4071-bbe7-479678400be3".device =
"/dev/disk/by-uuid/e75ac560-748f-4071-bbe7-479678400be3";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/7E84-D168";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
options = [
"fmask=0022"
"dmask=0022"
];
};
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking

6
hosts/bunk/modules.nix
View File

@@ -29,7 +29,11 @@
enable = true;
interfaces = {
"wlp6s0" = {
allowedTCPPorts = [22 80 443];
allowedTCPPorts = [
22
80
443
];
};
};
};

23
hosts/default.nix
View File

@@ -4,8 +4,10 @@
homeImports,
self,
...
}: {
flake.nixosConfigurations = let
}:
{
flake.nixosConfigurations =
let
# custom paths
userConfig = "${self}/home";
systemConfig = "${self}/system";
@@ -21,8 +23,21 @@
inherit (inputs.nixpkgs.lib) nixosSystem;
# get these into the module system
specialArgs = {inherit inputs self userConfig systemConfig hostConfig cnstConfig toothpickConfig umodPath smodPath;};
in {
specialArgs = {
inherit
inputs
self
userConfig
systemConfig
hostConfig
cnstConfig
toothpickConfig
umodPath
smodPath
;
};
in
{
kima = nixosSystem {
inherit specialArgs;
modules = [

6
hosts/kima/default.nix
View File

@@ -3,9 +3,11 @@
config,
pkgs,
...
}: let
}:
let
ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
in {
in
{
users.users.cnst = {
isNormalUser = true;
shell = pkgs.fish;

22
hosts/kima/hardware-configuration.nix
View File

@@ -7,14 +7,25 @@
pkgs,
modulesPath,
...
}: {
}:
{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"ahci"
"usb_storage"
"usbhid"
"sd_mod"
];
boot.initrd.kernelModules = [ "amdgpu" ];
boot.kernelModules = ["kvm-amd" "i2c-dev"];
boot.kernelModules = [
"kvm-amd"
"i2c-dev"
];
boot.extraModulePackages = [ ];
fileSystems."/" = {
@@ -53,7 +64,10 @@
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/1D4A-3121";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
options = [
"fmask=0022"
"dmask=0022"
];
};
swapDevices = [ { device = "/dev/disk/by-uuid/91e16a5f-6a1c-4c7d-aa61-5823068fdaf0"; } ];

6
hosts/kima/modules.nix
View File

@@ -30,7 +30,11 @@
enable = true;
interfaces = {
"eno1" = {
allowedTCPPorts = [22 80 443];
allowedTCPPorts = [
22
80
443
];
};
};
};

9
hosts/sobotka/default.nix
View File

@@ -3,9 +3,11 @@
config,
pkgs,
...
}: let
}:
let
ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
in {
in
{
users.users.cnst = {
isNormalUser = true;
shell = pkgs.fish;
@@ -49,7 +51,8 @@ in {
./server.nix
];
boot.initrd.luks.devices."luks-47b35d4b-467a-4637-a5f9-45177da62897".device = "/dev/disk/by-uuid/47b35d4b-467a-4637-a5f9-45177da62897";
boot.initrd.luks.devices."luks-47b35d4b-467a-4637-a5f9-45177da62897".device =
"/dev/disk/by-uuid/47b35d4b-467a-4637-a5f9-45177da62897";
networking = {
hostName = "sobotka";

20
hosts/sobotka/hardware-configuration.nix
View File

@@ -7,12 +7,20 @@
pkgs,
modulesPath,
...
}: {
}:
{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"ahci"
"usbhid"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [ "amdgpu" ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
@@ -22,12 +30,16 @@
fsType = "ext4";
};
boot.initrd.luks.devices."luks-4f289fde-55ed-4b05-a6ee-d396db2a887b".device = "/dev/disk/by-uuid/4f289fde-55ed-4b05-a6ee-d396db2a887b";
boot.initrd.luks.devices."luks-4f289fde-55ed-4b05-a6ee-d396db2a887b".device =
"/dev/disk/by-uuid/4f289fde-55ed-4b05-a6ee-d396db2a887b";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/E03E-5458";
fsType = "vfat";
options = ["fmask=0077" "dmask=0077"];
options = [
"fmask=0077"
"dmask=0077"
];
};
swapDevices = [

17
hosts/sobotka/modules.nix
View File

@@ -21,7 +21,10 @@
};
graphics = {
enable = true;
vendors = ["intel" "amd"];
vendors = [
"intel"
"amd"
];
};
logitech = {
enable = false;
@@ -30,8 +33,16 @@
enable = true;
interfaces = {
"enp6s0" = {
allowedTCPPorts = [22 80 443 8090];
allowedUDPPorts = [58846 6881];
allowedTCPPorts = [
22
80
443
8090
];
allowedUDPPorts = [
58846
6881
];
};
};
};

3
hosts/sobotka/server.nix
View File

@@ -1,4 +1,5 @@
{config, ...}: {
{ config, ... }:
{
server = {
enable = true;
email = "adam@cnst.dev";

6
hosts/toothpc/default.nix
View File

@@ -3,9 +3,11 @@
config,
pkgs,
...
}: let
}:
let
ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
in {
in
{
users.users.toothpick = {
isNormalUser = true;
shell = pkgs.zsh;

11
hosts/toothpc/hardware-configuration.nix
View File

@@ -7,7 +7,8 @@
pkgs,
modulesPath,
...
}: {
}:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot = {
@@ -35,12 +36,16 @@
fsType = "ext4";
};
boot.initrd.luks.devices."luks-81dcb5e4-7adb-44ee-99df-69e366f8b735".device = "/dev/disk/by-uuid/81dcb5e4-7adb-44ee-99df-69e366f8b735";
boot.initrd.luks.devices."luks-81dcb5e4-7adb-44ee-99df-69e366f8b735".device =
"/dev/disk/by-uuid/81dcb5e4-7adb-44ee-99df-69e366f8b735";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/CA19-5F2A";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
options = [
"fmask=0022"
"dmask=0022"
];
};
swapDevices = [ ];

6
hosts/toothpc/modules.nix
View File

@@ -33,7 +33,11 @@
enable = true;
interfaces = {
"enp4s0" = {
allowedTCPPorts = [22 80 443];
allowedTCPPorts = [
22
80
443
];
};
};
};

6
hosts/ziggy/default.nix
View File

@@ -3,9 +3,11 @@
config,
pkgs,
...
}: let
}:
let
ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
in {
in
{
users.users.cnst = {
isNormalUser = true;
shell = pkgs.fish;

3
hosts/ziggy/hardware-configuration.nix
View File

@@ -7,7 +7,8 @@
pkgs,
modulesPath,
...
}: {
}:
{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];

12
hosts/ziggy/modules.nix
View File

@@ -30,8 +30,16 @@
enable = true;
interfaces = {
"enu1u1" = {
allowedTCPPorts = [22 80 443 8090];
allowedUDPPorts = [58846 6881];
allowedTCPPorts = [
22
80
443
8090
];
allowedUDPPorts = [
58846
6881
];
};
};
};

3
hosts/ziggy/server.nix
View File

@@ -1,4 +1,5 @@
{config, ...}: {
{ config, ... }:
{
server = {
enable = true;
email = "adam@cnst.dev";

58
lib/repl/default.nix Normal file
View File

@@ -0,0 +1,58 @@
# yanked from @fufexan
{
flakePath ? null,
hostnamePath ? "/etc/hostname",
registryPath ? /etc/nix/registry.json,
}:
let
inherit (builtins)
getFlake
head
match
currentSystem
readFile
pathExists
filter
fromJSON
;
selfFlake =
if pathExists registryPath then
filter (it: it.from.id == "self") (fromJSON (readFile registryPath)).flakes
else
[ ];
flakePath' = toString (
if flakePath != null then
flakePath
else if selfFlake != [ ] then
(head selfFlake).to.path
else
"/etc/nixos"
);
flake = if pathExists flakePath' then getFlake flakePath' else { };
hostname =
if pathExists hostnamePath then head (match "([a-zA-Z0-9\\-]+)\n" (readFile hostnamePath)) else "";
nixpkgsFromInputsPath = flake.inputs.nixpkgs.outPath or "";
nixpkgs =
flake.pkgs.${currentSystem}.nixpkgs
or (if nixpkgsFromInputsPath != "" then import nixpkgsFromInputsPath { } else { });
nixpkgsOutput = removeAttrs (nixpkgs // nixpkgs.lib or { }) [
"options"
"config"
];
in
{
inherit flake;
}
// flake
// builtins
// (flake.nixosConfigurations or { })
// flake.nixosConfigurations.${hostname} or { }
// nixpkgsOutput
// {
getFlake = path: getFlake (toString path);
}

6
modules/home/programs/aerc/default.nix
View File

@@ -4,10 +4,12 @@
osConfig,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.aerc;
in {
in
{
options = {
home.programs.aerc.enable = mkEnableOption "Enables aerc";
};

6
modules/home/programs/ags/default.nix
View File

@@ -4,10 +4,12 @@
pkgs,
inputs,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.ags;
in {
in
{
imports = [ inputs.ags.homeManagerModules.default ];
options = {
home.programs.ags.enable = mkEnableOption "Enables ags";

6
modules/home/programs/alacritty/default.nix
View File

@@ -2,10 +2,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.alacritty;
in {
in
{
options = {
home.programs.alacritty.enable = mkEnableOption "Enables firefox";
};

6
modules/home/programs/anyrun/default.nix
View File

@@ -3,10 +3,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.anyrun;
in {
in
{
imports = [
inputs.anyrun.homeManagerModules.default
];

6
modules/home/programs/bash/default.nix
View File

@@ -2,10 +2,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.bash;
in {
in
{
options = {
home.programs.bash.enable = mkEnableOption "Enables bash";
};

6
modules/home/programs/chromium/default.nix
View File

@@ -3,10 +3,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.chromium;
in {
in
{
options = {
home.programs.chromium.enable = mkEnableOption "Enables chromium";
};

34
modules/home/programs/discord/default.nix
View File

@@ -3,8 +3,14 @@
config,
lib,
...
}: let
inherit (lib) mkIf mkOption mkEnableOption types;
}:
let
inherit (lib)
mkIf
mkOption
mkEnableOption
types
;
# Workaround for https://github.com/GooseMod/OpenAsar/issues/202
# Needlessly complicated, but it's dynamic! :D
variantMapping = {
@@ -25,17 +31,25 @@
package = pkgs.vesktop;
};
};
getVariantConfig = variant:
if builtins.hasAttr variant variantMapping
then variantMapping.${variant}
else throw "Unknown package variant: ${variant}";
getVariantConfig =
variant:
if builtins.hasAttr variant variantMapping then
variantMapping.${variant}
else
throw "Unknown package variant: ${variant}";
cfg = config.home.programs.discord;
in {
in
{
options = {
home.programs.discord = {
enable = mkEnableOption "Enables discord";
variant = mkOption {
type = types.enum ["stable" "ptb" "canary" "vesktop"];
type = types.enum [
"stable"
"ptb"
"canary"
"vesktop"
];
default = "stable";
description = "Preferred package version to use";
};
@@ -48,9 +62,7 @@ in {
};
xdg.configFile = mkIf (cfg.variant == "vesktop") {
"vesktop/themes/base16.css".text =
/*
css
*/
# css
''
/**
* @name Material Gruvbox

6
modules/home/programs/eza/default.nix
View File

@@ -2,10 +2,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.eza;
in {
in
{
options = {
home.programs.eza.enable = mkEnableOption "Enables eza";
};

11
modules/home/programs/firefox/default.nix
View File

@@ -4,10 +4,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.firefox;
in {
in
{
imports = [
# inputs.nur.hmModules.nur
];
@@ -24,7 +26,10 @@ in {
force = true;
default = "ddg";
privateDefault = "ddg";
order = ["ddg" "google"];
order = [
"ddg"
"google"
];
};
bookmarks = { };
# extensions = with config.nur.repos.rycee.firefox-addons; [

14
modules/home/programs/fish/default.nix
View File

@@ -3,12 +3,14 @@
lib,
pkgs,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
inherit (lib.meta) getExe;
inherit (pkgs) eza bat;
cfg = config.home.programs.fish;
in {
in
{
options = {
home.programs.fish.enable = mkEnableOption "Enables fish home configuration";
};
@@ -59,17 +61,13 @@ in {
up-or-search = lib.readFile ./up-or-search.fish;
# Check stuff in PATH
nix-inspect =
/*
fish
*/
# fish
''
set -s PATH | grep "PATH\[.*/nix/store" | cut -d '|' -f2 | grep -v -e "-man" -e "-terminfo" | perl -pe 's:^/nix/store/\w{32}-([^/]*)/bin$:\1:' | sort | uniq
'';
};
interactiveShellInit =
/*
fish
*/
# fish
''
# Open command buffer in vim when alt+e is pressed
bind \ee edit_command_buffer

6
modules/home/programs/floorp/default.nix
View File

@@ -2,10 +2,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.floorp;
in {
in
{
options = {
home.programs.floorp.enable = mkEnableOption "Enables floorp browser";
};

6
modules/home/programs/foot/default.nix
View File

@@ -3,10 +3,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.foot;
in {
in
{
options = {
home.programs.foot.enable = mkEnableOption "Enables foot programs";
};

6
modules/home/programs/fuzzel/default.nix
View File

@@ -4,11 +4,13 @@
pkgs,
osConfig,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption mkMerge;
cfg = config.home.programs.fuzzel;
host = osConfig.networking.hostName;
in {
in
{
options = {
home.programs.fuzzel.enable = mkEnableOption "Enables fuzzel";
};

13
modules/home/programs/ghostty/default.nix
View File

@@ -4,11 +4,18 @@
osConfig,
pkgs,
...
}: let
inherit (lib) mkIf mkEnableOption mkMerge getExe;
}:
let
inherit (lib)
mkIf
mkEnableOption
mkMerge
getExe
;
cfg = config.home.programs.ghostty;
host = osConfig.networking.hostName;
in {
in
{
options = {
home.programs.ghostty.enable = mkEnableOption "Enables ghostty";
};

9
modules/home/programs/git/default.nix
View File

@@ -4,10 +4,12 @@
lib,
osConfig,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.git;
in {
in
{
options = {
home.programs.git.enable = mkEnableOption "Enables git";
};
@@ -31,7 +33,8 @@ in {
};
gpg = {
# format = lib.mkDefault "ssh";
ssh.allowedSignersFile = config.home.homeDirectory + "/" + config.xdg.configFile."git/allowed_signers".target;
ssh.allowedSignersFile =
config.home.homeDirectory + "/" + config.xdg.configFile."git/allowed_signers".target;
};
commit = {
verbose = true;

78
modules/home/programs/helix/default.nix
View File

@@ -4,10 +4,12 @@
lib,
config,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.helix;
in {
in
{
imports = [
./languages.nix
./gruvbox.nix
@@ -46,7 +48,12 @@ in {
display-messages = true;
display-inlay-hints = true;
};
gutters = ["diagnostics" "line-numbers" "spacer" "diff"];
gutters = [
"diagnostics"
"line-numbers"
"spacer"
"diff"
];
statusline = {
separator = "/";
left = [
@@ -78,7 +85,8 @@ in {
};
};
keys = let
keys =
let
spaceMode = {
space = "file_picker";
n = "global_search";
@@ -99,20 +107,40 @@ in {
P = "paste_before";
R = "replace_with_yanked";
};
in {
in
{
normal = {
d = {
d = ["extend_to_line_bounds" "yank_main_selection_to_clipboard" "delete_selection"];
d = [
"extend_to_line_bounds"
"yank_main_selection_to_clipboard"
"delete_selection"
];
s = [ "surround_delete" ];
};
x = "delete_selection";
y = {
y = ["extend_to_line_bounds" "yank_main_selection_to_clipboard" "normal_mode" "collapse_selection"];
y = [
"extend_to_line_bounds"
"yank_main_selection_to_clipboard"
"normal_mode"
"collapse_selection"
];
d = ":yank-diagnostic";
};
Y = ["extend_to_line_end" "yank_main_selection_to_clipboard" "collapse_selection"];
P = ["paste_clipboard_before" "collapse_selection"];
p = ["paste_clipboard_after" "collapse_selection"];
Y = [
"extend_to_line_end"
"yank_main_selection_to_clipboard"
"collapse_selection"
];
P = [
"paste_clipboard_before"
"collapse_selection"
];
p = [
"paste_clipboard_after"
"collapse_selection"
];
C-a = "select_all";
del = "delete_selection";
space = spaceMode;
@@ -122,14 +150,34 @@ in {
C-c = "yank_to_clipboard";
C-x = "completion";
del = "delete_selection";
esc = ["collapse_selection" "normal_mode"];
esc = [
"collapse_selection"
"normal_mode"
];
};
select = {
space = spaceMode;
d = ["yank_main_selection_to_clipboard" "delete_selection"];
x = ["yank_main_selection_to_clipboard" "delete_selection"];
y = ["yank_main_selection_to_clipboard" "normal_mode" "flip_selections" "collapse_selection"];
Y = ["extend_to_line_bounds" "yank_main_selection_to_clipboard" "goto_line_start" "collapse_selection" "normal_mode"];
d = [
"yank_main_selection_to_clipboard"
"delete_selection"
];
x = [
"yank_main_selection_to_clipboard"
"delete_selection"
];
y = [
"yank_main_selection_to_clipboard"
"normal_mode"
"flip_selections"
"collapse_selection"
];
Y = [
"extend_to_line_bounds"
"yank_main_selection_to_clipboard"
"goto_line_start"
"collapse_selection"
"normal_mode"
];
p = [ "replace_selections_with_clipboard" ];
P = [ "paste_clipboard_before" ];
};

48
modules/home/programs/helix/gruvbox.nix
View File

@@ -1,6 +1,7 @@
{
programs.helix.themes = {
gruvbox_custom = let
gruvbox_custom =
let
bg0 = "#32302f";
bg1 = "#3c3836";
bg2 = "#3c3836";
@@ -17,7 +18,8 @@
purple = "#d3869b";
grey0 = "#7c6f64";
grey2 = "#a89984";
in {
in
{
"type" = yellow;
"constant" = purple;
"constant.numeric" = purple;
@@ -71,8 +73,12 @@
modifiers = [ "bold" ];
};
"markup.list" = red;
"markup.bold" = {modifiers = ["bold"];};
"markup.italic" = {modifiers = ["italic"];};
"markup.bold" = {
modifiers = [ "bold" ];
};
"markup.italic" = {
modifiers = [ "italic" ];
};
"markup.link.url" = {
fg = blue;
modifiers = [ "underlined" ];
@@ -85,7 +91,9 @@
"diff.delta" = orange;
"diff.minus" = red;
"ui.background" = {bg = bg0;};
"ui.background" = {
bg = bg0;
};
"ui.background.separator" = grey0;
"ui.cursor" = {
fg = bg0;
@@ -103,9 +111,15 @@
fg = bg0;
bg = blue;
};
"ui.cursorline.primary" = {bg = bg1;};
"ui.cursorline.secondary" = {bg = bg1;};
"ui.selection" = {bg = bg3;};
"ui.cursorline.primary" = {
bg = bg1;
};
"ui.cursorline.secondary" = {
bg = bg1;
};
"ui.selection" = {
bg = bg3;
};
"ui.linenr" = grey0;
"ui.linenr.selected" = fg0;
"ui.statusline" = {
@@ -163,15 +177,25 @@
bg = blue;
modifiers = [ "bold" ];
};
"ui.virtual.whitespace" = {fg = bg4;};
"ui.virtual.indent-guide" = {fg = bg4;};
"ui.virtual.ruler" = {bg = bg3;};
"ui.virtual.whitespace" = {
fg = bg4;
};
"ui.virtual.indent-guide" = {
fg = bg4;
};
"ui.virtual.ruler" = {
bg = bg3;
};
"hint" = blue;
"info" = aqua;
"warning" = yellow;
"error" = red;
"diagnostic" = {underline = {style = "curl";};};
"diagnostic" = {
underline = {
style = "curl";
};
};
"diagnostic.hint" = {
underline = {
color = blue;

51
modules/home/programs/helix/languages.nix
View File

@@ -2,23 +2,37 @@
pkgs,
lib,
...
}: {
}:
{
programs.helix.languages = {
language = let
language =
let
deno = lang: {
command = lib.getExe pkgs.deno;
args = ["fmt" "-" "--ext" lang];
args = [
"fmt"
"-"
"--ext"
lang
];
};
prettier = lang: {
command = "prettier";
args = ["--parser" lang];
args = [
"--parser"
lang
];
};
prettierLangs = map (e: {
name = e;
formatter = prettier e;
});
langs = ["css" "scss" "html"];
langs = [
"css"
"scss"
"html"
];
in
[
{
@@ -26,7 +40,10 @@
auto-format = true;
formatter = {
command = lib.getExe pkgs.shfmt;
args = ["-i" "2"];
args = [
"-i"
"2"
];
};
}
{
@@ -36,7 +53,17 @@
{
name = "clojure";
injection-regex = "(clojure|clj|edn|boot|yuck)";
file-types = ["clj" "cljs" "cljc" "clje" "cljr" "cljx" "edn" "boot" "yuck"];
file-types = [
"clj"
"cljs"
"cljc"
"clje"
"cljr"
"cljx"
"edn"
"boot"
"yuck"
];
}
# {
# name = "cmake";
@@ -160,7 +187,9 @@
unstable = true;
suggest = {
completeFunctionCalls = false;
imports = {hosts."https://deno.land" = true;};
imports = {
hosts."https://deno.land" = true;
};
};
inlayHints = {
enumMemberValues.enabled = true;
@@ -198,7 +227,8 @@
typescript-language-server = {
command = lib.getExe pkgs.nodePackages.typescript-language-server;
args = [ "--stdio" ];
config = let
config =
let
inlayHints = {
includeInlayEnumMemberValueHints = true;
includeInlayFunctionLikeReturnTypeHints = true;
@@ -208,7 +238,8 @@
includeInlayPropertyDeclarationTypeHints = true;
includeInlayVariableTypeHints = true;
};
in {
in
{
typescript-language-server.source = {
addMissingImports.ts = true;
fixAll.ts = true;

6
modules/home/programs/hyprlock/default.nix
View File

@@ -5,13 +5,15 @@
lib,
osConfig,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.hyprlock;
hyprlockFlake = inputs.hyprlock.packages.${pkgs.system}.hyprlock;
# hyprlockPkg = pkgs.hyprlock;
in {
in
{
options = {
home.programs.hyprlock.enable = mkEnableOption "Enables hyprlock";
};

12
modules/home/programs/jujutsu/default.nix
View File

@@ -2,10 +2,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.jujutsu;
in {
in
{
options = {
home.programs.jujutsu.enable = mkEnableOption "Enables jujutsu";
};
@@ -25,9 +27,11 @@ in {
];
pager = "less -FRX";
};
signing = let
signing =
let
gitCfg = config.programs.git.extraConfig;
in {
in
{
backend = "ssh";
sign-all = true;
key = gitCfg.signing.key;

6
modules/home/programs/kitty/default.nix
View File

@@ -2,10 +2,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.kitty;
in {
in
{
options = {
home.programs.kitty.enable = mkEnableOption "Enables kitty programs";
};

6
modules/home/programs/lutris/default.nix
View File

@@ -3,10 +3,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.lutris;
in {
in
{
options = {
home.programs.lutris.enable = mkEnableOption "Enables lutris";
};

6
modules/home/programs/mangohud/default.nix
View File

@@ -2,10 +2,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.mangohud;
in {
in
{
options = {
home.programs.mangohud.enable = mkEnableOption "Enables mangohud";
};

6
modules/home/programs/mpv/default.nix
View File

@@ -3,10 +3,12 @@
lib,
pkgs,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.mpv;
in {
in
{
options = {
home.programs.mpv.enable = mkEnableOption "Enables mpv";
};

10
modules/home/programs/neovim/default.nix
View File

@@ -3,10 +3,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.neovim;
in {
in
{
imports = [
./plugins
./lsp.nix
@@ -22,9 +24,7 @@ in {
programs.neovim = {
enable = true;
extraLuaConfig =
/*
lua
*/
# lua
''
-- Use system clipboard
vim.opt.clipboard = "unnamedplus"

4
modules/home/programs/neovim/keybindings.nix
View File

@@ -2,9 +2,7 @@
config = {
programs.neovim = {
extraLuaConfig =
/*
lua
*/
# lua
''
-- Key mappings for various commands and navigation
vim.api.nvim_set_keymap("n", "<C-j>", "<C-e>", { noremap = true })

19
modules/home/programs/neovim/lsp.nix
View File

@@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.neovim.plugins = with pkgs.vimPlugins; [
# LSP and completions for injected langs
otter-nvim
@@ -8,9 +9,7 @@
plugin = nvim-lspconfig;
type = "lua";
config =
/*
lua
*/
# lua
''
local lspconfig = require("lspconfig")
@@ -56,9 +55,7 @@
plugin = ltex_extra-nvim;
type = "lua";
config =
/*
lua
*/
# lua
''
local ltex_extra = require("ltex_extra")
add_lsp(lspconfig.ltex, {
@@ -84,9 +81,7 @@
plugin = cmp-git;
type = "lua";
config =
/*
lua
*/
# lua
''
require("cmp_git").setup({})
'';
@@ -97,9 +92,7 @@
plugin = nvim-cmp;
type = "lua";
config =
/*
lua
*/
# lua
''
local cmp = require("cmp")

7
modules/home/programs/neovim/plugins/alpha.nix
View File

@@ -1,12 +1,11 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.neovim.plugins = with pkgs.vimPlugins; [
{
plugin = alpha-nvim;
type = "lua";
config =
/*
lua
*/
# lua
''
local alpha = require("alpha")
local dashboard = require("alpha.themes.dashboard")

7
modules/home/programs/neovim/plugins/autopairs.nix
View File

@@ -1,12 +1,11 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.neovim.plugins = with pkgs.vimPlugins; [
{
plugin = nvim-autopairs;
type = "lua";
config =
/*
lua
*/
# lua
''
require("nvim-autopairs").setup({})
'';

7
modules/home/programs/neovim/plugins/bqf.nix
View File

@@ -1,12 +1,11 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.neovim.plugins = with pkgs.vimPlugins; [
{
plugin = nvim-bqf;
type = "lua";
config =
/*
lua
*/
# lua
''
require("bqf").setup({})
'';

7
modules/home/programs/neovim/plugins/bufferline.nix
View File

@@ -1,12 +1,11 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.neovim.plugins = with pkgs.vimPlugins; [
{
plugin = bufferline-nvim;
type = "lua";
config =
/*
lua
*/
# lua
''
require("bufferline").setup({})
'';

7
modules/home/programs/neovim/plugins/colorizer.nix
View File

@@ -1,12 +1,11 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.neovim.plugins = with pkgs.vimPlugins; [
{
plugin = nvim-colorizer-lua;
type = "lua";
config =
/*
lua
*/
# lua
''
require("colorizer").setup({})
'';

7
modules/home/programs/neovim/plugins/comment.nix
View File

@@ -1,12 +1,11 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.neovim.plugins = with pkgs.vimPlugins; [
{
plugin = comment-nvim;
type = "lua";
config =
/*
lua
*/
# lua
''
require("Comment").setup({
opleader = {

7
modules/home/programs/neovim/plugins/conform.nix
View File

@@ -1,12 +1,11 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.neovim.plugins = with pkgs.vimPlugins; [
{
plugin = conform-nvim;
type = "lua";
config =
/*
lua
*/
# lua
''
require("conform").setup({
default_format_opts = {

7
modules/home/programs/neovim/plugins/copilot.nix
View File

@@ -1,12 +1,11 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.neovim.plugins = with pkgs.vimPlugins; [
{
plugin = copilot-lua;
type = "lua";
config =
/*
lua
*/
# lua
''
require("copilot").setup({
panel = {

3
modules/home/programs/neovim/plugins/default.nix
View File

@@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.neovim.plugins = with pkgs.vimPlugins; [
vim-illuminate
];

7
modules/home/programs/neovim/plugins/fidget.nix
View File

@@ -1,12 +1,11 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.neovim.plugins = with pkgs.vimPlugins; [
{
plugin = fidget-nvim;
type = "lua";
config =
/*
lua
*/
# lua
''
require("fidget").setup({
progress = {

7
modules/home/programs/neovim/plugins/fugitive.nix
View File

@@ -1,12 +1,11 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.neovim.plugins = with pkgs.vimPlugins; [
{
plugin = vim-fugitive;
type = "viml";
config =
/*
vim
*/
# vim
''
nmap <space>G :Git<CR>
'';

7
modules/home/programs/neovim/plugins/gitsigns.nix
View File

@@ -1,12 +1,11 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.neovim.plugins = with pkgs.vimPlugins; [
{
plugin = gitsigns-nvim;
type = "lua";
config =
/*
lua
*/
# lua
''
require("gitsigns").setup({
signs = {

7
modules/home/programs/neovim/plugins/lualine.nix
View File

@@ -1,12 +1,11 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.neovim.plugins = with pkgs.vimPlugins; [
{
plugin = lualine-nvim;
type = "lua";
config =
/*
lua
*/
# lua
''
require("lualine").setup({
options = {

7
modules/home/programs/neovim/plugins/none-ls.nix
View File

@@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.neovim = {
plugins = with pkgs.vimPlugins; [
none-ls-nvim
@@ -6,9 +7,7 @@
nvim-treesitter.withAllGrammars
];
extraConfig =
/*
lua
*/
# lua
''
-- Require necessary plugins
require("plenary")

7
modules/home/programs/neovim/plugins/oil.nix
View File

@@ -1,12 +1,11 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.neovim.plugins = with pkgs.vimPlugins; [
{
plugin = oil-nvim;
type = "lua";
config =
/*
lua
*/
# lua
''
require("oil").setup({
buf_options = {

7
modules/home/programs/neovim/plugins/plenary.nix
View File

@@ -1,12 +1,11 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.neovim.plugins = with pkgs.vimPlugins; [
{
plugin = plenary-nvim;
type = "lua";
config =
/*
lua
*/
# lua
''
require("plenary").setup({})
'';

7
modules/home/programs/neovim/plugins/range-highlight.nix
View File

@@ -1,12 +1,11 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.neovim.plugins = with pkgs.vimPlugins; [
{
plugin = range-highlight-nvim;
type = "lua";
config =
/*
lua
*/
# lua
''
require("range-highlight").setup({})
'';

7
modules/home/programs/neovim/plugins/treesitter.nix
View File

@@ -1,12 +1,11 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.neovim.plugins = with pkgs.vimPlugins; [
{
plugin = nvim-treesitter.withAllGrammars;
type = "lua";
config =
/*
lua
*/
# lua
''
require("nvim-treesitter.configs").setup({
highlight = {

7
modules/home/programs/neovim/plugins/web-devicons.nix
View File

@@ -1,12 +1,11 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.neovim.plugins = with pkgs.vimPlugins; [
{
plugin = nvim-web-devicons;
type = "lua";
config =
/*
lua
*/
# lua
''
require("nvim-web-devicons").setup({})
'';

7
modules/home/programs/neovim/plugins/which-key.nix
View File

@@ -1,12 +1,11 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.neovim.plugins = with pkgs.vimPlugins; [
{
plugin = which-key-nvim;
type = "lua";
config =
/*
lua
*/
# lua
''
require("which-key").setup({})
'';

15
modules/home/programs/neovim/syntaxes.nix
View File

@@ -3,7 +3,8 @@
config,
lib,
...
}: {
}:
{
programs.neovim = {
extraConfig =
lib.mkAfter # vim
@@ -34,15 +35,11 @@
{
plugin = vimtex;
config = let
viewMethod =
if config.programs.zathura.enable
then "zathura"
else "general";
config =
let
viewMethod = if config.programs.zathura.enable then "zathura" else "general";
in
/*
vim
*/
# vim
''
let g:vimtex_view_method = '${viewMethod}'
"Don't open automatically

6
modules/home/programs/nvf/default.nix
View File

@@ -5,10 +5,12 @@
pkgs,
inputs,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.nvf;
in {
in
{
options = {
home.programs.nvf.enable = mkEnableOption "Enables nvf (neovim)";
};

6
modules/home/programs/nwg-bar/default.nix
View File

@@ -3,10 +3,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.nwg-bar;
in {
in
{
options = {
home.programs.nwg-bar.enable = mkEnableOption "Enables nwg-bar";
};

17
modules/home/programs/pkgs/default.nix
View File

@@ -3,10 +3,18 @@
config,
lib,
...
}: let
inherit (lib) mkIf mkEnableOption mkOption types mkMerge;
}:
let
inherit (lib)
mkIf
mkEnableOption
mkOption
types
mkMerge
;
cfg = config.home.programs.pkgs;
in {
in
{
options = {
home.programs.pkgs = {
enable = mkEnableOption "Enables miscellaneous utility apps";
@@ -48,7 +56,8 @@ in {
};
};
home.packages = with pkgs;
home.packages =
with pkgs;
mkMerge [
[
cmatrix

6
modules/home/programs/rofi/default.nix
View File

@@ -3,10 +3,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.rofi;
in {
in
{
options = {
home.programs.rofi.enable = mkEnableOption "Enables firefox";
};

6
modules/home/programs/ssh/default.nix
View File

@@ -2,10 +2,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.ssh;
in {
in
{
options = {
home.programs.ssh.enable = mkEnableOption "Enables ssh";
};

22
modules/home/programs/steam/default.nix
View File

@@ -4,12 +4,20 @@
lib,
config,
...
}: let
inherit (lib) mkIf mkEnableOption concatStringsSep head filter getExe;
}:
let
inherit (lib)
mkIf
mkEnableOption
concatStringsSep
head
filter
getExe
;
cfg = config.home.programs.steam;
steam-with-pkgs = pkgs.steam.override {
extraPkgs = pkgs:
with pkgs; [
extraPkgs =
pkgs: with pkgs; [
xorg.libXcursor
xorg.libXi
xorg.libXinerama
@@ -25,7 +33,8 @@
};
monitor = head (filter (m: m.primary) config.monitors);
steam-session = let
steam-session =
let
gamescope = concatStringsSep " " [
(getExe pkgs.gamescope)
"--output-width ${toString monitor.width}"
@@ -50,7 +59,8 @@
Exec=${gamescope} -- ${steam}
Type=Application
'';
in {
in
{
options = {
home.programs.steam.enable = mkEnableOption "Enables steam";
};

6
modules/home/programs/tuirun/default.nix
View File

@@ -4,10 +4,12 @@
lib,
pkgs,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.tuirun;
in {
in
{
imports = [
inputs.tuirun.homeManagerModules.default
];

6
modules/home/programs/vscode/default.nix
View File

@@ -3,10 +3,12 @@
lib,
pkgs,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.vscode;
in {
in
{
options = {
home.programs.vscode.enable = mkEnableOption "Enables vscode";
};

6
modules/home/programs/waybar/default.nix
View File

@@ -3,7 +3,8 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.waybar;
# uwsm = lib.getExe pkgs.uwsm;
@@ -15,7 +16,8 @@
cp ${./config/style.css} $out/style.css
cp ${./config/config.jsonc} $out/config.jsonc
'';
in {
in
{
options = {
home.programs.waybar.enable = mkEnableOption "Enables waybar";
};

10
modules/home/programs/wezterm/default.nix
View File

@@ -4,13 +4,15 @@
lib,
inputs,
...
}: let
}:
let
enable_wayland = "true";
# weztermPkg = pkgs.wezterm;
weztermFlake = inputs.wezterm.packages.${pkgs.system}.default;
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.wezterm;
in {
in
{
options = {
home.programs.wezterm.enable = mkEnableOption "Enables wezterm programs";
};
@@ -19,9 +21,7 @@ in {
enable = true;
package = weztermFlake;
extraConfig =
/*
lua
*/
# lua
''
local wezterm = require 'wezterm'

12
modules/home/programs/yazi/default.nix
View File

@@ -3,10 +3,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.yazi;
in {
in
{
imports = [
./theme
];
@@ -25,7 +27,11 @@ in {
settings = {
manager = {
layout = [1 4 3];
layout = [
1
4
3
];
sort_by = "alphabetical";
sort_sensitive = true;
sort_reverse = false;

12
modules/home/programs/yazi/theme/help.nix
View File

@@ -1,8 +1,14 @@
{
programs.yazi.theme.help = {
on = {fg = "#fe8019";};
exec = {fg = "#83a598";};
desc = {fg = "#928374";};
on = {
fg = "#fe8019";
};
exec = {
fg = "#83a598";
};
desc = {
fg = "#928374";
};
hovered = {
bg = "#504945";
bold = true;

8
modules/home/programs/yazi/theme/input.nix
View File

@@ -1,8 +1,12 @@
{
programs.yazi.theme.input = {
border = {fg = "#bdae93";};
border = {
fg = "#bdae93";
};
title = { };
value = { };
selected = {reversed = true;};
selected = {
reversed = true;
};
};
}

26
modules/home/programs/yazi/theme/manager.nix
View File

@@ -1,13 +1,17 @@
{
programs.yazi.theme.manager = {
cwd = {fg = "#83a598";};
cwd = {
fg = "#83a598";
};
# Hovered
hovered = {
fg = "#282828";
bg = "#83a598";
};
preview_hovered = {underline = true;};
preview_hovered = {
underline = true;
};
# Find
find_keyword = {
@@ -47,11 +51,23 @@
# Border;
border_symbol = "│";
border_style = {fg = "#665c54";};
border_style = {
fg = "#665c54";
};
# Offset;
folder_offset = [1 0 1 0];
preview_offset = [1 1 1 1];
folder_offset = [
1
0
1
0
];
preview_offset = [
1
1
1
1
];
# Highlighting;
syntect_theme = "";

8
modules/home/programs/yazi/theme/select.nix
View File

@@ -1,7 +1,11 @@
{
programs.yazi.theme.select = {
border = {fg = "#504945";};
active = {fg = "#fe8019";};
border = {
fg = "#504945";
};
active = {
fg = "#fe8019";
};
inactive = { };
};
}

20
modules/home/programs/yazi/theme/status.nix
View File

@@ -39,10 +39,20 @@
};
# Permissions;
permissions_t = {fg = "#504945";};
permissions_r = {fg = "#b8bb26";};
permissions_w = {fg = "#fb4934";};
permissions_x = {fg = "#b8bb26";};
permissions_s = {fg = "#665c54";};
permissions_t = {
fg = "#504945";
};
permissions_r = {
fg = "#b8bb26";
};
permissions_w = {
fg = "#fb4934";
};
permissions_x = {
fg = "#b8bb26";
};
permissions_s = {
fg = "#665c54";
};
};
}

8
modules/home/programs/yazi/theme/tasks.nix
View File

@@ -1,7 +1,11 @@
{
programs.yazi.theme.tasks = {
border = {fg = "#504945";};
border = {
fg = "#504945";
};
title = { };
hovered = {underline = true;};
hovered = {
underline = true;
};
};
}

20
modules/home/programs/yazi/theme/which.nix
View File

@@ -1,10 +1,20 @@
{
programs.yazi.theme.which = {
mask = {bg = "#3c3836";};
cand = {fg = "#83a598";};
rest = {fg = "#928374";};
desc = {fg = "#fe8019";};
mask = {
bg = "#3c3836";
};
cand = {
fg = "#83a598";
};
rest = {
fg = "#928374";
};
desc = {
fg = "#fe8019";
};
separator = " ";
separator_style = {fg = "#504945";};
separator_style = {
fg = "#504945";
};
};
}

6
modules/home/programs/zathura/default.nix
View File

@@ -2,10 +2,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.zathura;
in {
in
{
options = {
home.programs.zathura.enable = mkEnableOption "Enables zathura";
};

6
modules/home/programs/zed-editor/default.nix
View File

@@ -2,10 +2,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.zed-editor;
in {
in
{
options = {
home.programs.zed-editor.enable = mkEnableOption "Enables zed-editor";
};

6
modules/home/programs/zellij/default.nix
View File

@@ -2,10 +2,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.zellij;
in {
in
{
options = {
home.programs.zellij.enable = mkEnableOption "Enables zellij";
};

6
modules/home/programs/zen/default.nix
View File

@@ -4,10 +4,12 @@
lib,
inputs,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.zen;
in {
in
{
options = {
home.programs.zen.enable = mkEnableOption "Enables zen browser";
};

6
modules/home/programs/zsh/default.nix
View File

@@ -3,12 +3,14 @@
lib,
pkgs,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
inherit (lib.meta) getExe;
inherit (pkgs) eza bat;
cfg = config.home.programs.zsh;
in {
in
{
options = {
home.programs.zsh.enable = mkEnableOption "Enables zsh home configuration";
};

6
modules/home/services/blueman-applet/default.nix
View File

@@ -2,10 +2,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.services.blueman-applet;
in {
in
{
options = {
home.services.blueman-applet.enable = mkEnableOption "Enables blueman-applet";
};

6
modules/home/services/copyq/default.nix
View File

@@ -2,10 +2,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.services.copyq;
in {
in
{
options = {
home.services.copyq.enable = mkEnableOption "Enables copyq";
};

6
modules/home/services/dconf/default.nix
View File

@@ -2,10 +2,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) types mkOption;
cfg = config.home.services.dconf;
in {
in
{
options = {
home.services.dconf.settings.color-scheme = mkOption {
type = types.str;

6
modules/home/services/dunst/default.nix
View File

@@ -3,10 +3,12 @@
lib,
pkgs,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.services.dunst;
in {
in
{
options = {
home.services.dunst.enable = mkEnableOption "Enables dunst";
};

6
modules/home/services/gpg/default.nix
View File

@@ -3,10 +3,12 @@
lib,
pkgs,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.services.gpg;
in {
in
{
options = {
home.services.gpg.enable = mkEnableOption "Enables gpg";
};

6
modules/home/services/gtk/default.nix
View File

@@ -3,10 +3,12 @@
config,
lib,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.services.gtk;
in {
in
{
options = {
home.services.gtk.enable = mkEnableOption "Enables miscellaneous GTK elements";
};

6
modules/home/services/gtk/wip.nix
View File

@@ -3,10 +3,12 @@
pkgs,
lib,
...
}: let
}:
let
inherit (lib) types mkOption mkIf;
cfg = config.home.userd.gtk;
in {
in
{
options = {
home.userd.gtk.enable = mkOption {
type = types.bool;

6
modules/home/services/hypridle/default.nix
View File

@@ -4,13 +4,15 @@
pkgs,
inputs,
...
}: let
}:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.services.hypridle;
hypridleFlake = inputs.hypridle.packages.${pkgs.system}.hypridle;
# hypridlePkg = pkgs.hypridle;
in {
in
{
options = {
home.services.hypridle.enable = mkEnableOption "Enables hypridle";
};

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