m/desk-os
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to nixos-24.11

Browse Source
This commit is contained in:
Michael Smith 2025-04-04 16:08:31 +02:00
parent 8cac364367
commit a36b44d1af
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock generated
View File

@ -2,16 +2,16 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1725407940,
"narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=",
"lastModified": 1743576891,
"narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3",
"rev": "44a69ed688786e98a101f02b712c313f1ade37ab",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}

2
flake.nix
View File

@ -2,7 +2,7 @@
description = "deskOS - An easy to use, stable desktop operating system";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
};
outputs = {

12
modules/desk-os/default.nix
View File

@ -68,16 +68,14 @@
pulse.enable = true;
};
i18n.inputMethod.enabled = "ibus";
programs.dconf.enable = true;
programs.dconf.profiles = {
user.databases = [
{
settings = {
"org/gnome/desktop/background" = {
picture-uri = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/geometrics-l.jxl";
picture-uri-dark = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/geometrics-d.jxl";
picture-uri = "file://${pkgs.gnome-backgrounds}/share/backgrounds/gnome/geometrics-l.jxl";
picture-uri-dark = "file://${pkgs.gnome-backgrounds}/share/backgrounds/gnome/geometrics-d.jxl";
};
"org/gnome/desktop/wm/preferences" = {
@ -85,7 +83,7 @@
};
"org/gnome/desktop/screensaver" = {
picture-uri = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/geometrics-l.jxl";
picture-uri = "file://${pkgs.gnome-backgrounds}/share/backgrounds/gnome/geometrics-l.jxl";
};
"org/gnome/desktop/interface" = {
@ -200,7 +198,7 @@
desktopManager.gnome.enable = true;
};
services.udev.packages = with pkgs; [gnome.gnome-settings-daemon];
services.udev.packages = with pkgs; [gnome-settings-daemon];
programs.firefox.enable = true;
@ -217,7 +215,7 @@
environment.gnome.excludePackages = with pkgs; [
pkgs.gnome-tour
pkgs.gnome.epiphany
pkgs.epiphany
];
# Fix scaling issues with electron apps

6
modules/installer/default.nix
View File

@ -147,12 +147,12 @@ in {
sleep-inactive-ac-type='nothing'
sleep-inactive-battery-type='nothing'
[org.gnome.desktop.background]
picture-uri='file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/geometrics-l.jxl'
picture-uri='file://${pkgs.gnome-backgrounds}/share/backgrounds/gnome/geometrics-l.jxl'
[org.gnome.desktop.screensaver]
picture-uri='file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/geometrics-l.jxl'
picture-uri='file://${pkgs.gnome-backgrounds}/share/backgrounds/gnome/geometrics-l.jxl'
'';
extraGSettingsOverridePackages = [pkgs.gnome.gnome-settings-daemon];
extraGSettingsOverridePackages = [pkgs.gnome-settings-daemon];
enable = true;
};