baduhai/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rework desktop and programs aspects

Browse source
This commit is contained in:
William 2026-02-15 14:58:37 -03:00
parent 5d1b54c8bf
commit 4e78805bda
14 changed files with 307 additions and 527 deletions
Download patch file Download diff file Expand all files Collapse all files

7
aspects/cli/cli.nix
View file

@ -3,13 +3,18 @@
{ {
flake.modules = { flake.modules = {
nixos.cli = nixos.cli =
{ ... }: { pkgs, ... }:
{ {
imports = with inputs.self.modules.nixos; [ imports = with inputs.self.modules.nixos; [
btop btop
helix helix
tmux tmux
]; ];
environment.systemPackages = with pkgs; [
p7zip
rclone
];
}; };
homeManager.cli = homeManager.cli =
{ ... }: { ... }:

34
aspects/desktop/boot.nix
View file

@ -1,34 +0,0 @@
{ ... }:
{
flake.modules.nixos.desktop-boot =
{
config,
lib,
pkgs,
...
}:
{
boot = {
plymouth.enable = true;
initrd.systemd.enable = true;
loader.efi.efiSysMountPoint = "/boot/efi";
kernelPackages = pkgs.linuxPackages_xanmod_latest;
extraModprobeConfig = ''
options bluetooth disable_ertm=1
'';
kernel.sysctl = {
"net.ipv4.tcp_mtu_probing" = 1;
};
kernelParams = [
"quiet"
"splash"
"i2c-dev"
"i2c-piix4"
"loglevel=3"
"udev.log_priority=3"
"rd.udev.log_level=3"
"rd.systemd.show_status=false"
];
};
};
}

210
aspects/desktop/desktop.nix
View file

@ -4,7 +4,7 @@
}: }:
{ {
flake.modules = { flake.modules = {
nixos.desktop-desktop = nixos.desktop =
{ {
config, config,
lib, lib,
@ -13,37 +13,53 @@
}: }:
{ {
imports = [ imports = [
inputs.niri-flake.nixosModules.niri
inputs.nix-flatpak.nixosModules.nix-flatpak inputs.nix-flatpak.nixosModules.nix-flatpak
]
++ (with inputs.self.modules.nixos; [
graphics
media
office
web
]);
boot = {
plymouth.enable = true;
initrd.systemd.enable = true;
loader.efi.efiSysMountPoint = "/boot/efi";
kernelPackages = pkgs.linuxPackages_xanmod_latest;
extraModprobeConfig = ''
options bluetooth disable_ertm=1
'';
kernel.sysctl = {
"net.ipv4.tcp_mtu_probing" = 1;
};
kernelParams = [
"quiet"
"splash"
"i2c-dev"
"i2c-piix4"
"loglevel=3"
"udev.log_priority=3"
"rd.udev.log_level=3"
"rd.systemd.show_status=false"
]; ];
};
nix = {
registry.nixpkgs.flake = inputs.nixpkgs;
nixPath = [
"nixpkgs=${inputs.nixpkgs}"
"/nix/var/nix/profiles/per-user/root/channels"
];
};
environment = { environment = {
etc."channels/nixpkgs".source = inputs.nixpkgs.outPath;
sessionVariables = { sessionVariables = {
KDEHOME = "$XDG_CONFIG_HOME/kde4"; # Stops kde from placing a .kde4 folder in the home dir KDEHOME = "$XDG_CONFIG_HOME/kde4"; # Stops kde from placing a .kde4 folder in the home dir
NIXOS_OZONE_WL = "1"; # Forces chromium and most electron apps to run in wayland NIXOS_OZONE_WL = "1"; # Forces chromium and most electron apps to run in wayland
}; };
systemPackages = with pkgs; [ systemPackages = with pkgs; [
### Web ###
bitwarden-desktop
fragments
nextcloud-client
tor-browser
vesktop
inputs.zen-browser.packages."${system}".default
### Office & Productivity ###
aspell
aspellDicts.de
aspellDicts.en
aspellDicts.en-computers
aspellDicts.pt_BR
papers
presenterm
rnote
### Graphics & Design ###
gimp
inkscape
plasticity
### System Utilities ###
adwaita-icon-theme adwaita-icon-theme
ghostty ghostty
gnome-disk-utility gnome-disk-utility
@ -51,19 +67,21 @@
libfido2 libfido2
mission-center mission-center
nautilus nautilus
p7zip
rclone
toggleaudiosink toggleaudiosink
unrar unrar
### Media ###
decibels
loupe
obs-studio
showtime
]; ];
}; };
services = { services = {
printing.enable = true;
udev.packages = with pkgs; [ yubikey-personalization ];
keyd = {
enable = true;
keyboards.all = {
ids = [ "*" ];
settings.main.capslock = "overload(meta, esc)";
};
};
pipewire = { pipewire = {
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;
@ -74,35 +92,11 @@
}; };
greetd = { greetd = {
enable = true; enable = true;
settings = { settings.default_session.user = "greeter";
default_session = {
command = "${lib.getExe pkgs.tuigreet} --user-menu --time --remember --asterisks --cmd ${config.programs.niri.package}/bin/niri-session";
user = "greeter";
};
}
// lib.optionalAttrs (config.networking.hostName == "io") {
initial_session = {
command = "${config.programs.niri.package}/bin/niri-session";
user = "user";
};
};
}; };
flatpak = { flatpak = {
enable = true; enable = true;
packages = [ packages = [
### Office & Productivity ###
"com.collabora.Office"
### Graphics & Design ###
"com.boxy_svg.BoxySVG"
rec {
appId = "io.github.softfever.OrcaSlicer";
sha256 = "0hdx5sg6fknj1pfnfxvlfwb5h6y1vjr6fyajbsnjph5gkp97c6p1";
bundle = "${pkgs.fetchurl {
url = "https://github.com/SoftFever/OrcaSlicer/releases/download/v2.3.0/OrcaSlicer-Linux-flatpak_V2.3.0_x86_64.flatpak";
inherit sha256;
}}";
}
### System Utilities ###
"com.github.tchx84.Flatseal" "com.github.tchx84.Flatseal"
"com.rustdesk.RustDesk" "com.rustdesk.RustDesk"
]; ];
@ -123,10 +117,6 @@
}; };
programs = { programs = {
niri = {
enable = true;
package = inputs.niri.packages.${pkgs.system}.niri;
};
kdeconnect = { kdeconnect = {
enable = true; enable = true;
package = pkgs.valent; package = pkgs.valent;
@ -138,8 +128,6 @@
}; };
}; };
niri-flake.cache.enable = false;
fonts = { fonts = {
fontDir.enable = true; fontDir.enable = true;
packages = with pkgs; [ packages = with pkgs; [
@ -157,17 +145,11 @@
xdg-desktop-portal-gnome xdg-desktop-portal-gnome
xdg-desktop-portal-gtk xdg-desktop-portal-gtk
]; ];
config = { config.common.default = "*";
common.default = "*";
niri.default = [
"gtk"
"gnome"
];
};
}; };
}; };
homeManager.desktop-desktop = homeManager.desktop =
{ {
config, config,
lib, lib,
@ -180,7 +162,10 @@
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
home.packages = with pkgs; [ xwayland-satellite ]; home = {
packages = with pkgs; [ xwayland-satellite ];
sessionVariables.TERMINAL = "ghostty";
};
services.vicinae = { services.vicinae = {
enable = true; enable = true;
@ -216,91 +201,6 @@
xdg = { xdg = {
enable = true; enable = true;
userDirs.enable = true; userDirs.enable = true;
mimeApps = {
enable = true;
defaultApplications = {
"text/html" = [
"re.sonny.Junction.desktop"
"zen-browser.desktop"
"torbrowser.desktop"
];
"x-scheme-handler/http" = [
"re.sonny.Junction.desktop"
"zen-browser.desktop"
"torbrowser.desktop"
];
"x-scheme-handler/https" = [
"re.sonny.Junction.desktop"
"zen-browser.desktop"
"torbrowser.desktop"
];
"x-scheme-handler/about" = [
"re.sonny.Junction.desktop"
"zen-browser.desktop"
"torbrowser.desktop"
];
"x-scheme-handler/unknown" = [
"re.sonny.Junction.desktop"
"zen-browser.desktop"
"torbrowser.desktop"
];
"image/jpeg" = "org.gnome.Loupe.desktop";
"image/png" = "org.gnome.Loupe.desktop";
"image/gif" = "org.gnome.Loupe.desktop";
"image/webp" = "org.gnome.Loupe.desktop";
"image/bmp" = "org.gnome.Loupe.desktop";
"image/svg+xml" = "org.gnome.Loupe.desktop";
"image/tiff" = "org.gnome.Loupe.desktop";
"video/mp4" = "io.bassi.Showtime.desktop";
"video/x-matroska" = "io.bassi.Showtime.desktop";
"video/webm" = "io.bassi.Showtime.desktop";
"video/mpeg" = "io.bassi.Showtime.desktop";
"video/x-msvideo" = "io.bassi.Showtime.desktop";
"video/quicktime" = "io.bassi.Showtime.desktop";
"video/x-flv" = "io.bassi.Showtime.desktop";
"audio/mpeg" = "io.bassi.Showtime.desktop";
"audio/flac" = "io.bassi.Showtime.desktop";
"audio/ogg" = "io.bassi.Showtime.desktop";
"audio/wav" = "io.bassi.Showtime.desktop";
"audio/mp4" = "io.bassi.Showtime.desktop";
"audio/x-opus+ogg" = "io.bassi.Showtime.desktop";
"application/pdf" = [
"org.gnome.Papers.desktop"
"zen-browser.desktop"
];
"text/plain" = "Helix.desktop";
"text/markdown" = "Helix.desktop";
"text/x-log" = "Helix.desktop";
"application/x-shellscript" = "Helix.desktop";
"application/vnd.openxmlformats-officedocument.wordprocessingml.document" =
"com.collabora.Office.desktop"; # DOCX
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" =
"com.collabora.Office.desktop"; # XLSX
"application/vnd.openxmlformats-officedocument.presentationml.presentation" =
"com.collabora.Office.desktop"; # PPTX
"application/vnd.oasis.opendocument.text" = "com.collabora.Office.desktop"; # ODT
"application/vnd.oasis.opendocument.spreadsheet" = "com.collabora.Office.desktop"; # ODS
"application/vnd.oasis.opendocument.presentation" = "com.collabora.Office.desktop"; # ODP
"application/msword" = "com.collabora.Office.desktop"; # DOC
"application/vnd.ms-excel" = "com.collabora.Office.desktop"; # XLS
"application/vnd.ms-powerpoint" = "com.collabora.Office.desktop"; # PPT
"application/zip" = "org.gnome.FileRoller.desktop";
"application/x-tar" = "org.gnome.FileRoller.desktop";
"application/x-compressed-tar" = "org.gnome.FileRoller.desktop";
"application/x-bzip-compressed-tar" = "org.gnome.FileRoller.desktop";
"application/x-xz-compressed-tar" = "org.gnome.FileRoller.desktop";
"application/x-7z-compressed" = "org.gnome.FileRoller.desktop";
"application/x-rar" = "org.gnome.FileRoller.desktop";
"application/gzip" = "org.gnome.FileRoller.desktop";
"application/x-bzip" = "org.gnome.FileRoller.desktop";
"inode/directory" = "org.gnome.Nautilus.desktop";
};
};
};
# Set Ghostty as default terminal
home.sessionVariables = {
TERMINAL = "ghostty";
}; };
}; };
}; };

27
aspects/desktop/niri.nix
View file

@ -1,6 +1,28 @@
{ ... }: { inputs, ... }:
{ {
flake.modules.homeManager.desktop-niri = flake.modules = {
nixos.niri =
{
config,
lib,
pkgs,
...
}:
{
imports = [ inputs.niri-flake.nixosModules.niri ];
services.greetd.settings = {
default_session.command = "${lib.getExe pkgs.tuigreet} --user-menu --time --remember --asterisks --cmd ${config.programs.niri.package}/bin/niri-session";
};
programs.niri.enable = true;
xdg.portal.config.niri.default = [
"gtk"
"gnome"
];
};
homeManager.niri =
{ {
config, config,
lib, lib,
@ -225,4 +247,5 @@
} }
''; '';
}; };
};
} }

21
aspects/desktop/nix.nix
View file

@ -1,21 +0,0 @@
{ inputs, ... }:
{
flake.modules.nixos.desktop-nix =
{
config,
lib,
pkgs,
...
}:
{
environment.etc."channels/nixpkgs".source = inputs.nixpkgs.outPath;
nix = {
registry.nixpkgs.flake = inputs.nixpkgs;
nixPath = [
"nixpkgs=${inputs.nixpkgs}"
"/nix/var/nix/profiles/per-user/root/channels"
];
};
};
}

23
aspects/desktop/services.nix
View file

@ -1,23 +0,0 @@
{ ... }:
{
flake.modules.nixos.desktop-services =
{
config,
lib,
pkgs,
...
}:
{
services = {
printing.enable = true;
udev.packages = with pkgs; [ yubikey-personalization ];
keyd = {
enable = true;
keyboards.all = {
ids = [ "*" ];
settings.main.capslock = "overload(meta, esc)";
};
};
};
};
}

8
aspects/hosts/io.nix
View file

@ -22,23 +22,19 @@
# system aspects # system aspects
base base
cli cli
desktop
# user aspects # user aspects
user user
root root
# Desktop aspects
desktop-boot
desktop-desktop
desktop-nix
desktop-services
# Other aspects # Other aspects
ai ai
bluetooth bluetooth
dev dev
libvirtd libvirtd
networkmanager networkmanager
niri
podman podman
]); ]);
}; };

