From 1ae2855bb1eabc0478b003ff5de50ebf7461239d Mon Sep 17 00:00:00 2001 From: 0xrsydn Date: Fri, 24 Oct 2025 11:09:00 +0700 Subject: [PATCH] init(release): desktop template -> desktop wip --- modules/home/rsydn/desktop/apps/browsers.nix | 14 ++++++------ modules/home/rsydn/desktop/apps/terminals.nix | 3 +-- modules/home/rsydn/desktop/base.nix | 14 ++++++------ .../home/rsydn/desktop/wayland/default.nix | 3 +-- .../desktop/wayland/hyprland/default.nix | 18 +++++++-------- .../rsydn/desktop/wayland/niri/default.nix | 20 +++++++---------- modules/nixos/audio.nix | 3 +-- modules/nixos/bluetooth.nix | 3 +-- modules/nixos/desktops/base.nix | 3 +-- modules/nixos/desktops/hyprland.nix | 3 +-- modules/nixos/desktops/niri.nix | 7 ++---- modules/nixos/desktops/plasma.nix | 3 +-- modules/nixos/fonts.nix | 16 +++----------- modules/nixos/graphics.nix | 3 +-- modules/nixos/home/desktop.nix | 3 +-- modules/nixos/home/gaming.nix | 22 +++++++++---------- modules/nixos/hosts/desktop-dev.nix | 14 ++++++------ modules/nixos/hosts/gaming-rig.nix | 3 +-- 18 files changed, 63 insertions(+), 92 deletions(-) diff --git a/modules/home/rsydn/desktop/apps/browsers.nix b/modules/home/rsydn/desktop/apps/browsers.nix index 85003cf..5d3db50 100644 --- a/modules/home/rsydn/desktop/apps/browsers.nix +++ b/modules/home/rsydn/desktop/apps/browsers.nix @@ -1,11 +1,11 @@ -{ pkgs, ... }: -{ +{ pkgs, ... }: { # Browser configurations - home.packages = with pkgs; [ - firefox - # chromium - # brave - ]; + home.packages = with pkgs; + [ + firefox + # chromium + # brave + ]; # Firefox config (expand as needed) # programs.firefox = { diff --git a/modules/home/rsydn/desktop/apps/terminals.nix b/modules/home/rsydn/desktop/apps/terminals.nix index 0703a46..eb83db9 100644 --- a/modules/home/rsydn/desktop/apps/terminals.nix +++ b/modules/home/rsydn/desktop/apps/terminals.nix @@ -1,5 +1,4 @@ -{ pkgs, lib, ... }: -{ +{ pkgs, lib, ... }: { # Terminal emulators # Kitty - GPU-accelerated terminal diff --git a/modules/home/rsydn/desktop/base.nix b/modules/home/rsydn/desktop/base.nix index 83e62b0..4048746 100644 --- a/modules/home/rsydn/desktop/base.nix +++ b/modules/home/rsydn/desktop/base.nix @@ -1,5 +1,4 @@ -{ lib, pkgs, config, ... }: -{ +{ lib, pkgs, config, ... }: { # Base desktop user configuration # GTK theming @@ -28,9 +27,10 @@ }; # Basic GUI packages - home.packages = with pkgs; [ - # Add common desktop apps here - # firefox - # vscodium - ]; + home.packages = with pkgs; + [ + # Add common desktop apps here + # firefox + # vscodium + ]; } diff --git a/modules/home/rsydn/desktop/wayland/default.nix b/modules/home/rsydn/desktop/wayland/default.nix index 8793109..76627e4 100644 --- a/modules/home/rsydn/desktop/wayland/default.nix +++ b/modules/home/rsydn/desktop/wayland/default.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{ ... }: { # Wayland compositor configurations # Import the compositor you want to use diff --git a/modules/home/rsydn/desktop/wayland/hyprland/default.nix b/modules/home/rsydn/desktop/wayland/hyprland/default.nix index 72edd32..3fc4a75 100644 --- a/modules/home/rsydn/desktop/wayland/hyprland/default.nix +++ b/modules/home/rsydn/desktop/wayland/hyprland/default.nix @@ -1,5 +1,4 @@ -{ lib, pkgs, ... }: -{ +{ lib, pkgs, ... }: { # Hyprland user configuration wayland.windowManager.hyprland = { enable = lib.mkDefault true; @@ -31,16 +30,15 @@ border_size = 2; }; - decoration = { - rounding = 8; - }; + decoration = { rounding = 8; }; }; }; # Hyprland utilities - home.packages = with pkgs; [ - # wofi # Launcher - # waybar # Status bar - # dunst # Notifications - ]; + home.packages = with pkgs; + [ + # wofi # Launcher + # waybar # Status bar + # dunst # Notifications + ]; } diff --git a/modules/home/rsydn/desktop/wayland/niri/default.nix b/modules/home/rsydn/desktop/wayland/niri/default.nix index e3909e9..4278399 100644 --- a/modules/home/rsydn/desktop/wayland/niri/default.nix +++ b/modules/home/rsydn/desktop/wayland/niri/default.nix @@ -1,14 +1,9 @@ -{ lib, pkgs, ... }: -{ +{ lib, pkgs, ... }: { # Niri user configuration programs.niri = { settings = { # Minimal config - expand as needed - input = { - keyboard.xkb = { - layout = "us"; - }; - }; + input = { keyboard.xkb = { layout = "us"; }; }; # Example keybinds binds = { @@ -31,9 +26,10 @@ }; # Niri utilities - home.packages = with pkgs; [ - # fuzzel # Launcher (recommended for niri) - # waybar # Status bar - # dunst # Notifications - ]; + home.packages = with pkgs; + [ + # fuzzel # Launcher (recommended for niri) + # waybar # Status bar + # dunst # Notifications + ]; } diff --git a/modules/nixos/audio.nix b/modules/nixos/audio.nix index ad9707e..f1093db 100644 --- a/modules/nixos/audio.nix +++ b/modules/nixos/audio.nix @@ -1,5 +1,4 @@ -{ lib, ... }: -{ +{ lib, ... }: { # Modern audio stack - PipeWire replaces PulseAudio + JACK + ALSA services.pipewire = { enable = lib.mkDefault true; diff --git a/modules/nixos/bluetooth.nix b/modules/nixos/bluetooth.nix index cd64072..e3040b4 100644 --- a/modules/nixos/bluetooth.nix +++ b/modules/nixos/bluetooth.nix @@ -1,5 +1,4 @@ -{ lib, ... }: -{ +{ lib, ... }: { hardware.bluetooth = { enable = lib.mkDefault false; # Enable when needed powerOnBoot = lib.mkDefault true; diff --git a/modules/nixos/desktops/base.nix b/modules/nixos/desktops/base.nix index 1caf9d6..7e078bb 100644 --- a/modules/nixos/desktops/base.nix +++ b/modules/nixos/desktops/base.nix @@ -1,5 +1,4 @@ -{ lib, pkgs, ... }: -{ +{ lib, pkgs, ... }: { # Shared desktop settings (imported by all DEs) # XDG portals for desktop integration diff --git a/modules/nixos/desktops/hyprland.nix b/modules/nixos/desktops/hyprland.nix index f725ed8..0b08980 100644 --- a/modules/nixos/desktops/hyprland.nix +++ b/modules/nixos/desktops/hyprland.nix @@ -1,5 +1,4 @@ -{ pkgs, lib, ... }: -{ +{ pkgs, lib, ... }: { imports = [ ./base.nix ]; # Hyprland - Dynamic tiling Wayland compositor diff --git a/modules/nixos/desktops/niri.nix b/modules/nixos/desktops/niri.nix index da5155b..bffcad9 100644 --- a/modules/nixos/desktops/niri.nix +++ b/modules/nixos/desktops/niri.nix @@ -1,11 +1,8 @@ -{ pkgs, lib, ... }: -{ +{ pkgs, lib, ... }: { imports = [ ./base.nix ]; # Niri - Scrollable-tiling Wayland compositor - programs.niri = { - enable = lib.mkDefault true; - }; + programs.niri = { enable = lib.mkDefault true; }; # Wayland-specific portal xdg.portal.wlr.enable = lib.mkDefault true; diff --git a/modules/nixos/desktops/plasma.nix b/modules/nixos/desktops/plasma.nix index 3c7e150..e26051c 100644 --- a/modules/nixos/desktops/plasma.nix +++ b/modules/nixos/desktops/plasma.nix @@ -1,5 +1,4 @@ -{ lib, ... }: -{ +{ lib, ... }: { imports = [ ./base.nix ]; # KDE Plasma 6 diff --git a/modules/nixos/fonts.nix b/modules/nixos/fonts.nix index 995940e..c56813b 100644 --- a/modules/nixos/fonts.nix +++ b/modules/nixos/fonts.nix @@ -1,17 +1,10 @@ -{ lib, pkgs, ... }: -{ +{ lib, pkgs, ... }: { fonts = { enableDefaultPackages = lib.mkDefault true; packages = with pkgs; [ # Nerd Fonts for terminal icons - (nerdfonts.override { - fonts = [ - "FiraCode" - "JetBrainsMono" - "Iosevka" - ]; - }) + (nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" "Iosevka" ]; }) # Core fonts noto-fonts @@ -27,10 +20,7 @@ fontconfig = { enable = lib.mkDefault true; defaultFonts = { - monospace = [ - "JetBrains Mono" - "FiraCode Nerd Font" - ]; + monospace = [ "JetBrains Mono" "FiraCode Nerd Font" ]; sansSerif = [ "Noto Sans" ]; serif = [ "Noto Serif" ]; emoji = [ "Noto Color Emoji" ]; diff --git a/modules/nixos/graphics.nix b/modules/nixos/graphics.nix index c696961..07d18a5 100644 --- a/modules/nixos/graphics.nix +++ b/modules/nixos/graphics.nix @@ -1,5 +1,4 @@ -{ lib, pkgs, ... }: -{ +{ lib, pkgs, ... }: { # Hardware acceleration (OpenGL/Vulkan) hardware.graphics = { enable = lib.mkDefault true; diff --git a/modules/nixos/home/desktop.nix b/modules/nixos/home/desktop.nix index b3a4d23..1fbd92b 100644 --- a/modules/nixos/home/desktop.nix +++ b/modules/nixos/home/desktop.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{ ... }: { # Desktop user configuration (for Hyprland/Niri setups) imports = [ diff --git a/modules/nixos/home/gaming.nix b/modules/nixos/home/gaming.nix index 0201926..8d1cc96 100644 --- a/modules/nixos/home/gaming.nix +++ b/modules/nixos/home/gaming.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{ pkgs, ... }: { # Gaming user configuration (for KDE Plasma) imports = [ @@ -12,17 +11,18 @@ ]; # Gaming-specific user packages - home.packages = with pkgs; [ - # Communication - # discord - # teamspeak_client + home.packages = with pkgs; + [ + # Communication + # discord + # teamspeak_client - # Streaming/Recording - # obs-studio + # Streaming/Recording + # obs-studio - # Media - # spotify - ]; + # Media + # spotify + ]; # KDE-specific settings (optional) # programs.plasma = { diff --git a/modules/nixos/hosts/desktop-dev.nix b/modules/nixos/hosts/desktop-dev.nix index c612c08..e27c9f0 100644 --- a/modules/nixos/hosts/desktop-dev.nix +++ b/modules/nixos/hosts/desktop-dev.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{ pkgs, ... }: { # Example desktop development workstation configuration # Copy and modify for your actual hardware @@ -31,11 +30,12 @@ # hardware.bluetooth.enable = true; # Development-specific packages - environment.systemPackages = with pkgs; [ - # Add desktop dev tools here - # docker-compose - # k9s - ]; + environment.systemPackages = with pkgs; + [ + # Add desktop dev tools here + # docker-compose + # k9s + ]; # This value determines the NixOS release compatibility system.stateVersion = "24.05"; diff --git a/modules/nixos/hosts/gaming-rig.nix b/modules/nixos/hosts/gaming-rig.nix index 3ff8034..0ba42a1 100644 --- a/modules/nixos/hosts/gaming-rig.nix +++ b/modules/nixos/hosts/gaming-rig.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{ pkgs, ... }: { # Example gaming desktop configuration # Copy and modify for your actual hardware