adding back fixed cosmic

flake.lock

@@ -185,22 +185,6 @@
       }
     },
     "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1746162366,
-        "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=",
-        "owner": "nix-community",
-        "repo": "flake-compat",
-        "rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -216,7 +200,7 @@
         "type": "github"
       }
     },
-    "flake-compat_3": {
+    "flake-compat_2": {
       "locked": {
         "lastModified": 1747046372,
         "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
@@ -469,27 +453,6 @@
         "type": "github"
       }
     },
-    "nixos-cosmic": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs_5",
-        "nixpkgs-stable": "nixpkgs-stable_2",
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1750331408,
-        "narHash": "sha256-Rjc9aW5Dxn+KeBsx1DvkC+4SyLvdjEEyKJSVD5Q5UZw=",
-        "owner": "lilyinstarlight",
-        "repo": "nixos-cosmic",
-        "rev": "39eb68d021d698bc4d0cd86bf0c75a70285726cd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lilyinstarlight",
-        "repo": "nixos-cosmic",
-        "type": "github"
-      }
-    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1750083401,
@@ -570,22 +533,6 @@
       }
     },
     "nixpkgs-stable_2": {
-      "locked": {
-        "lastModified": 1750151854,
-        "narHash": "sha256-3za+1J9FifMetO7E/kwgyW+dp+8pPBNlWKfcBovnn6M=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ad5c70bcc5cc5178205161b7a7d61a6e80f6d244",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable_3": {
       "locked": {
         "lastModified": 1750330365,
         "narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=",
@@ -667,15 +614,15 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1750134718,
+        "lastModified": 1754498491,
-        "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=",
+        "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c",
+        "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -806,45 +753,20 @@
         "emacs": "emacs",
         "home-manager": "home-manager",
         "nix-bitcoin": "nix-bitcoin",
-        "nixos-cosmic": "nixos-cosmic",
         "nixos-hardware": "nixos-hardware",
         "nixos-unstable-small": "nixos-unstable-small",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_5",
-          "nixos-cosmic",
+        "nixpkgs-stable": "nixpkgs-stable_2",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable_3",
         "plasma-manager": "plasma-manager",
         "quickemu": "quickemu",
         "simple-nixos-mailserver": "simple-nixos-mailserver",
         "stylix": "stylix"
       }
     },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "nixos-cosmic",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1750300711,
-        "narHash": "sha256-4XHPocwP+66PhxyyObPXfI+Rql4PoGe/xBK791N8I78=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "4178888556c15e0a1c57850d2f103ac300a6e9e2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
     "simple-nixos-mailserver": {
       "inputs": {
         "blobs": "blobs",
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat",
         "nixpkgs": "nixpkgs_7",
         "nixpkgs-24_11": "nixpkgs-24_11"
       },
@@ -870,7 +792,7 @@
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_2",
         "flake-parts": "flake-parts",
         "git-hooks": "git-hooks",
         "gnome-shell": "gnome-shell",

flake.nix

@@ -4,7 +4,7 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nixos-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small";
-    nixpkgs.follows = "nixos-cosmic/nixpkgs";
+    # nixpkgs.follows = "nixos-cosmic/nixpkgs";
     nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     home-manager = {
@@ -46,7 +46,7 @@
     simple-nixos-mailserver = {
       url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.11";
     };
-    nixos-cosmic = { url = "github:lilyinstarlight/nixos-cosmic"; };
+    # nixos-cosmic = { url = "github:lilyinstarlight/nixos-cosmic"; };
     anipy-cli = { url = "github:sdaqo/anipy-cli"; };
     darkly = { url = "github:Bali10050/Darkly"; };
     # rust-overlay = {
@@ -56,7 +56,7 @@
   };
 
   outputs = inputs@{ nixpkgs, nixpkgs-stable, home-manager, plasma-manager
-    , nixos-cosmic, quickemu, nixos-hardware, emacs, nix-bitcoin #, eww
+    , quickemu, nixos-hardware, emacs, nix-bitcoin #, eww
     , simple-nixos-mailserver, anipy-cli, darkly,
     # ags,
     stylix, ... }:
@@ -127,7 +127,7 @@
             # hyprland.nixosModules.default
             # stylix.nixosModules.stylix
             nixos-hardware.nixosModules.framework-11th-gen-intel
-            nixos-cosmic.nixosModules.default
+            # nixos-cosmic.nixosModules.default
             # libre-presenter.defaultPackage
             {
               home-manager.useGlobalPkgs = true;
@@ -149,7 +149,7 @@
             home-manager.nixosModules.home-manager
             # hyprland.nixosModules.default
             # stylix.nixosModules.stylix
-            nixos-cosmic.nixosModules.default
+            # nixos-cosmic.nixosModules.default
             nixos-hardware.nixosModules.common-gpu-amd
             {
               home-manager.useGlobalPkgs = true;

modules/desktop.nix

@@ -33,7 +33,7 @@ in
   boot.supportedFilesystems = [ "ntfs" ];
 
   services = {
-    desktopManager.cosmic.enable = false;
+    desktopManager.cosmic.enable = true;
   };
 
   programs.nix-ld.enable = true;
@@ -50,10 +50,12 @@ in
       enableUserSlices = true;
       enableSystemSlice = true;
     };
-    extraConfig = ''
+    settings.Manager = {
-      DefaultTimeoutStopSec=10s
+      DefaultIOAccounting = true;
-      DefaultTimeoutStartSec=10s
+      DefaultIPAccounting = true;
-    '';
+      DefaultTimeoutStopSec = "10s";
+      DefaultTimeoutStartSec = "10s";
+    };
   };
   fonts.packages = with pkgs; [
     nerd-fonts.victor-mono