jingus/nixconf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

init options, move ralph, fix wallpapers

Browse source
This commit is contained in:
jackjohn7 2026-03-28 20:32:24 -05:00
parent 401109204b
commit 85dd534f53
15 changed files with 123 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/features/hyprland/default.nix
View file

@ -14,13 +14,8 @@
self.nixosModules.wallpapers
];
options.hyprland-users = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [ ];
description = "List of users to configure hyprland for";
};
config = {
wallpaper-destinations = [ "Pictures/wallpapers" ];
# System-level configuration
programs.hyprland.enable = true;
@ -58,18 +53,13 @@
};
# Configure hjem for specified users
hjem = lib.mkIf (config.hyprland-users != [ ]) {
users = lib.genAttrs config.hyprland-users (username: {
hjem.users."${config.username}" = {
enable = true;
files = {
".config/hypr/hyprland.conf".source = ./hyprland.conf;
".config/hypr/hyprpaper.conf".source = ./hyprpaper.conf;
};
});
};
# Enable cursors for hyprland users
cursor-users = lib.mkDefault config.hyprland-users;
};
};
}

6
modules/features/hyprland/hyprland.conf
View file

@ -17,7 +17,7 @@ env = HYPRCURSOR_THEME,Bibata-Modern-Ice
# Set programs that you use
$terminal = kitty
$browser = firefox
$browser = librewolf
$fileManager = dolphin
$menu = wofi --show drun
@ -292,8 +292,8 @@ bindl = , XF86AudioPrev, exec, playerctl previous
# Example windowrule
windowrule {
name = firefox-on-w2
match:class = ^(firefox)$
name = librewolf-on-w2
match:class = ^(librewolf)$
workspace = 2
}
windowrule {

2
modules/features/hyprland/hyprpaper.conf
View file

@ -1,6 +1,6 @@
wallpaper {
monitor = eDP-1
path = /home/jingo/dev/dotfiles/wallpapers/Augustine/Augustine-catppuccin-mocha.png
path = ~/Pictures/wallpapers/Augustine/Augustine-catppuccin-mocha.png
fit_mode = cover
}

9
modules/features/layers/base.nix
View file

@ -3,8 +3,13 @@
flake.nixosModules.base =
{ pkgs, lib, ... }:
{
imports = [ inputs.hjem.nixosModules.default ];
imports = [
inputs.hjem.nixosModules.default
../../options.nix
];
config = {
username = "jingus";
nixpkgs.overlays = [ inputs.millennium.overlays.default ];
# Set your time zone.
time.timeZone = "America/Chicago";
@ -50,4 +55,6 @@
# List services that you want to enable:
};
};
}

21
modules/features/layers/cursors.nix
View file

@ -8,24 +8,7 @@
...
}:
{
options.cursor-users = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [ ];
description = "List of users to configure cursors for";
};
config = {
# Install cursor packages system-wide
environment.systemPackages = with pkgs; [
bibata-cursors
];
# Set up XDG data directories for cursor themes
environment.pathsToLink = [ "/share/icons" ];
# Configure hjem for specified users - set cursor theme in user config
hjem = lib.mkIf (config.cursor-users != [ ]) {
users = lib.genAttrs config.cursor-users (username: {
hjem.users."${config.username}" = {
enable = true;
files = {
# GTK cursor settings
@ -42,8 +25,6 @@
HYPRCURSOR_SIZE=24
'';
};
});
};
};
};
}

17
modules/features/layers/user.nix
View file

