Merge branch 'framework/master' into alpine/master

nixos/default.nix

@@ -30,10 +30,6 @@ in {
   };
 
   networking.networkmanager.enable = true;
-  programs.nm-applet = {
-    enable = true;
-    indicator = true;
-  };
 
   # fix nixos-containers
   networking.nat.enable = true;
@@ -91,7 +87,6 @@ in {
   services.gvfs.enable = true;
 
   environment.systemPackages = with pkgs; [
-    networkmanagerapplet
     tealdeer
     alsa-utils
     trash-cli

nixos/programs/cosmic.nix

@@ -3,18 +3,18 @@
   config,
   ...
 }: {
-  imports = [
-    inputs.nixos-cosmic.nixosModules.default
-  ];
-  nix.settings = {
-    substituters = ["https://cosmic.cachix.org/"];
-    trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="];
-  };
+  # imports = [
+  #   inputs.nixos-cosmic.nixosModules.default
+  # ];
+  # nix.settings = {
+  #   substituters = ["https://cosmic.cachix.org/"];
+  #   trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="];
+  # };
   services.desktopManager.cosmic.enable = true;
   services.displayManager.cosmic-greeter.enable = true;
-  services.system76-scheduler.enable = true;
-  home-manager.users.${config.user}.imports = [
-    (inputs.hm-cosmic.homeManagerModules.cosmic)
-    ../../home/desktop/cosmic/.
-  ];
+  # services.system76-scheduler.enable = true;
+  # home-manager.users.${config.user}.imports = [
+  #   (inputs.hm-cosmic.homeManagerModules.cosmic)
+  #   ../../home/desktop/cosmic/.
+  # ];
 }

nixos/services/musnix.nix

@@ -1,4 +1,10 @@
-{ inputs, user, pkgs, lib, ... }: {
+{
+  inputs,
+  user,
+  pkgs,
+  lib,
+  ...
+}: {
   imports = [inputs.musnix.nixosModules.musnix];
   users.users.${user}.extraGroups = ["audio"];
   musnix = {

nixos/workstation.nix

@@ -33,8 +33,7 @@
 
   stylix = {
     enable = true;
-    image = ../images/nix-soft.png;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
+    image = "${pkgs.cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg";
     polarity = "dark";
     opacity = {
       terminal = 0.9;
@@ -47,7 +46,6 @@
       package = pkgs.vanilla-dmz;
       size = 24;
     };
-    # autoEnable = true;
     targets = {
       qt.enable = true;
       grub = {
@@ -70,4 +68,10 @@
   home-manager.users.${config.user}.imports = [
     ../home/workstation.nix
   ];
+
+  environment.systemPackages = [pkgs.networkmanagerapplet];
+  programs.nm-applet = {
+    enable = true;
+    indicator = true;
+  };
 }