ringofstorms/dotfiles
ringofstorms/dotfiles
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

attempt oren update to latest style

Browse source
This commit is contained in:
RingOfStorms (Joshua Bell) 2025-10-22 00:12:27 -05:00
parent 303afdceb6
commit ef1eb99b46
14 changed files with 730 additions and 834 deletions
Download patch file Download diff file Expand all files Collapse all files

170
flakes/hyprland/default.nix
View file

@ -1,170 +0,0 @@
{
config,
lib,
pkgs,
hyprland,
hyprlandPkgs,
...
}:
let
ccfg = import ../../config.nix;
cfg_path = [
ccfg.custom_config_key
"desktopEnvironment"
"hyprland"
];
cfg = lib.attrsets.getAttrFromPath cfg_path config;
in
with lib;
{
options =
{ }
// lib.attrsets.setAttrByPath cfg_path {
enable = lib.mkEnableOption "hyprland desktop environment";
terminalCommand = mkOption {
type = lib.types.str;
default = "foot";
description = "The terminal command to use.";
};
extraOptions = mkOption {
type = lib.types.attrs;
default = { };
description = "Extra options for Hyprland configuration.";
};
hyprpaperSettings = lib.mkOption {
type = lib.types.attrs;
default = { };
description = "Extra options for hyprpaper configuration.";
};
swaync = {
enable = lib.mkEnableOption "Enable Swaync (notification center for Hyprland)";
};
waybar = {
enable = lib.mkEnableOption "Enable Waybar (status bar for Hyprland)";
};
};
config = lib.mkIf cfg.enable {
# Enable for all users
home-manager = {
sharedModules = [
hyprland.homeManagerModules.default
./home_manager
];
};
services.greetd = {
enable = true;
vt = 2;
settings = {
default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --remember-session --cmd '${pkgs.dbus}/bin/dbus-run-session ${hyprlandPkgs.hyprland}/bin/Hyprland'";
user = "greeter";
};
};
};
# Caps Lock as Escape for console/tty
console.useXkbConfig = true;
services.xserver.xkb = {
layout = "us";
options = "caps:escape";
};
environment.systemPackages = with pkgs; [
wl-clipboard
wl-clip-persist
wofi # application launcher
nemo # file manager (x11)
# nautilus # file manager
feh # image viewer (x11)
# imv # image viewer
networkmanager # network management
upower # power management
brightnessctl # screen/keyboard brightness control
wireplumber # media session manager
libgtop # system monitor library
bluez # Bluetooth support
power-profiles-daemon # power profiles
grim
slurp
hyprpicker
grimblast # screenshot tool
wf-recorder # screen recording tool
btop # system monitor
];
services.blueman.enable = config.hardware.bluetooth.enable;
programs.hyprland = {
enable = true;
# xwayland.enable = false;
# withUWSM = true;
# set the flake package
package = hyprlandPkgs.hyprland;
# make sure to also set the portal package, so that they are in sync
# This is set below now in xdf portal directly so we can also add things like gtk
# portalPackage = hyprlandPkgs.xdg-desktop-portal-hyprland;
};
xdg.portal = {
enable = true;
extraPortals = lib.mkForce [
hyprlandPkgs.xdg-desktop-portal-hyprland
# hyprlandPkgs.xdg-desktop-portal-wlr
hyprlandPkgs.xdg-desktop-portal-gtk
];
config.common.default = [
"hyprland"
# "wlr"
"gtk"
];
};
# Enable PipeWire + WirePlumber so xdg-desktop-portal can do screencast
services.pipewire = {
enable = true;
# Enable WirePlumber session manager via the pipewire module option
wireplumber = {
enable = true;
};
};
hardware.graphics = {
enable = true;
package = hyprlandPkgs.mesa;
# if you also want 32-bit support (e.g for Steam)
# enable32Bit = true;
package32 = hyprlandPkgs.pkgsi686Linux.mesa;
};
# Environment variables
environment.sessionVariables = {
GTK_THEME = "Adwaita:dark";
XDG_SESSION_TYPE = "wayland";
# XDG_CURRENT_DESKTOP = "sway";
# XDG_SESSION_DESKTOP = "sway";
# prefer EGL renderer (can be changed back to "auto" if needed)
WLR_RENDERER = "egl";
# Tell apps to run native wayland
NIXOS_OZONE_WL = "1";
ELECTRON_OZONE_PLATFORM_HINT = "wayland";
ELECTRON_ENABLE_WAYLAND = "1";
ELECTRON_DISABLE_SANDBOX = "0";
GDK_BACKEND = "wayland,x11"; # GTK
QT_QPA_PLATFORM = "wayland;xcb"; # Qt 5/6
MOZ_ENABLE_WAYLAND = "1"; # Firefox
SDL_VIDEODRIVER = "wayland"; # SDL apps/games
CLUTTER_BACKEND = "wayland";
};
# Qt theming
qt = {
enable = true;
platformTheme = "gtk2";
style = "adwaita-dark";
};
};
}

