From c40758380129e96e6a119b5d3f8aa5ab497f918d Mon Sep 17 00:00:00 2001
From: 4DBug <bug.dev.mail@gmail.com>
Date: Tue, 3 Jun 2025 07:12:27 -0500
Subject: [PATCH] cosmic

---
 core/audio.nix        | 18 ++++++++++--------
 core/nix.nix          | 10 +++++++++-
 etc/nixos/flake.nix   | 17 ++++++++++++++++-
 gnome.nix             | 10 ++++++----
 packages/packages.nix | 15 ++++++++-------
 packages/user.nix     | 15 +++++++--------
 6 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/core/audio.nix b/core/audio.nix
index fb07ac4..3fbc94f 100644
--- a/core/audio.nix
+++ b/core/audio.nix
@@ -1,16 +1,18 @@
 { ... }:
 
 {
-    hardware.pulseaudio.enable = false;
+    services = {
+        pulseaudio.enable = false;
+        
+        pipewire = {
+            enable = true;
 
-    services.pipewire = {
-        enable = true;
+            alsa.enable = true;
+            alsa.support32Bit = true;
 
-        alsa.enable = true;
-        alsa.support32Bit = true;
+            pulse.enable = true;
 
-        pulse.enable = true;
-
-        jack.enable = true;
+            jack.enable = true;
+        };
     };
 }
diff --git a/core/nix.nix b/core/nix.nix
index 59b6473..9c12eec 100644
--- a/core/nix.nix
+++ b/core/nix.nix
@@ -1,6 +1,14 @@
 { ... }:
 
 {
-    system.stateVersion = "24.11";
+    system = {
+        stateVersion = "25.05";
+
+        autoUpgrade = {
+            enable = true;
+            allowReboot = true;
+        };
+    };
+
     nix.settings.experimental-features = [ "nix-command" "flakes" ];
 }
diff --git a/etc/nixos/flake.nix b/etc/nixos/flake.nix
index 3bffbcb..d59a5f4 100644
--- a/etc/nixos/flake.nix
+++ b/etc/nixos/flake.nix
@@ -1,9 +1,14 @@
 
 {
     inputs = {
-        nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+        nixpkgs.follows = "nixos-cosmic/nixpkgs";
+        nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
+
         flatpaks.url = "github:gmodena/nix-flatpak/?ref=latest";
+
+        nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic";
     };
+
     outputs = inputs@{ self, nixpkgs, home-manager, flatpaks, ... }:
     let
         system = "x86_64-linux";
@@ -12,7 +17,17 @@
         nixosConfigurations.nix = nixpkgs.lib.nixosSystem {
             inherit system;
             modules = [
+                {
+                    nix.settings = {
+                        substituters = [ "https://cosmic.cachix.org/" ];
+                        trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
+                    };
+                }
+
+                nixos-cosmic.nixosModules.default
+
                 flatpaks.nixosModules.nix-flatpak
+                
                 ./configuration.nix
             ];
         };
diff --git a/gnome.nix b/gnome.nix
index ba4fbf5..17ac53d 100644
--- a/gnome.nix
+++ b/gnome.nix
@@ -11,20 +11,22 @@
 
     services = {
         displayManager = {
+            cosmic-greeter.enable = true;
+
             autoLogin = {
                 enable = true;
                 user = "bug";
             };
         };
 
-        # desktopManager.cosmic.enable = true;
+        desktopManager.cosmic.enable = true;
+
+        displayManager.gdm.enable = true;
+        desktopManager.gnome.enable = true;
 
         xserver = {
             enable = true;
 
-            displayManager.gdm.enable = true;
-            desktopManager.gnome.enable = true;
-
             xkb = {
                 layout = "us";
                 variant = "";
diff --git a/packages/packages.nix b/packages/packages.nix
index 05e1243..b292ffe 100644
--- a/packages/packages.nix
+++ b/packages/packages.nix
@@ -14,9 +14,9 @@
         };
         
         overlays = [
-            (self: super: {
-                plasticity = self.callPackage ./plasticity.nix { };
-            })
+            #(self: super: {
+            #    plasticity = self.callPackage ./plasticity.nix { };
+            #})
         ];
     };
     
@@ -29,7 +29,7 @@
         }];
 
         update.auto.enable = true;
-        uninstallUnmanaged = false;
+        uninstallUnmanaged = true;
     };
 
     programs.virt-manager.enable = true;
@@ -45,10 +45,11 @@
             fetch = "fastfetch --file ~/Pictures/Ansi/nix.ans";
             neofetch = "fetch";
 
-            rebuild = "sudo nixos-rebuild switch --impure && home-manager switch --impure";
+            rebuild = "sudo nixos-rebuild switch --impure"; # home-manager switch --impure
 
-            pissh = "ssh -t $(avahi-resolve-host-name -4 pi.home | awk '{print $2}')";
-            pi = "pissh \"cd $(pwd) && bash\"";
+            #pissh = "ssh -t $(avahi-resolve-host-name -4 pi.home | awk '{print $2}')";
+            #pi = "pissh \"cd $(pwd) && bash\"";
+            pi = "ssh pi.bug.tools";
 
             pico = "ssh pico.sh";
 
diff --git a/packages/user.nix b/packages/user.nix
index e845f5b..aa73c5b 100644
--- a/packages/user.nix
+++ b/packages/user.nix
@@ -103,10 +103,10 @@
             glib
         ]))
 
-        plasticity
+        #plasticity
 
         # video
-        kdenlive
+        # kdenlive
 
         # markdown / notes
         obsidian
@@ -120,7 +120,7 @@
         pulseaudio
 
         # utilties
-        mapscii
+        #mapscii
         cloudflared
         base16-schemes
         ptyxis
@@ -133,20 +133,19 @@
         xclicker
         gh
         scanmem
-        openrgb
+        #openrgb
         samrewritten
-        testdisk
+        #testdisk
         impression
         bambu-studio
         sushi
         #lutris
         resources
-        discord
+        #discord
         authenticator
         eyedropper
-        turtle
+        #turtle
         #xonotic
-        apostrophe
         buffer
     ];
 }