removed virtualbox, added gnome-boxes, tidied.

This commit is contained in:
serenity-F 2026-04-19 20:04:25 +10:00
parent 633a8abd20
commit 1bd4e30a93
No known key found for this signature in database
2 changed files with 96 additions and 111 deletions

View file

@ -12,8 +12,6 @@
# Host-specific core modules # Host-specific core modules
../../../core/zfs.nix ../../../core/zfs.nix
../../../core/gaming.nix ../../../core/gaming.nix
../../../core/virtualbox.nix
]; ];
# ooh, hostname - this one's important! # ooh, hostname - this one's important!

View file

@ -1,56 +1,46 @@
{ inputs, config, pkgs, lib, flakePath, homeDirectory, ... }: { inputs, config, pkgs, lib, flakePath, homeDirectory, ... }:
## Base desktop theme
let let
# Base desktop theme
#serenityos-base = import ./serenityos-base.nix { inherit pkgs; }; #serenityos-base = import ./serenityos-base.nix { inherit pkgs; };
#line-icons = import ./line-icons.nix { inherit pkgs; }; #line-icons = import ./line-icons.nix { inherit pkgs; };
in { in {
imports = [ imports = [
#inputs.niri.homeModules.niri
# Import common desktop configs # Import common desktop configs
./xdg-mime.nix # file associations ./xdg-mime.nix # file associations
./wofi.nix # launcher ./wofi.nix # launcher
./niri # WM ./niri # WM
## IMPORTED ELSEWHERE
#./niri/noctalia.nix # Desktop shell
# Import user theme(s) # Import user theme(s)
../resources/theme ../resources/theme
../resources/theme/SerenityOS.nix ../resources/theme/SerenityOS.nix
]; ];
# Services
systemd.user.startServices = "sd-switch"; # cant remember systemd.user.startServices = "sd-switch"; # cant remember
services = {
# GTK keyring for password prompts
gnome-keyring = {
enable = true; # enables gnome-keyring
};
# Phone <-> Desktop integration
kdeconnect = {
enable = false; # enables kdeconnect
indicator = false; # enables tray applet
};
# Disk automount service
udiskie = {
enable = true; # enables udiskie
tray = true; # enables tray applet
notify = true; # sends notification on disk mount
automount = true; # automatically mount new disk
};
};
xdg = { xdg = {
# Creates user directory variables
#configFile."niri/config.kdl".source = ./niri.kdl;
portal = {
enable = true;
xdgOpenUsePortal = false;
config = {
common."org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
common.default = [ "gtk" "wlr" "gnome" ];
#./sway # WM
sway.default = [ "gtk" "wlr" "gnome" ];
};
configPackages = with pkgs; [
xdg-desktop-portal-gtk
xdg-desktop-portal-wlr
xdg-desktop-portal-gnome
];
extraPortals = with pkgs; [
xdg-desktop-portal-gtk
xdg-desktop-portal-wlr
xdg-desktop-portal-gnome
];
};
userDirs = { userDirs = {
enable = true; enable = true;
createDirectories = true; createDirectories = true;
@ -59,138 +49,129 @@ in {
XDG_SYNC_DIR = "${homeDirectory}/Sync"; XDG_SYNC_DIR = "${homeDirectory}/Sync";
}; };
}; };
# Enables portals
portal = {
enable = true;
xdgOpenUsePortal = false;
# Extra portal config
config = {
common."org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
common.default = [ "gtk" "wlr" "gnome" ];
sway.default = [ "gtk" "wlr" "gnome" ];
};
# Packages to use for config
configPackages = with pkgs; [
xdg-desktop-portal-gtk
xdg-desktop-portal-wlr
xdg-desktop-portal-gnome
];
# Extra portals to enable
extraPortals = with pkgs; [
xdg-desktop-portal-gtk
xdg-desktop-portal-wlr
xdg-desktop-portal-gnome
];
};
}; };
fonts = { fontconfig = { enable = true; }; };
qt = { qt = {
# Enables QT
enable = true; enable = true;
# Specifies the base theme to use
#platformTheme.name = "Colloid-dark"; #platformTheme.name = "Colloid-dark";
#style = { #style = {
#name = "Colloid-dark"; #name = "Colloid-dark";
#package = pkgs.colloid-kde; #package = pkgs.colloid-kde;
#}; #};
}; };
gtk = { gtk = {
enable = true; # Enables GTK
theme = lib.mkForce { enables = true;
name = "Colloid-Dark"; # Specifies the font to use
package = pkgs.colloid-gtk-theme;
#name = "serenityos-base";
#package = pkgs.serenityos-base;
};
font = { font = {
name = "${config.theme.font}"; name = "${config.theme.font}";
size = 10; size = 10;
}; };
# Specifies the icon theme to use
iconTheme = { iconTheme = {
name = "Flat-Remix-Grey-Darkest"; name = "Flat-Remix-Grey-Darkest";
package = pkgs.flat-remix-icon-theme; package = pkgs.flat-remix-icon-theme;
#name = "line-icons";
#package = pkgs.line-icons;
}; };
gtk3.extraConfig = { # Specifies the base theme to use
gtk-application-prefer-dark-theme = 1; theme = lib.mkForce {
}; name = "Colloid-Dark";
gtk4.extraConfig = { package = pkgs.colloid-gtk-theme;
gtk-application-prefer-dark-theme = 1;
}; };
# Tries to force a dark theme globally
gtk3.extraConfig.gtk-application-prefer-dark-theme = 1;
gtk4.extraConfig.gtk-application-prefer-dark-theme = 1;
}; };
# Fonts
# surely there is a better way to do fonts ?
fonts = { fontconfig = { enable = true; }; };
home = { home = {
# Sets user session variables
sessionVariables = {
GTK_THEME = "Colloid-Teal-Dark-Dracula"; # i haev no idea what im doing
BROWSER = "firefox"; # furry browser
TERMINAL = "kitty"; # furry terminal
NIXPKGS_ALLOW_UNFREE = 1; # unfortunately
};
# Copies cursor theme files to the relevant location
file.".icons/bibata".source = "${pkgs.bibata-cursors}/share/icons/Bibata-Modern-Classic"; file.".icons/bibata".source = "${pkgs.bibata-cursors}/share/icons/Bibata-Modern-Classic";
# Specifies pointer theme and size
pointerCursor = { pointerCursor = {
gtk.enable = true; gtk.enable = true; # GTK cursor
package = pkgs.bibata-cursors; package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic"; name = "Bibata-Modern-Classic";
size = 12; size = 12;
}; };
# Base package set to include in home/desktop configuration
sessionVariables = {
GTK_THEME = "Colloid-Teal-Dark-Dracula"; # i haev no idea what im doing
BROWSER = "firefox";
TERMINAL = "kitty";
NIXPKGS_ALLOW_UNFREE = 1;
};
packages = with pkgs; [ packages = with pkgs; [
# Network & Auth/Security # Networking
#networkmanagerapplet # Tray applet for networkmanager #networkmanagerapplet # Tray applet for networkmanager
#networkmanager # Network manager ... #networkmanager # Network manager ...
# Security
gnome-keyring # Keyring for login prompts gnome-keyring # Keyring for login prompts
gnome-secrets # GTK password manager gnome-secrets # GTK password manager
keepass-diff # CLI-tool to diff kbdx files keepass-diff # CLI-tool to diff kbdx files
keepassxc # Feature rich password manager keepassxc # Feature rich password manager
seahorse # GTK secrets managment seahorse # GTK secrets managment
soteria # GTK/rust desktop-agnostic polkit agent soteria # GTK/rust desktop-agnostic polkit agent
# Desktop Features
# Desktop
brightnessctl # Display brightness control brightnessctl # Display brightness control
wdisplays # Display configuration wdisplays # Display configuration
wlr-randr # Display modesetting wlr-randr # Display modesetting
wlsunset # Bluelight filter wlsunset # Bluelight filter
wl-clipboard # Clipboard service wl-clipboard # Clipboard service
# Desktop App Suite # Desktop App Suite
gnome-calculator # GTK calculator gnome-calculator # Simple calculator
appimage-run # Runs appimages appimage-run # Runs appimages
file-roller # Archive manager gnome-boxes # Virtualisation host
nautilus # GTK File manager file-roller # Simple archive manager
themix-gui # GTK theme creation tool
nautilus # Simple file manager
swayimg # Terminal based image viewer swayimg # Terminal based image viewer
zathura # PDF viewer zathura # Simple PDF viewer
gparted # GUI partition editor gparted # GUI partition editor
# Wayland
# Misc./lib/compat
wayland-protocols wayland-protocols
wayland-utils wayland-utils
xwayland xwayland
wlroots wlroots
libsForQt5.qt5ct # QT
libsForQt5.qt5.qtwayland libsForQt5.qt5.qtwayland
libnotify libsForQt5.qt5ct
libva # Misc.
meson libnotify # Notifier library
themix-gui # GTK theme creation libva # Library for ???
meson # Package builder
]; ];
}; };
services = {
# GTK keyring for password prompts
gnome-keyring.enable = true;
# Phone <-> Desktop integration
kdeconnect = {
enable = false;
indicator = true;
};
# Syncthing program service
#syncthing = {
#enable = false;
#tray.enable = true;
#guiAddress = "home.syncthing:8384";
#};
# Disk automount service
udiskie = {
enable = true;
automount = true; # automatically mount new disk
notify = true; # sends notification on disk mount
};
};
## MOVE TO MORE SENSIBLE SPOT
#nix.gc = {
#automatic = true;
#dates = "daily";
#options = "--delete-older-than 1d";
#};
## ORGANISE THIS MESS ## ORGANISE THIS MESS
# https://mynixos.com/home-manager/options/home.file.%3Cname%3E # https://mynixos.com/home-manager/options/home.file.%3Cname%3E
# https://nix-community.github.io/home-manager/options.xhtml#opt-home.file # https://nix-community.github.io/home-manager/options.xhtml#opt-home.file
@ -217,5 +198,11 @@ in {
#}; #};
#}; #};
# Syncthing program service
#syncthing = {
#enable = false; # enables syncthing
#tray.enable = true; # enables tray applet
#guiAddress = "home.syncthing:8384"; # local addess to use
#};
} }