Updated personal config

This commit is contained in:
Jan-Bulthuis 2025-05-09 15:01:50 +02:00
parent 626d78f088
commit c3c61ce654

View File

@ -8,7 +8,9 @@
}:
{
config = {
config = (
lib.recursiveUpdate
{
# State version
home.stateVersion = "24.05";
@ -25,6 +27,9 @@
ente-auth
bitwarden
carla
baobab
gnome-calculator
nautilus
];
# desktop.development = "river-light";
@ -63,9 +68,17 @@
# Color scheme
desktop.theming.background = {
# path = "unsorted/a_group_of_mountains_with_a_building_in_the_background.jpg";
path = "anime/a_colorful_buildings_with_power_lines.jpg";
# image = "anime/a_colorful_buildings_with_power_lines.jpg";
image = {
url = "https://i.postimg.cc/tTB3dM3T/1382899.png";
hash = "sha256-kStcwAtK2vxitU6uaQtZTA5iFS8k0iXkFwinY2M8wQE=";
};
# image = {
# url = "https://raw.githubusercontent.com/dharmx/walls/refs/heads/main/digital/a_couple_of_people_standing_on_a_mountain.png";
# hash = "sha256-SgKG090iSxwOPCGH/2ODPbwe275Zi5k0+d5Hso0mN7c=";
# };
themed = true;
invert = false;
inverted = false;
};
desktop.theming.themes.catppuccin = {
enable = true;
@ -106,9 +119,13 @@
# Color scheme
desktop.theming.background = {
# path = "unsorted/a_group_of_mountains_with_a_building_in_the_background.jpg";
path = "anime/a_cartoon_of_a_street_with_buildings.jpeg";
# image = "anime/a_cartoon_of_a_street_with_buildings.jpeg";
image = {
url = "https://raw.githubusercontent.com/dharmx/walls/refs/heads/main/digital/a_drawing_of_a_spider_on_a_white_surface.png";
hash = "sha256-eCEjM7R9yeHNhZZtvHjrgkfwT25JA7FeMoVwnQ887CQ=";
};
themed = true;
invert = false;
inverted = false;
};
desktop.theming.themes.catppuccin = {
enable = true;
@ -116,78 +133,6 @@
};
};
};
# cosmic = {
# name = "Cosmic";
# type = "custom";
# config = { };
# extraConfig = {
# desktop = {
# initScript = ''
# ${pkgs.cosmic-session}/bin/cosmic-session
# '';
# session = {
# type = "wayland";
# desktop = "cosmic";
# };
# };
# # TODO: Remove everything below, it is here out of convenience and should be elsewhere
# xdg.portal = {
# enable = true;
# config.common.default = [
# "cosmic"
# "gtk"
# ];
# extraPortals = with pkgs; [
# xdg-desktop-portal-cosmic
# xdg-desktop-portal-gtk
# ];
# configPackages = lib.mkDefault (with pkgs; [ xdg-desktop-portal-cosmic ]);
# };
# home.packages = with pkgs; [
# adwaita-icon-theme
# alsa-utils
# cosmic-applets
# cosmic-applibrary
# cosmic-bg
# (cosmic-comp.override {
# useXWayland = false;
# })
# cosmic-edit
# cosmic-files
# cosmic-greeter
# cosmic-icons
# cosmic-idle
# cosmic-launcher
# cosmic-notifications
# cosmic-osd
# cosmic-panel
# cosmic-player
# cosmic-randr
# cosmic-screenshot
# cosmic-session
# cosmic-settings
# cosmic-settings-daemon
# cosmic-term
# cosmic-wallpapers
# cosmic-workspaces-epoch
# hicolor-icon-theme
# playerctl
# pop-icon-theme
# pop-launcher
# xdg-user-dirs
# xwayland
# cosmic-store
# # Fonts
# fira
# noto-fonts
# open-sans
# ];
# };
# };
gnome = {
name = "Gnome";
type = "custom";
@ -205,6 +150,27 @@
desktop = "GNOME";
};
};
modules.river.enable = lib.mkForce false;
# # Theme configuration
# desktop.theming =
# let
# fontpkgs = config.desktop.theming.fonts.pkgs;
# in
# {
# # Fonts
# fonts.serif = fontpkgs."DejaVu Serif";
# fonts.sansSerif = fontpkgs."Adwaita Sans";
# fonts.monospace = fontpkgs."Adwaita Mono";
# fonts.emoji = fontpkgs."Noto Color Emoji";
# fonts.interface = fontpkgs."Adwaita Sans";
# fonts.extraFonts = [ ];
# # Color scheme
# themes.catppuccin = {
# enable = true;
# flavor = "mocha";
# };
# };
# TODO: Remove everything below, it is here out of convenience and should be elsewhere
xdg.portal = {
@ -222,10 +188,8 @@
};
home.packages = [
# Core utilities
pkgs.baobab
pkgs.epiphany
pkgs.gnome-text-editor
pkgs.gnome-calculator
pkgs.gnome-calendar
pkgs.gnome-characters
pkgs.gnome-clocks
@ -238,7 +202,6 @@
pkgs.gnome-system-monitor
pkgs.gnome-weather
pkgs.loupe
pkgs.nautilus
pkgs.gnome-connections
pkgs.simple-scan
pkgs.snapshot
@ -260,28 +223,6 @@
pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
pkgs.xdg-user-dirs-gtk # Used to create the default bookmarks
# Games
pkgs.aisleriot
pkgs.atomix
pkgs.five-or-more
pkgs.four-in-a-row
pkgs.gnome-2048
pkgs.gnome-chess
pkgs.gnome-klotski
pkgs.gnome-mahjongg
pkgs.gnome-mines
pkgs.gnome-nibbles
pkgs.gnome-robots
pkgs.gnome-sudoku
pkgs.gnome-taquin
pkgs.gnome-tetravex
pkgs.hitori
pkgs.iagno
pkgs.lightsoff
pkgs.quadrapassel
pkgs.swell-foop
pkgs.tali
# Fonts
pkgs.cantarell-fonts
pkgs.dejavu_fonts
@ -290,7 +231,6 @@
# Other stuff
pkgs.gnome-session
# pkgs.gnome-session.sessions
];
};
};
@ -376,7 +316,7 @@
vscode.enable = true;
docker.enable = true;
matlab.enable = true;
mathematica.enable = false;
mathematica.enable = true;
# Languages
haskell.enable = false;
@ -397,7 +337,7 @@
let
fontpkgs = config.desktop.theming.fonts.pkgs;
in
{
lib.mkDefault {
# Fonts
fonts.serif = fontpkgs."DejaVu Serif";
fonts.sansSerif = fontpkgs."DejaVu Sans";
@ -412,5 +352,55 @@
flavor = "mocha";
};
};
}
{
# Default desktop environment
modules = {
# Desktop environment
river.enable = true;
waylock.enable = true;
waybar.enable = true;
mako.enable = true;
foot.enable = true;
rofi-rbw.enable = true;
};
# TODO: Remove everything below, it is here out of convenience and should be elsewhere
xdg.portal = {
enable = true;
config.common.default = lib.mkDefault [
"wlr"
"gtk"
];
extraPortals =
with pkgs;
lib.mkDefault [
xdg-desktop-portal-gtk
xdg-desktop-portal-wlr
];
};
# Color scheme
desktop.theming.background = lib.mkDefault {
# path = "unsorted/a_group_of_mountains_with_a_building_in_the_background.jpg";
# image = "anime/a_colorful_buildings_with_power_lines.jpg";
image = {
url = "https://i.postimg.cc/tTB3dM3T/1382899.png";
hash = "sha256-kStcwAtK2vxitU6uaQtZTA5iFS8k0iXkFwinY2M8wQE=";
};
# image = {
# url = "https://raw.githubusercontent.com/dharmx/walls/refs/heads/main/digital/a_couple_of_people_standing_on_a_mountain.png";
# hash = "sha256-SgKG090iSxwOPCGH/2ODPbwe275Zi5k0+d5Hso0mN7c=";
# };
themed = true;
inverted = false;
};
desktop.theming.themes.catppuccin = {
enable = true;
flavor = "mocha";
};
}
);
}