3
flakes/hyprland/flake.nix
View file

@ -1,6 +1,6 @@
{
inputs = {
ragenix.url = "github:yaxitech/ragenix";
hyprland.url = "github:hyprwm/Hyprland";
};
outputs =
@ -20,6 +20,7 @@
{
imports = [
hyprland.nixosModules.default
./hyprland.nix
];
config = {
_module.args = {

15
flakes/hyprland/home_manager/hyprland.nix
View file

@ -4,15 +4,6 @@
hyprlandPkgs,
...
}:
let
ccfg = import ../../../config.nix;
cfg_path = [
ccfg.custom_config_key
"desktopEnvironment"
"hyprland"
];
cfg = lib.attrsets.getAttrFromPath cfg_path osConfig;
in
{
wayland.windowManager.hyprland = {
enable = true;
@ -21,7 +12,7 @@ in
# hyprspace
# ];
settings = lib.attrsets.recursiveUpdate {
settings = {
# Debug logs enabled when this is uncommented
debug.disable_logs = false;
debug.disable_time = false;
@ -89,7 +80,7 @@ in
bind = [
# Applications
"$mainMod, Return, exec, ${cfg.terminalCommand}"
"$mainMod, Return, exec, foot"
"$mainMod, Space, exec, pkill wofi || wofi --show drun"
"$mainMod, q, killactive"
"$mainMod SHIFT, escape, exit"
@ -171,6 +162,6 @@ in
"$mainMod, mouse:273, resizewindow"
];
} cfg.extraOptions;
};
};
}

14
flakes/hyprland/home_manager/hyprpaper.nix
View file

@ -1,22 +1,8 @@
{
osConfig,
lib,
...
}:
let
ccfg = import ../../../config.nix;
cfg_path = [
ccfg.custom_config_key
"desktopEnvironment"
"hyprland"
];
cfg = lib.attrsets.getAttrFromPath cfg_path osConfig;
in
{
config = {
services.hyprpaper = {
enable = true;
settings = cfg.hyprpaperSettings;
};
};
}

11
flakes/hyprland/home_manager/quickshell.nix
View file

@ -1,19 +1,8 @@
{
osConfig,
lib,
pkgs,
upkgs,
...
}:
let
ccfg = import ../../../config.nix;
cfg_path = [
ccfg.custom_config_key
"desktopEnvironment"
"hyprland"
];
cfg = lib.attrsets.getAttrFromPath cfg_path osConfig;
in
{
home.packages = with pkgs; [
upkgs.quickshell

14
flakes/hyprland/home_manager/swaync.nix
View file

@ -1,20 +1,7 @@
{
lib,
osConfig,
...
}:
let
ccfg = import ../../../config.nix;
cfg_path = [
ccfg.custom_config_key
"desktopEnvironment"
"hyprland"
"swaync"
];
cfg = lib.attrsets.getAttrFromPath cfg_path osConfig;
in
{
config = lib.mkIf cfg.enable {
services.swaync = {
enable = true;
settings = {
@ -247,5 +234,4 @@ in
}
'';
};
};
}

18
flakes/hyprland/home_manager/template.nix
View file

@ -1,18 +0,0 @@
{
osConfig,
lib,
pkgs,
...
}:
let
ccfg = import ../../../config.nix;
cfg_path = [
ccfg.custom_config_key
"desktopEnvironment"
"hyprland"
];
cfg = lib.attrsets.getAttrFromPath cfg_path osConfig;
in
{
}

15
flakes/hyprland/home_manager/waybar.nix
View file

@ -1,17 +1,5 @@
{ lib, osConfig, ... }:
let
ccfg = import ../../../config.nix;
cfg_path = [
ccfg.custom_config_key
"desktopEnvironment"
"hyprland"
"waybar"
];
cfg = lib.attrsets.getAttrFromPath cfg_path osConfig;
in
{ lib, ... }:
{
config = lib.mkIf cfg.enable {
programs.waybar = {
enable = true;
systemd.enable = true;
@ -254,5 +242,4 @@ in
style = builtins.readFile ./waybar/waybar.css;
};
};
}

132
flakes/hyprland/hyprland.nix Normal file
View file

@ -0,0 +1,132 @@
{
config,
lib,
pkgs,
hyprland,
hyprlandPkgs,
...
}:
with lib;
{
# Enable for all users
home-manager = {
sharedModules = [
hyprland.homeManagerModules.default
./home_manager
];
};
services.greetd = {
enable = true;
vt = 2;
settings = {
default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --remember-session --cmd '${pkgs.dbus}/bin/dbus-run-session ${hyprlandPkgs.hyprland}/bin/Hyprland'";
user = "greeter";
};
};
};
# Caps Lock as Escape for console/tty
console.useXkbConfig = true;
services.xserver.xkb = {
layout = "us";
options = "caps:escape";
};
environment.systemPackages = with pkgs; [
wl-clipboard
wl-clip-persist
wofi # application launcher
nemo # file manager (x11)
# nautilus # file manager
feh # image viewer (x11)
# imv # image viewer
networkmanager # network management
upower # power management
brightnessctl # screen/keyboard brightness control
wireplumber # media session manager
libgtop # system monitor library
bluez # Bluetooth support
power-profiles-daemon # power profiles
grim
slurp
hyprpicker
grimblast # screenshot tool
wf-recorder # screen recording tool
btop # system monitor
];
services.blueman.enable = config.hardware.bluetooth.enable;
programs.hyprland = {
enable = true;
# xwayland.enable = false;
# withUWSM = true;
# set the flake package
package = hyprlandPkgs.hyprland;
# make sure to also set the portal package, so that they are in sync
# This is set below now in xdf portal directly so we can also add things like gtk
# portalPackage = hyprlandPkgs.xdg-desktop-portal-hyprland;
};
xdg.portal = {
enable = true;
extraPortals = lib.mkForce [
hyprlandPkgs.xdg-desktop-portal-hyprland
# hyprlandPkgs.xdg-desktop-portal-wlr
hyprlandPkgs.xdg-desktop-portal-gtk
];
config.common.default = [
"hyprland"
# "wlr"
"gtk"
];
};
# Enable PipeWire + WirePlumber so xdg-desktop-portal can do screencast
services.pipewire = {
enable = true;
# Enable WirePlumber session manager via the pipewire module option
wireplumber = {
enable = true;
};
};
hardware.graphics = {
enable = true;
package = hyprlandPkgs.mesa;
# if you also want 32-bit support (e.g for Steam)
# enable32Bit = true;
package32 = hyprlandPkgs.pkgsi686Linux.mesa;
};
# Environment variables
environment.sessionVariables = {
GTK_THEME = "Adwaita:dark";
XDG_SESSION_TYPE = "wayland";
# XDG_CURRENT_DESKTOP = "sway";
# XDG_SESSION_DESKTOP = "sway";
# prefer EGL renderer (can be changed back to "auto" if needed)
WLR_RENDERER = "egl";
# Tell apps to run native wayland
NIXOS_OZONE_WL = "1";
ELECTRON_OZONE_PLATFORM_HINT = "wayland";
ELECTRON_ENABLE_WAYLAND = "1";
ELECTRON_DISABLE_SANDBOX = "0";
GDK_BACKEND = "wayland,x11"; # GTK
QT_QPA_PLATFORM = "wayland;xcb"; # Qt 5/6
MOZ_ENABLE_WAYLAND = "1"; # Firefox
SDL_VIDEODRIVER = "wayland"; # SDL apps/games
CLUTTER_BACKEND = "wayland";
};
# Qt theming
qt = {
enable = true;
platformTheme = "gtk2";
style = "adwaita-dark";
};
}

6
hosts/lio/configuration.nix
View file

@ -1,5 +1,4 @@
{
upkgs,
pkgs,
...
}:
@ -46,11 +45,6 @@
nodejs_24
foot
vlc
upkgs.ladybird
google-chrome
trilium-desktop
dig
traceroute
# opensnitch-ui
];
}

1
hosts/oren/configuration.nix
View file

@ -5,7 +5,6 @@
...
}:
{
system.stateVersion = "24.11"; # Did you read the comment?
environment.systemPackages = with pkgs; [
# [Laptop] Battery status
acpi

207
hosts/oren/flake.nix
View file

@ -1,11 +1,17 @@
{
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager.url = "github:rycee/home-manager/release-25.05";
# Use relative to get current version for testing
# common.url = "path:../../common";
common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles";
# Use relative to get current version for testin
# common.url = "path:../../flakes/common";
common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/common";
# secrets.url = "path:../../flakes/secrets";
secrets.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/secrets";
# flatpaks.url = "path:../../flakes/flatpaks";
flatpaks.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/flatpaks";
hyprland.url = "path:../../flakes/hyprland";
# hyprland.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/hyprland";
ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim";
};
@ -13,30 +19,123 @@
outputs =
{
nixpkgs,
nixpkgs-unstable,
home-manager,
common,
secrets,
flatpaks,
hyprland,
ros_neovim,
...
}:
let
configuration_name = "oren";
system = "x86_64-linux";
stateVersion = "25.05";
primaryUser = "josh";
lib = nixpkgs.lib;
in
{
nixosConfigurations = {
"${configuration_name}" = (
lib.nixosSystem {
inherit system;
modules = [
common.nixosModules.default
home-manager.nixosModules.default
secrets.nixosModules.default
ros_neovim.nixosModules.default
flatpaks.nixosModules.default
hyprland.nixosModules.default
common.nixosModules.essentials
common.nixosModules.git
common.nixosModules.tmux
common.nixosModules.boot_systemd
common.nixosModules.hardening
common.nixosModules.jetbrains_font
common.nixosModules.nix_options
common.nixosModules.podman
common.nixosModules.tailnet
common.nixosModules.timezone_auto
common.nixosModules.tty_caps_esc
common.nixosModules.zsh
./configuration.nix
./hardware-configuration.nix
# ./sway_customizations.nix
./hyprland_customizations.nix
(
{ config, pkgs, ... }:
{
rec {
# Home Manager
home-manager = {
useUserPackages = true;
useGlobalPkgs = true;
backupFileExtension = "bak";
# add all normal users to home manager so it applies to them
users = lib.mapAttrs (name: user: {
home.stateVersion = stateVersion;
programs.home-manager.enable = true;
}) (lib.filterAttrs (name: user: user.isNormalUser or false) users.users);
sharedModules = [
common.homeManagerModules.tmux
common.homeManagerModules.atuin
common.homeManagerModules.direnv
common.homeManagerModules.foot
common.homeManagerModules.git
common.homeManagerModules.postgres_cli_options
common.homeManagerModules.ssh
common.homeManagerModules.starship
common.homeManagerModules.zoxide
common.homeManagerModules.zsh
];
};
# System configuration
system.stateVersion = stateVersion;
networking.hostName = configuration_name;
programs.nh.flake = "/home/${primaryUser}/.config/nixos-config/hosts/${config.networking.hostName}";
nixpkgs.config.allowUnfree = true;
users.users = {
"${primaryUser}" = {
isNormalUser = true;
initialPassword = "password1";
extraGroups = [
"wheel"
"networkmanager"
"video"
"input"
];
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILMzgAe4od9K4EsvH2g7xjNU7hGoJiFJlYcvB0BoDCvn nix2oren"
];
};
};
environment.systemPackages = with pkgs; [
lua
qdirstat
ffmpeg-full
vlc
google-chrome
nodejs_24
ttyd
appimage-run
];
services.flatpak.packages = [
"org.signal.Signal"
"dev.vencord.Vesktop"
"md.obsidian.Obsidian"
"com.spotify.Client"
"com.bitwarden.desktop"
"org.openscad.OpenSCAD"
"im.riot.Riot"
"com.rustdesk.RustDesk"
];
services.devmon.enable = true;
services.gvfs.enable = true;
services.udisks2.enable = true;
@ -68,98 +167,6 @@
"ollamal" = "ollama list | tail -n +2 | awk '{print $1}' | fzf --ansi --preview 'ollama show {}'";
};
environment.systemPackages = with pkgs; [
lua
qdirstat
ffmpeg-full
appimage-run
nodejs_24
foot
ttyd
];
services.ollama = {
enable = true;
package = nixpkgs-unstable.legacyPackages.x86_64-linux.ollama;
acceleration = "rocm"; # cuda for NVIDA; rocm for amd; false/default for neither
};
ringofstorms_common = {
systemName = configuration_name;
boot.systemd.enable = true;
general = {
enableSleep = true;
reporting.enable = true;
};
secrets.enable = true;
desktopEnvironment.hyprland = {
enable = true;
waybar.enable = true;
swaync.enable = true;
};
programs = {
qFlipper.enable = true;
rustDev.enable = true;
uhkAgent.enable = true;
tailnet.enable = true;
ssh.enable = true;
podman.enable = true;
virt-manager.enable = true;
flatpaks = {
enable = true;
packages = [
"org.signal.Signal"
"dev.vencord.Vesktop"
"md.obsidian.Obsidian"
"com.spotify.Client"
"org.videolan.VLC"
"com.bitwarden.desktop"
"im.riot.Riot"
"com.rustdesk.RustDesk"
"com.google.Chrome"
];
};
};
users = {
# Users are all normal users and default password is password1
admins = [ "josh" ]; # First admin is also the primary user owning nix config
users = {
josh = {
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILMzgAe4od9K4EsvH2g7xjNU7hGoJiFJlYcvB0BoDCvn nix2oren"
];
extraGroups = [
"networkmanager"
"video"
"input"
];
shell = pkgs.zsh;
};
};
};
homeManager = {
users = {
josh = {
imports = with common.homeManagerModules; [
zsh
ssh
starship
zoxide
tmux
atuin
kitty
foot
direnv
git
nix_deprecations
obs
postgres
];
};
};
};
};
}
)
];

17
hosts/oren/hyprland_customizations.nix
View file

@ -1,4 +1,4 @@
{ lib, pkgs, ... }:
{ ... }:
let
hyprlandExtraOptions = {
exec-once = [
@ -11,11 +11,12 @@ let
};
in
{
options = { };
config = {
ringofstorms_common.desktopEnvironment.hyprland.extraOptions = hyprlandExtraOptions;
ringofstorms_common.desktopEnvironment.hyprland.hyprpaperSettings = {
home-manager.sharedModules = [
(
{ ... }:
{
wayland.windowManager.hyprland.settings = hyprlandExtraOptions;
services.hyprpaper.settings = {
mode = "fill"; # Wallpaper display mode: fill, fit, stretch, center, tile
preload = [
@ -26,5 +27,7 @@ in
"eDP-1,${../_shared_assets/wallpapers/pixel_neon.png}"
];
};
};
}
)
];
}

11
hosts/template.nix
View file

@ -47,6 +47,7 @@
common.nixosModules.git
common.nixosModules.tmux
common.nixosModules.boot_systemd
common.nixosModules.de_sway
common.nixosModules.hardening
common.nixosModules.jetbrains_font
common.nixosModules.nix_options
@ -105,11 +106,19 @@
"input"
];
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJN2nsLmAlF6zj5dEBkNSJaqcCya+aB6I0imY8Q5Ew0S nix2lio"
"REPLACE"
];
};
};
environment.systemPackages = with pkgs; [
lua
qdirstat
ffmpeg-full
vlc
google-chrome
];
services.flatpak.packages = [
"org.signal.Signal"
"dev.vencord.Vesktop"