unexplrd/nixos-blueprint
2
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

seems right

Browse Source
This commit is contained in:
unexplrd
2025-02-06 14:23:13 +02:00
parent 2e6e28ef32
commit d76e7f4f71
10 changed files with 88 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/home/desktop/common/xdg-userdirs.nix Normal file
View File

@ -0,0 +1,14 @@
{config, ...}: {
xdg.userDirs = {
enable = true;
createDirectories = true;
templates = "${config.home.homeDirectory}/temps";
publicShare = "${config.home.homeDirectory}/pub";
desktop = "${config.home.homeDirectory}/desktop";
download = "${config.home.homeDirectory}/downloads";
documents = "${config.home.homeDirectory}/docs";
pictures = "${config.home.homeDirectory}/pics";
videos = "${config.home.homeDirectory}/vids";
music = "${config.home.homeDirectory}/music";
};
}

1
modules/home/desktop/default.nix
View File

@ -1,5 +1,6 @@
{
imports = [
./common/xdg-userdirs.nix
./hyprland/default.nix
./niri/default.nix
./plasma/default.nix

23
modules/home/desktop/hyprland/default.nix
View File

@ -7,6 +7,8 @@
}: let
cfg = config.desktop.hyprland;
hostname = osConfig.networking.hostName;
xdgPictures =
config.xdg.userDirs.pictures;
in {
options = {
desktop.hyprland.enable =
@ -225,10 +227,11 @@ in {
"$modCtrl, B, exec, $webBrowser"
"$modCtrl, V, exec, $clipboardManager"
", Print, exec, flameshot gui" #${xdg.userDirs.pictures}/screenshots/"
#", Print, exec, grimblast --freeze copy area" #${xdg.userDirs.pictures}/screenshots/"
#"CTRL, Print, exec, grimblast --freeze copy active" #${xdg.userDirs.pictures}/screenshots/"
#"SHIFT, Print, exec, grimblast --freeze copy output" #${xdg.userDirs.pictures}/screenshots/"
# ", Print, exec, flameshot gui" #${xdg.userDirs.pictures}/screenshots/"
", Print, exec, ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp -o -r -c '\#\#ff0000ff')\" -t ppm - | ${pkgs.satty}/bin/satty --filename - --fullscreen --output-filename ${xdgPictures}/screenshots/satty-$(date '+%Y%m%d-%H:%M:%S').png"
# ", Print, exec, grimblast --freeze copy area" #${xdg.userDirs.pictures}/screenshots/"
# "CTRL, Print, exec, grimblast --freeze copy active" #${xdg.userDirs.pictures}/screenshots/"
# "SHIFT, Print, exec, grimblast --freeze copy output" #${xdg.userDirs.pictures}/screenshots/"
# navigation
#"$modCtrl, N,"
"$mod, $left, hy3:movefocus, l"
@ -1611,18 +1614,6 @@ in {
"x-scheme-handler/unknown" = web_browser;
};
};
xdg.userDirs = {
enable = true;
createDirectories = true;
templates = "${config.home.homeDirectory}/temps";
publicShare = "${config.home.homeDirectory}/pub";
desktop = "${config.home.homeDirectory}/desktop";
download = "${config.home.homeDirectory}/downloads";
documents = "${config.home.homeDirectory}/docs";
pictures = "${config.home.homeDirectory}/pics";
videos = "${config.home.homeDirectory}/vids";
music = "${config.home.homeDirectory}/music";
};
systemd.user.settings.Manager.DefaultEnvironment = {
# QT_QPA_PLATFORMTHEME = "gtk3";
QT_QPA_PLATFORM = "wayland";

12
modules/home/desktop/niri/default.nix
View File

@ -1347,18 +1347,6 @@ in {
"x-scheme-handler/unknown" = web_browser;
};
};
xdg.userDirs = {
enable = true;
createDirectories = true;
templates = "${config.home.homeDirectory}/temps";
publicShare = "${config.home.homeDirectory}/pub";
desktop = "${config.home.homeDirectory}/desktop";
download = "${config.home.homeDirectory}/downloads";
documents = "${config.home.homeDirectory}/docs";
pictures = "${config.home.homeDirectory}/pics";
videos = "${config.home.homeDirectory}/vids";
music = "${config.home.homeDirectory}/music";
};
systemd.user.settings.Manager.DefaultEnvironment = {
# QT_QPA_PLATFORMTHEME = "gtk3";
QT_QPA_PLATFORM = "wayland";

14
modules/home/desktop/plasma/default.nix
View File

@ -14,19 +14,7 @@ in {
config = mkIf cfg.enable {
stylix.targets.kde.enable = true;
home.packages = with pkgs; [
wl-clipboard
wl-clipboard-rs
];
xdg.userDirs = {
enable = true;
createDirectories = true;
templates = "${config.home.homeDirectory}/temps";
publicShare = "${config.home.homeDirectory}/pub";
desktop = "${config.home.homeDirectory}/desktop";
download = "${config.home.homeDirectory}/downloads";
documents = "${config.home.homeDirectory}/docs";
pictures = "${config.home.homeDirectory}/pics";
videos = "${config.home.homeDirectory}/vids";
music = "${config.home.homeDirectory}/music";
};
};
}

0
modules/nixos/desktop/misc/sound.nix → modules/nixos/desktop/common/pipewire.nix
View File

72
modules/nixos/desktop/hyprland.nix
View File

@ -7,31 +7,40 @@
with lib; let
cfg = config.desktop.hyprland;
in {
imports = [./misc/sound.nix ./misc/regreet.nix];
imports = [./common/pipewire.nix];
options = {
desktop.hyprland.enable =
mkEnableOption "enable hyprland desktop";
};
config = mkIf cfg.enable {
programs.hyprland.enable = true;
programs.hyprland.package = pkgs.hyprland;
fonts.fontDir.enable = true;
security.pam.services.hyprlock = {};
security.pam.loginLimits = [
{
domain = "@users";
item = "rtprio";
type = "-";
value = 1;
}
environment.systemPackages = with pkgs; [
brightnessctl
gcr_4
];
programs.dconf.enable = true;
programs.seahorse.enable = true;
services.gnome.gnome-keyring.enable = true;
services.udisks2.enable = true;
services.dbus = {
apparmor = "enabled";
implementation = "broker";
fonts.fontDir.enable = true;
security.pam = {
services.hyprlock = {};
loginLimits = [
{
domain = "@users";
item = "rtprio";
type = "-";
value = 1;
}
];
};
services = {
gnome.gnome-keyring.enable = true;
udisks2.enable = true;
dbus = {
apparmor = "enabled";
implementation = "broker";
};
};
programs = {
dconf.enable = true;
seahorse.enable = true;
};
xdg.portal = {
enable = true;
@ -39,18 +48,25 @@ in {
xdg-desktop-portal-hyprland
xdg-desktop-portal-gtk
];
config = {
common = {
default = [
"hyprland"
"gtk"
];
config.common.default = [
"hyprland"
"gtk"
];
};
programs.regreet.enable = true;
services.greetd = {
enable = true;
vt = 6;
settings = {
default_session = {
command = "${pkgs.cage}/bin/cage -s -m last -- ${pkgs.greetd.regreet}/bin/regreet";
};
initial_session = {
user = "user";
command = "Hyprland";
};
};
};
services.greetd.settings.initial_session = {
user = "user";
command = "Hyprland";
};
};
}

12
modules/nixos/desktop/misc/regreet.nix
View File

@ -1,12 +0,0 @@
{pkgs, ...}: {
programs.regreet.enable = true;
services.greetd = {
enable = true;
vt = 6;
settings = {
default_session = {
command = "${pkgs.cage}/bin/cage -s -m last -- ${pkgs.greetd.regreet}/bin/regreet";
};
};
};
}

18
modules/nixos/desktop/niri.nix
View File

@ -7,7 +7,7 @@
with lib; let
cfg = config.desktop.niri;
in {
imports = [./misc/sound.nix ./misc/regreet.nix];
imports = [./common/pipewire.nix];
options = {
desktop.niri.enable =
mkEnableOption "enable niri desktop";
@ -52,9 +52,19 @@ in {
"gtk"
];
};
services.greetd.settings.initial_session = {
user = "user";
command = "${pkgs.niri}/bin/niri-session";
programs.regreet.enable = true;
services.greetd = {
enable = true;
vt = 6;
settings = {
default_session = {
command = "${pkgs.cage}/bin/cage -s -m last -- ${pkgs.greetd.regreet}/bin/regreet";
};
initial_session = {
user = "user";
command = "${pkgs.niri}/bin/niri-session";
};
};
};
};
}

14
modules/nixos/desktop/plasma.nix
View File

@ -1,6 +1,5 @@
{
config,
pkgs,
lib,
...
}:
@ -8,7 +7,7 @@ with lib; let
cfg = config.desktop.plasma;
in {
imports = [
./misc/sound.nix
./common/pipewire.nix
];
options = {
desktop.plasma = {
@ -17,12 +16,13 @@ in {
};
};
config = mkIf cfg.enable {
services.displayManager.sddm = {
enable = cfg.sddmEnable;
wayland.enable = true;
services = {
desktopManager.plasma6.enable = true;
displayManager.sddm = {
enable = cfg.sddmEnable;
wayland.enable = true;
};
};
services.desktopManager.plasma6.enable = true;
fonts.fontDir.enable = true;
};
}