From a173c0e87c22b90ca53f55cff8a52ca5d071abdc Mon Sep 17 00:00:00 2001
From: Aaron  Honeycutt <aaronhoneycutt@protonmail.com>
Date: Wed, 28 Jun 2023 12:00:37 +0000
Subject: [PATCH] Update COSMIC-flake.nix

---
 systems/COSMIC-flake.nix | 116 +--------------------------------------
 1 file changed, 2 insertions(+), 114 deletions(-)

diff --git a/systems/COSMIC-flake.nix b/systems/COSMIC-flake.nix
index 0c74817..d44fb4b 100644
--- a/systems/COSMIC-flake.nix
+++ b/systems/COSMIC-flake.nix
@@ -3,8 +3,6 @@
 
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-23.05";
-    home-manager.url = "github:nix-community/home-manager/release-23.05";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
     cosmic-comp.url = "github:pop-os/cosmic-comp/master_jammy";
     cosmic-panel.url = "github:pop-os/cosmic-panel/master_jammy";
     cosmic-settings.url = "github:pop-os/cosmic-settings/master_jammy";
@@ -19,7 +17,7 @@
     xdg-desktop-portal-cosmic.url = "github:pop-os/xdg-desktop-portal-cosmic/master_jammy";
   };
 
-  outputs = { self, nixpkgs, home-manager, cosmic-comp, cosmic-session, cosmic-panel, cosmic-applets, cosmic-settings, cosmic-settings-daemon, cosmic-launcher, cosmic-applibrary, cosmic-workspaces, cosmic-osd, xdg-desktop-portal-cosmic, cosmic-bg  }@attrs: let
+  outputs = { self, nixpkgs, cosmic-comp, cosmic-session, cosmic-panel, cosmic-applets, cosmic-settings, cosmic-settings-daemon, cosmic-launcher, cosmic-applibrary, cosmic-workspaces, cosmic-osd, xdg-desktop-portal-cosmic, cosmic-bg  }@attrs: let
     system = "x86_64-linux";
     pkgs = import nixpkgs {
       inherit system;
@@ -35,117 +33,7 @@
         inherit system;
         specialArgs.inputs = attrs;
         modules = [
-          ./system/configuration.nix
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.aaronh = import ./users/aaronh/home.nix;
-          }
-
-        ({config, pkgs, ...}: {
-          nix = {
-            settings.auto-optimise-store = true;
-            settings.experimental-features = [ "nix-command" "flakes" ];
-            settings.extra-platforms = [ "aarch64-linux" ];
-           
-            gc = {
-              automatic = true;
-              dates = "weekly";
-              options = "--delete-older-than 30d";
-            };
-
-          boot = {
-            kernelPackages = pkgs.linuxPackages_latest;
-
-            binfmt.emulatedSystems = [ "aarch64-linux" ];
-
-            loader = {
-              systemd-boot.enable = true;
-              systemd-boot.consoleMode = "0";
-            };
-          };
-
-          networking.networkmanager.enable = true;
-
-          # Set your time zone.
-          time.timeZone = "America/Denver";
-          
-          # Enter keyboard layout
-          services.xserver.layout = "us";
-
-          # Define user accounts
-          users.users.aaronh = {
-            description = "Aaron Honeycutt";
-            home = "/home/aaronh";
-            extraGroups = [ "wheel" "networkmanager" "adm"];
-            isNormalUser = true;
-            hashedPassword = "$6$aAcbLtqiqzySifls$jdKMOQjoWITHD/dWNNZVUH/qNc6aoJ7v4zYofi0U7IJSVTbmOfChS3mzaJbp57AodjdPNKPrnrip8Nlh2Qanx.";
-
-            packages = with pkgs; [
-              # Fonts
-              fira
-              roboto-slab
-
-              # CLI
-              git
-              git-lfs
-         
-              # GUI
-              firefox
-            ];
-          };
-    
-          # Allow Unfree
-          nixpkgs.config.allowUnfree = true;
-
-          # Install some packages
-          environment.systemPackages = 
-            with pkgs; 
-            [
-              avahi
-              cargo
-              dmidecode
-              libcamera
-              lshw
-              nix-index
-              unzip
-              wget
-              xz
-            ]; 
- 
-          # Enable/Disable hardware
-          ## Turn off PulseAudio
-          hardware.pulseaudio.enable = false;
-
-          # Enable Pipewire
-          security.rtkit.enable = true;
-          services.pipewire = {
-            enable = true;
-            alsa.enable = true;
-            alsa.support32Bit = true;
-            pulse.enable = true;
-          };
-
-          # Enable Bluetooth
-          hardware.bluetooth.enable = true;
-
-          # Enable services
-          services.fwupd.enable = true;
-          services.printing.enable = true;
-          services.openssh.enable = true;
-
-          services.avahi = {
-            enable = true;
-            nssmdns = true;
-            openFirewall = true;
-          };
-
-          system = {
-            stateVersion = "23.05";
-            autoUpgrade.enable = true;
-          };
-        })
+          ./configuration.nix
         ];
       };
     };