Update README.md

README.md

@@ -1,20 +1,19 @@
 # deskOS - An easy to use, stable desktop operating system
 
-See https://nixup.io/desk-os/learn-more
-
 ## Run a deskOS demo in a virtual machine
 
 If you are running NixOS or you have the [Nix package manager](https://nixos.org/) installed, you can easily run a deskOS demo from this flake:
 
 ```sh
-nix run github:nixup-io/desk-os
+nix run git+https://git.michaelsmith.be/m/desk-os.git
 ```
 
 ## Contact
 
-- E-mail: [info@nixup.io](mailto:info@nixup.io)
+- E-mail: [postbus@michaelsmith.be](mailto:postbus@michaelsmith.be)
+- Mastodon: [@neo](https://social.hacktheplanet.be/@neo)
+- Bluesky: [Michael Smith (Neo)](https://bsky.app/profile/hacktheplanet.be)
 - X: [@michaelshmitty](https://x.com/michaelshmitty)
-- Fediverse: [@neo](https://social.hacktheplanet.be/@neo)
 
 ## Acknowledgements
 

flake.lock

@@ -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"
       }

flake.nix

@@ -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 = {

modules/desk-os/default.nix

@@ -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

modules/installer/default.nix

@@ -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;
   };

packages/calamares-extensions/branding/default/branding.desc

@@ -18,7 +18,7 @@ strings:
     bootloaderEntryName: deskOS
     productUrl:          https://nixup.io
     supportUrl:          https://nixup.io
-    knownIssuesUrl:      https://github.com/nixup-io/desk-os/issues
+    knownIssuesUrl:      https://git.michaelsmith.be/m/desk-os/issues
     releaseNotesUrl:     https://nixup.io
     donateUrl:           https://nixup.io
 images:

packages/calamares-extensions/config/modules/welcome.conf

@@ -8,7 +8,7 @@ showReleaseNotesUrl: false
 requirements:
   requiredStorage:    60
   requiredRam:        4.0
-  internetCheckUrl: [ https://nixup.io, https://cache.nixos.org/ ]
+  internetCheckUrl: [ https://cache.nixos.org/ ]
   check:
     - storage
     - ram

packages/calamares-extensions/modules/desk_os_installation/main.py

@@ -54,9 +54,9 @@ flake = f"""
   description = "deskOS flake";
 
   inputs = {{
-    nixpkgs.url = "github:nixup-io/nixpkgs-desk-os/stable";
+    nixpkgs.url = "git+https://git.michaelsmith.be/m/nixpkgs-desk-os.git";
     desk-os = {{
-      url = "github:nixup-io/desk-os";
+      url = "git+https://git.michaelsmith.be/m/desk-os.git";
       inputs.nixpkgs.follows = "nixpkgs";
     }};
   }};