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

some minor refactor

Browse Source
This commit is contained in:
cnst
2025-01-02 17:53:12 +01:00
parent d44ad67865
commit eb6727e458
20 changed files with 139 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/default.nix
View File

@@ -120,6 +120,7 @@
options = {
imports = [
./options/monitors
./options/theme
];
};
};

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

@@ -9,7 +9,6 @@
inherit (pkgs) eza bat;
cfg = config.home.programs.fish;
in {
# imports = [./tide.nix];
options = {
home.programs.fish.enable = mkEnableOption "Enables fish home configuration";
};
@@ -24,8 +23,10 @@ in {
];
shellAbbrs = {
extract = "extract.sh";
homemodules = "$EDITOR /home/$USER/.nix-config/users/$USER/modules.nix";
hmod = "$EDITOR /home/$USER/.nix-config/users/$USER/modules.nix";
homemodules = "$EDITOR /home/$USER/.nix-config/users/$USER/modules/home.nix";
hmod = "$EDITOR /home/$USER/.nix-config/users/$USER/modules/home.nix";
homeoptions = "$EDITOR /home/$USER/.nix-config/users/$USER/modules/options.nix";
hopt = "$EDITOR /home/$USER/.nix-config/users/$USER/modules/options.nix";
nixosmodules = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
nmod = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
nixcleanboot = "sudo nix run /home/$USER/.nix-config#cleanup-boot";
@@ -46,7 +47,8 @@ in {
cat = "${getExe bat} --style=plain";
ls = "${getExe eza} -h --git --icons --color=auto --group-directories-first -s extension";
ll = "${getExe eza} -l --git --icons --color=auto --group-directories-first -s extension";
la = "${getExe eza} -lah --tree";
lat = "${getExe eza} -lah --tree --color=auto --group-directories-first -s extension";
la = "${getExe eza} -lah --color=auto --group-directories-first -s extension";
# Clear screen and scrollback
clear = "printf '\\033[2J\\033[3J\\033[1;1H'";
};

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

@@ -9,8 +9,8 @@
cfg = config.home.programs.helix;
in {
imports = [
./lang.nix
./theme.nix
./languages.nix
./gruvbox.nix
];
options = {

0
modules/home/programs/helix/theme.nix → modules/home/programs/helix/gruvbox.nix
View File

0
modules/home/programs/helix/lang.nix → modules/home/programs/helix/languages.nix
View File

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

@@ -30,7 +30,7 @@ in {
background = [
{
monitor = "";
path = "~/media/images/l_ash09_big.jpg";
path = config.theme.background.lockscreen;
}
];
input-field = [

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

@@ -24,11 +24,14 @@ in {
cat = "${getExe bat} --style=plain";
ls = "${getExe eza} -h --git --icons --color=auto --group-directories-first -s extension";
ll = "${getExe eza} -l --git --icons --color=auto --group-directories-first -s extension";
la = "${getExe eza} -lah --tree";
lat = "${getExe eza} -lah --tree";
la = "${getExe eza} -lah";
tree = "${getExe eza} --tree --icons=always";
extract = "extract.sh";
homemodules = "$EDITOR /home/$USER/.nix-config/users/$USER/modules.nix";
hmod = "$EDITOR /home/$USER/.nix-config/users/$USER/modules.nix";
homemodules = "$EDITOR /home/$USER/.nix-config/users/$USER/modules/home.nix";
hmod = "$EDITOR /home/$USER/.nix-config/users/$USER/modules/home.nix";
homeoptions = "$EDITOR /home/$USER/.nix-config/users/$USER/modules/options.nix";
hopt = "$EDITOR /home/$USER/.nix-config/users/$USER/modules/options.nix";
nixosmodules = "$EDITOR /home/$USER/.nix-config/hosts/$HOST/modules.nix";
nmod = "$EDITOR /home/$USER/.nix-config/hosts/$HOST/modules.nix";
nixcleanboot = "sudo nix run /home/$USER/.nix-config#cleanup-boot";

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

@@ -20,7 +20,7 @@ in {
name = "Adwaita";
size = 28;
gtk.enable = true;
x11.enable = true;
x11.enable = false;
};
};
gtk = {

16
modules/home/services/hyprpaper/default.nix
View File

@@ -1,5 +1,6 @@
{
config,
osConfig,
lib,
pkgs,
inputs,
@@ -24,9 +25,9 @@ in {
splash_offset = 2.0;
preload = [
"~/media/images/l_ash08_big.jpg"
"~/media/images/l_ash09_big.jpg"
"~/media/images/l_int06_big.jpg"
"~/media/images/bg_1.jpg"
"~/media/images/bg_2.jpg"
"~/media/images/bg_3.jpg"
"~/media/images/by_housevisit_2560.jpg"
"~/media/images/nix.png"
"~/media/images/stacks.png"
@@ -42,12 +43,11 @@ in {
wallpaper = [
# cnix
"DP-3,~/media/images/l_ash08_big.jpg"
# adampad
"eDP-1,~/media/images/l_ash08_big.jpg"
"DP-3,${config.theme.background.desktop}"
# cnixpad
"eDP-1,${config.theme.background.desktop}"
# toothpc
"DVI-D-1,~/media/images/l_ash08_big.jpg"
# "DP-1,/share/wallpapers/cat_pacman.png"
"DVI-D-1,${config.theme.background.desktop}"
];
};
};

27
modules/home/services/xdg/default.nix
View File

@@ -6,7 +6,7 @@
}: let
inherit (lib) mkIf mkEnableOption mkForce elem;
browser =
if elem osConfig.networking.hostName ["cnix" "cnixpad" "toothpc"]
if elem osConfig.networking.hostName ["cnix" "cnixpad"]
then "zen.desktop"
else "firefox.desktop";
cfg = config.home.services.xdg;
@@ -15,6 +15,31 @@ in {
home.services.xdg.enable = mkEnableOption "Enables XDG settings";
};
config = mkIf cfg.enable {
xresources.properties = {
"Xcursor.size" = config.home.pointerCursor.size;
"Xcursor.theme" = config.home.pointerCursor.name;
"XTerm*.foreground" = "#d5c4a1";
"XTerm*.background" = "#282828";
"XTerm*.cursorColor" = "#d5c4a1";
"XTerm*.color0" = "#282828";
"XTerm*.color1" = "#fb4934";
"XTerm*.color2" = "#b8bb26";
"XTerm*.color3" = "#fabd2f";
"XTerm*.color4" = "#83a598";
"XTerm*.color5" = "#d3869b";
"XTerm*.color6" = "#8ec07c";
"XTerm*.color7" = "#d5c4a1";
"XTerm*.color8" = "#665c54";
"XTerm*.color9" = "#fe8019";
"XTerm*.color10" = "#3c3836";
"XTerm*.color11" = "#504945";
"XTerm*.color12" = "#bdae93";
"XTerm*.color13" = "#ebdbb2";
"XTerm*.color14" = "#d65d0e";
"XTerm*.color15" = "#fbf1c7";
};
xdg = {
userDirs = {
enable = true;

28
modules/options/theme/default.nix Normal file
View File

@@ -0,0 +1,28 @@
{
lib,
config,
...
}: let
inherit (lib) mkOption types;
bgs = {
wallpaper_1 = "~/media/images/bg_1.jpg";
wallpaper_2 = "~/media/images/bg_2.jpg";
wallpaper_3 = "~/media/images/bg_3.jpg";
};
bgList = builtins.attrNames bgs;
in {
options.theme = {
background = {
lockscreen = mkOption {
type = types.enum bgList;
apply = name: bgs.${name};
example = "wallpaper_2";
};
desktop = mkOption {
type = types.enum bgList;
apply = name: bgs.${name};
example = "wallpaper_1";
};
};
};
}