@ -1,20 +1,25 @@
{ self, inputs, ... }:
{
self,
inputs,
config,
...
}:
{
flake.nixosModules.user =
{ pkgs, lib, ... }:
{
# Define a user account. Don't forget to set a password with ‘passwd’.
users.users.jingus = {
users.users."${config.username}" = {
isNormalUser = true;
description = "jingus";
description = "${config.username} user account";
extraGroups = [
"networkmanager"
"wheel"
"docker"
"dialout"
];
shell = pkgs.zsh;
packages = with pkgs; [
# thunderbird
];
};
hjem.users."${config.username}".enable = true;
};
}

9
modules/features/layers/users/jingo.nix
View file

@ -1,9 +0,0 @@
{ self, inputs, ... }:
{
flake.nixosModules.user-jingo =
{ ... }:
{
hyprland-users = [ "jingo" ];
wallpaper-users = [ "jingo" ];
};
}

9
modules/features/layers/users/jingus.nix
View file

@ -1,9 +0,0 @@
{ self, inputs, ... }:
{
flake.nixosModules.user-jingus =
{ ... }:
{
niri-users = [ "jingus" ];
wallpaper-users = [ "jingus" ];
};
}

21
modules/features/layers/wallpapers.nix
View file

@ -8,29 +8,20 @@
...
}:
{
options.wallpaper-users = lib.mkOption {
options.wallpaper-destinations = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [ ];
description = "List of users to include wallpapers for";
};
options.wallpaper-destination = lib.mkOption {
type = lib.types.str;
default = "Pictures/Wallpapers";
description = "Destination path for wallpapers";
default = [];
description = "Destination paths for wallpapers";
};
config = {
hjem = lib.mkIf (config.wallpaper-users != [ ]) {
users = lib.genAttrs config.wallpaper-users (username: {
hjem.users."${config.username}" = {
enable = true;
files = {
"${config.wallpaper-destination}".source = pkgs.runCommand "wallpapers" { } ''
files = lib.genAttrs config.wallpaper-destinations (_: {
source = pkgs.runCommand "wallpapers" { } ''
mkdir -p $out
cp -r ${../../../assets/wallpapers}/* $out/
'';
};
});
};
};

11
modules/features/niri.nix
View file

@ -13,23 +13,14 @@
self.nixosModules.wallpapers
];
options.niri-users = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [ ];
description = "List of users to configure niri for";
};
config = {
programs.niri = {
enable = true;
package = self.packages.${pkgs.stdenv.hostPlatform.system}.myNiri;
};
# Enable cursors for niri users
cursor-users = lib.mkDefault config.niri-users;
# Set wallpaper destination explicitly
wallpaper-destination = "Pictures/Wallpapers";
wallpaper-destinations = [ "Pictures/Wallpapers" ];
};
};

16
modules/features/waybar/default.nix
View file

@ -14,8 +14,7 @@
];
# Configure hjem for specified users
hjem = lib.mkIf (config.hyprland-users != [ ]) {
users = lib.genAttrs config.hyprland-users (username: {
hjem.users."${config.username}" = {
enable = true;
files = {
".config/waybar/config.jsonc".source = ./config/config.jsonc;
@ -23,12 +22,15 @@
".config/waybar/power_menu.xml".source = ./config/power_menu.xml;
".config/waybar/mediaplayer.py".source = ./config/mediaplayer.py;
".config/waybar/icons/meson.build".source = ./config/icons/meson.build;
".config/waybar/icons/waybar_icons.gresource.xml".source = ./config/icons/waybar_icons.gresource.xml;
".config/waybar/icons/waybar-privacy-audio-input-symbolic.svg".source = ./config/icons/waybar-privacy-audio-input-symbolic.svg;
".config/waybar/icons/waybar-privacy-audio-output-symbolic.svg".source = ./config/icons/waybar-privacy-audio-output-symbolic.svg;
".config/waybar/icons/waybar-privacy-screen-share-symbolic.svg".source = ./config/icons/waybar-privacy-screen-share-symbolic.svg;
".config/waybar/icons/waybar_icons.gresource.xml".source =
./config/icons/waybar_icons.gresource.xml;
".config/waybar/icons/waybar-privacy-audio-input-symbolic.svg".source =
./config/icons/waybar-privacy-audio-input-symbolic.svg;
".config/waybar/icons/waybar-privacy-audio-output-symbolic.svg".source =
./config/icons/waybar-privacy-audio-output-symbolic.svg;
".config/waybar/icons/waybar-privacy-screen-share-symbolic.svg".source =
./config/icons/waybar-privacy-screen-share-symbolic.svg;
};
});
};
};
};

1
modules/hosts/desktop/configuration.nix
View file

@ -13,7 +13,6 @@
self.nixosModules.niri
self.nixosModules.librewolf
self.nixosModules.user
self.nixosModules.user-jingus
];
programs.firefox.enable = true;

16
modules/hosts/laptop/configuration.nix
View file

@ -11,7 +11,7 @@
self.nixosModules.development
self.nixosModules.librewolf
self.nixosModules.hyprland
self.nixosModules.user-jingo
self.nixosModules.user
];
# Bootloader.
@ -37,20 +37,6 @@
variant = "";
};
# Define a user account. Don't forget to set a password with ‘passwd’.
users.users.jingo = {
isNormalUser = true;
description = "j";
extraGroups = [
"networkmanager"
"wheel"
"docker"
"dialout"
];
packages = with pkgs; [ ];
shell = pkgs.zsh;
};
# Allow unfree packages
nixpkgs.config.allowUnfree = true;

8
modules/options.nix Normal file
View file

@ -0,0 +1,8 @@
{ lib, ... }:
{
options.username = lib.mkOption {
type = lib.types.str;
description = "Global username used across the evaluation.";
default = "jingus";
};
}

0
modules/features/ralph.nix → modules/packages/ralph.nix
View file