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

nfs utils, changes to toothpick user defaults and some minor refactor

Browse Source
This commit is contained in:
cnst
2024-12-18 16:46:40 +01:00
parent 403875fe85
commit 2aa5867716
13 changed files with 220 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/nixos/programs/brightnessctl/default.nix
View File

@@ -1,18 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.nixos.programs.brightnessctl;
in {
options = {
nixos.programs.brightnessctl.enable = mkEnableOption "Enables brigthnessctl";
};
config = mkIf cfg.enable {
environment.systemPackages = [
pkgs.brightnessctl
];
};
}

37
modules/nixos/programs/misc/default.nix
View File

@@ -1,37 +0,0 @@
{
pkgs,
config,
lib,
...
}: let
inherit (lib) mkIf mkEnableOption mkOption mkMerge;
cfg = config.nixos.programs.misc;
in {
options = {
nixos.programs.misc = {
enable = mkEnableOption "Enables miscellaneous packages";
desktop.enable = mkOption {
type = lib.types.bool;
default = false;
description = "Whether to install desktop-specific packages.";
};
};
};
config = mkIf cfg.enable {
environment.systemPackages = mkMerge [
[
pkgs.nodejs_22
pkgs.tree
pkgs.gnome-disk-utility
pkgs.networkmanagerapplet
]
(mkIf cfg.desktop.enable [
pkgs.protonup
pkgs.winetricks
pkgs.wine
pkgs.geekbench
])
];
};
}

86
modules/nixos/programs/pkgs/default.nix Normal file
View File

@@ -0,0 +1,86 @@
{
pkgs,
config,
lib,
...
}: let
inherit (lib) mkIf mkOption mkMerge types;
cfg = config.nixos.programs.pkgs;
in {
options = {
nixos.programs.pkgs = {
enable = mkOption {
type = types.bool;
default = true;
description = "Whether to install default core packages.";
};
desktop.enable = mkOption {
type = types.bool;
default = false;
description = "Whether to install desktop-specific packages.";
};
laptop.enable = mkOption {
type = types.bool;
default = false;
description = "Whether to install laptop-specific packages.";
};
dev.enable = mkOption {
type = types.bool;
default = false;
description = "Whether to install development-specific packages.";
};
};
};
config = mkIf cfg.enable {
environment.systemPackages = with pkgs;
mkMerge [
[
git
stow
tree
gnome-disk-utility
networkmanagerapplet
]
(mkIf cfg.desktop.enable [
protonup
winetricks
wine
geekbench
])
(mkIf cfg.laptop.enable [
brightnessctl
])
(mkIf cfg.dev.enable [
nfs-utils
gcc
rust-analyzer
lua-language-server
nixd
nil
php
# php84Packages.php-cs-fixer
# phpactor
python312Packages.python-lsp-server
bash-language-server
clang-tools
marksman
pyright
# nodePackages_latest.intelephense
# Formatters
alejandra
stylua
nodePackages_latest.fixjson
nodePackages_latest.sql-formatter
prettierd
shfmt
luaformatter
black
])
];
};
}

15
modules/nixos/services/kanata/hhkbse.kbd
View File

@@ -27,7 +27,7 @@
tab q w e r t y u i o p å ' bspc
lctl a s d f g h j k l ö ä ret
@shift z x c v b n m , . - rsft
lalt lmet spc @level3 ralt
lalt lmet spc @level3 @ralt
)
(deflayer shift
@@ -35,7 +35,7 @@
tab S-q S-w S-e S-r S-t S-y S-u S-i S-o S-p S-å S-¨ bspc
lctl S-a S-s S-d S-f S-g S-h S-j S-k S-l S-ö S-ä S-ret
@shift S-z S-x S-c S-v S-b S-n S-m S-, S-. S-- rsft
lalt lmet spc @level3 ralt
lalt lmet spc @level3 @ralt
)
(deflayer level3
@@ -43,10 +43,19 @@
tab q w RA-5 r t y u i o ▲ å RA-¨ bspc
lctl a s d f g h j k ◀ ▼ ▶ ret
@shift RA-S-z RA-S-x c v b n m , . - rsft
lalt lmet spc @level3 ralt
lalt lmet spc @level3 @ralt
)
(deflayer ralt
esc 1 2 3 4 5 6 7 8 9 0 + pgdn pgup del
tab q w e r t y u i o p å ` bspc
lctl a s d f g h j k l ö ä ret
@shift z x c v b n m , . - rsft
lalt lmet spc @level3 @ralt
)
(defalias
shift (layer-toggle shift)
level3 (layer-toggle level3)
ralt (layer-toggle ralt)
)