buncha changes

flake.lock

@@ -279,6 +279,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1727348695,
+        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "game-of-life": "game-of-life",
@@ -287,7 +303,8 @@
         "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs_4",
         "snowfall-lib": "snowfall-lib",
-        "sops-nix": "sops-nix"
+        "sops-nix": "sops-nix",
+        "zen-browser": "zen-browser"
       }
     },
     "rust-overlay": {
@@ -383,6 +400,24 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "zen-browser": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_5"
+      },
+      "locked": {
+        "lastModified": 1727721329,
+        "narHash": "sha256-QYlWZwUSwrM7BuO+dXclZIwoPvBIuJr6GpFKv9XKFPI=",
+        "owner": "MarceColl",
+        "repo": "zen-browser-flake",
+        "rev": "e6ab73f405e9a2896cce5956c549a9cc359e5fcc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "MarceColl",
+        "repo": "zen-browser-flake",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -17,6 +17,7 @@
       url = "github:mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    zen-browser.url = "github:MarceColl/zen-browser-flake";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";

homes/x86_64-linux/andreas@drivebystation-nix/default.nix

@@ -1,5 +1,6 @@
 { config
 , lib
+, inputs
 , pkgs
 , ...
 }:
@@ -27,6 +28,6 @@ in
       pkgs.qbittorrent
       pkgs.vesktop
       pkgs.obsidian
-    ];
+      inputs.zen-browser.packages.x86_64-linux.default    ];
   };
 }

modules/nixos/cosmic-desktop/default.nix

@@ -0,0 +1,32 @@
+{ config
+, lib
+, inputs
+, pkgs
+, ...
+}:
+let
+  inherit (lib) mkEnableOption mkIf;
+  inherit (lib.my-namespace) disabled enabled;
+
+  cfg = config.my-namespace.cosmic-desktop;
+  # moduleImports = {
+  #   "enabled" = [inputs.nixos-cosmic.nixosModules.default];
+  #   "disabled" = [];
+  # };
+  # optionalImports = { imports = []; };
+in
+{
+  options.my-namespace.cosmic-desktop = {
+    enable = mkEnableOption "Enable nvidia";
+  };
+  imports = [ inputs.nixos-cosmic.nixosModules.default ];
+  config = mkIf cfg.enable {
+    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;
+  };
+}

systems/x86_64-linux/drivebystation-nix/configuration.nix

@@ -47,6 +47,7 @@
 
   # Enable the GNOME Desktop Environment.
   services.xserver.displayManager.gdm.enable = true; 
+  services.xserver.displayManager.defaultSession = "gnome";
   # services.xserver.displayManager.lightdm.enable = true;
   # services.xserver.displayManager.autoLogin.enable = true;
   # services.xserver.displayManager.autoLogin.user = "andreas";
@@ -100,6 +101,7 @@
   environment.systemPackages = with pkgs; [
   #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
   #  wget
+    pkgs.gnome3.gnome-tweaks
   ];
 
   # Some programs need SUID wrappers, can be configured further or are

systems/x86_64-linux/drivebystation-nix/default.nix

@@ -26,6 +26,7 @@
 , ...
 }:
 let
+  inherit (lib.my-namespace) enabled;
   inherit pkgs;
   installedPackages = lib.my-namespace.mkPackages pkgs;
 in
@@ -45,20 +46,26 @@ in
         description = "Andreas Schaafsma";
         extraGroups = [ "networkmanager" "wheel" ]    ;
         packages = with pkgs; [
+          # Packages from inputs
+          inputs.game-of-life.packages.x86_64-linux.default
+          inputs.zen-browser.packages.x86_64-linux.default
+          inputs.nixos-cosmic
+
           flatpak
           gnome-software
+          gnomeExtensions.pop-shell
           soundwireserver
           vscode  
           spotify
-          appimage-run
+          appimage-run  
-          inputs.game-of-life.packages.x86_64-linux.default
-          inputs.nixos-cosmic
           minecraft
           trilium-desktop
           terraform
           #  thunderbird
         ];
       };
+
+      my-namespace.cosmic-desktop.enable = false;
       # lib.my-namespace.home.stream-tools.enable = true;
 
       # Open ports in the firewall.