12
aspects/hosts/rotterdam.nix
View file

@ -22,28 +22,24 @@
# system aspects # system aspects
base base
cli cli
desktop
# user aspects # user aspects
user user
root root
# Desktop aspects
desktop-boot
desktop-desktop
desktop-nix
desktop-services
# Other aspects based on tags # Other aspects based on tags
ai ai
bluetooth bluetooth
dev dev
fwupd fwupd
gaming-steam
gaming-hardware
gaming-flatpak gaming-flatpak
gaming-hardware
gaming-launchers gaming-launchers
gaming-steam
libvirtd libvirtd
networkmanager networkmanager
niri
podman podman
]); ]);
}; };

2
aspects/programs/graphics.nix
View file

@ -1,7 +1,7 @@
{ ... }: { ... }:
{ {
flake.modules.nixos.programs-graphics = flake.modules.nixos.graphics =
{ pkgs, ... }: { pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

2
aspects/programs/media.nix
View file

@ -2,7 +2,7 @@
{ {
flake.modules = { flake.modules = {
nixos.programs-media = nixos.media =
{ pkgs, ... }: { pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

2
aspects/programs/office.nix
View file

@ -1,7 +1,7 @@
{ ... }: { ... }:
{ {
flake.modules.nixos.programs-office = flake.modules.nixos.office =
{ pkgs, ... }: { pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

62
aspects/programs/utilities.nix
View file

@ -1,62 +0,0 @@
{ ... }:
{
flake.modules = {
nixos.programs-utilities =
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
ghostty
gnome-disk-utility
mission-center
nautilus
p7zip
rclone
unrar
# Desktop Integration
adwaita-icon-theme
junction
libfido2
toggleaudiosink
# Xwayland Support
xwayland-satellite
];
services.flatpak.packages = [
"com.github.tchx84.Flatseal"
"com.rustdesk.RustDesk"
];
};
homeManager.programs-utilities =
{ pkgs, ... }:
{
programs = {
ghostty = {
enable = true;
settings = {
cursor-style = "block";
shell-integration-features = "no-cursor";
cursor-style-blink = false;
custom-shader = "${builtins.fetchurl {
url = "https://raw.githubusercontent.com/hackr-sh/ghostty-shaders/cb6eb4b0d1a3101c869c62e458b25a826f9dcde3/cursor_blaze.glsl";
sha256 = "sha256:0g2lgqjdrn3c51glry7x2z30y7ml0y61arl5ykmf4yj0p85s5f41";
}}";
bell-features = "";
gtk-titlebar-style = "tabs";
keybind = [ "shift+enter=text:\\x1b\\r" ];
};
};
password-store = {
enable = true;
package = pkgs.pass-wayland;
};
};
home.sessionVariables = {
TERMINAL = "ghostty";
};
};
};
}

2
aspects/programs/web.nix
View file

@ -1,7 +1,7 @@
{ ... }: { ... }:
{ {
flake.modules.nixos.programs-web = flake.modules.nixos.web =
{ {
inputs, inputs,
pkgs, pkgs,

2
aspects/users/_user/git.nix
View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
programs = { programs = {