Update Makefile

Makefile

@@ -1,4 +1,4 @@
-.PHONY: init install link unlink rebuild update purge edit hw help
+.PHONY: init install link unlink build update purge edit hw help
 
 NIXOS_DIR := /etc/nixos
 REPO_DIR := $(shell pwd)
@@ -16,7 +16,7 @@ help:
 	@echo ""
 	@echo "  make init     - first time setup"
 	@echo "  make hw       - generate hardware-configuration.nix"
-	@echo "  make rebuild  - rebuild nixos configuration"
+	@echo "  make build    - build nixos configuration"
 	@echo "  make update   - update flake inputs and rebuild"
 	@echo "  make purge    - garbage collect"
 	@echo "  make link     - symlink to /etc/nixos"
@@ -48,7 +48,7 @@ unlink:
 		echo "/etc/nixos is not a symlink"; \
 	fi
 
-rebuild:
+build:
 	@if [ -f hardware-configuration.nix ]; then \
 		git add -f -N hardware-configuration.nix; \
 	fi

flake.lock

@@ -52,11 +52,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771744638,
+        "lastModified": 1772302941,
-        "narHash": "sha256-EDLi+YAsEEAmMeZe1v6GccuGRbCkpSZp/+A6g+pivR8=",
+        "narHash": "sha256-TL3+ckbOTILXrR0qSK3dJj2BJ0S5yz/YSsUF1oEgd9g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cb6c151f5c9db4df0b69d06894dc8484de1f16a0",
+        "rev": "9b9142b5fe214c2adabe86257c33e022372b7c96",
         "type": "github"
       },
       "original": {
@@ -68,11 +68,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1771714954,
+        "lastModified": 1772047000,
-        "narHash": "sha256-nhZJPnBavtu40/L2aqpljrfUNb2rxmWTmSjK2c9UKds=",
+        "narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "afbbf774e2087c3d734266c22f96fca2e78d3620",
+        "rev": "1267bb4920d0fc06ea916734c11b0bf004bbe17e",
         "type": "github"
       },
       "original": {
@@ -82,11 +82,28 @@
         "type": "github"
       }
     },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1771848320,
+        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "cosmic-manager": "cosmic-manager",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable"
       }
     }
   },

flake.nix

@@ -3,6 +3,8 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+
     home-manager = {
       url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -16,15 +18,22 @@
     };
   };
 
-  outputs = { self, nixpkgs, home-manager, cosmic-manager, ... }@inputs:
+  outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }@inputs:
     let
       settings = import ./settings.nix;
       system = "x86_64-linux";
+      overlay-unstable = final: prev: {
+        unstable = import nixpkgs-unstable {
+          inherit system;
+          config.allowUnfree = true;
+        };
+      };
     in {
     nixosConfigurations."${settings.hostname}" = nixpkgs.lib.nixosSystem {
       inherit system;
       specialArgs = { inherit inputs; };
       modules = [
+        ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
         ./configuration.nix
         home-manager.nixosModules.home-manager
       ];

modules/audio.nix

@@ -12,6 +12,25 @@
     wireplumber.enable = true;
   };
 
+  # Elgato makes shit products and they should feel bad :c
+  services.pipewire.wireplumber.extraConfig."51-wave3" = {
+    "monitor.alsa.rules" = [
+      {
+        matches = [
+          {
+            "node.name" = "~alsa_input.usb-Elgato_Systems_Elgato_Wave_3.*";
+          }
+        ];
+        actions = {
+          update-props = {
+            "session.suspend-timeout-seconds" = 0;
+            "node.pause-on-idle" = false;
+          };
+        };
+      }
+    ];
+  };
+
   # DeepFilterNet noise reduction filter chain
   services.pipewire.extraConfig.pipewire."99-deepfilter-source" = {
     "context.modules" = [

modules/desktop.nix

@@ -1,8 +1,14 @@
-{ ... }:
+{ pkgs, ... }:
 
 {
-  services.desktopManager.cosmic.enable = true;
+  services.xserver.enable = true;
-  services.displayManager.cosmic-greeter.enable = true;
+
+  services.desktopManager.gnome.enable = true;
+  services.displayManager.gdm.enable = true;
 
   services.printing.enable = true;
+
+  environment.gnome.excludePackages = with pkgs; [
+    epiphany
+  ];
 }

modules/home.nix

@@ -7,12 +7,11 @@ let
     ./home/session.nix
     ./home/packages.nix
     ./home/git.nix
-    ./home/cosmic.nix
+    ./home/gnome.nix
     ./home/cli.nix
     ./home/librewolf.nix
     ./home/zed.nix
     ./home/ghostty.nix
-    ./home/syncthing.nix
     ./home/ssh.nix
   ];
 in

modules/home/cli.nix

@@ -3,7 +3,7 @@
 {
   home.shellAliases = {
     # Nix Commands
-    "nix:rebuild" = "sudo nixos-rebuild switch --flake /etc/nixos";
+    "nix:build" = "sudo nixos-rebuild switch --flake /etc/nixos";
     "nix:update" = "cd /etc/nixos && nix flake update && sudo nixos-rebuild switch --flake .";
     "nix:purge" =
       "sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot";

modules/home/cosmic.nix

@@ -1,92 +0,0 @@
-{ config, cosmicLib, ... }:
-
-{
-  wayland.desktopManager.cosmic = {
-    enable = true;
-
-    appearance = {
-      theme = {
-        mode = "dark";
-        dark = {
-          # Pink accent color
-          accent = cosmicLib.cosmic.mkRON "optional" {
-            red = 0.91;
-            green = 0.29;
-            blue = 0.60;
-          };
-        };
-      };
-      toolkit = {
-        apply_theme_global = true;
-        show_maximize = true;
-        show_minimize = true;
-        icon_theme = "Cosmic";
-        interface_density = cosmicLib.cosmic.mkRON "enum" "Standard";
-      };
-    };
-
-    wallpapers = [
-      {
-        output = "all";
-        source = cosmicLib.cosmic.mkRON "enum" {
-          value = [ "${config.home.homeDirectory}/Assets/wallpapers/sound.png" ];
-          variant = "Path";
-        };
-        scaling_mode = cosmicLib.cosmic.mkRON "enum" "Zoom";
-        filter_method = cosmicLib.cosmic.mkRON "enum" "Lanczos";
-        filter_by_theme = false;
-        sampling_method = cosmicLib.cosmic.mkRON "enum" "Alphanumeric";
-        rotation_frequency = 0;
-      }
-    ];
-
-    compositor = {
-      autotile = false;
-      active_hint = true;
-
-      # Flat mouse acceleration (no accel)
-      input_default = {
-        acceleration = cosmicLib.cosmic.mkRON "optional" {
-          profile = cosmicLib.cosmic.mkRON "optional" (cosmicLib.cosmic.mkRON "enum" "Flat");
-          speed = 0.0;
-        };
-      };
-    };
-
-    shortcuts = [
-      {
-        # Super+B -> Open browser
-        action = cosmicLib.cosmic.mkRON "enum" {
-          variant = "Spawn";
-          value = [ "librewolf" ];
-        };
-        key = "Super+b";
-        description = cosmicLib.cosmic.mkRON "optional" "Open Browser";
-      }
-      {
-        # Super+E -> Open file manager
-        action = cosmicLib.cosmic.mkRON "enum" {
-          variant = "Spawn";
-          value = [ "cosmic-files" ];
-        };
-        key = "Super+e";
-        description = cosmicLib.cosmic.mkRON "optional" "Open File Manager";
-      }
-      {
-        action = cosmicLib.cosmic.mkRON "enum" {
-          value = [
-            (cosmicLib.cosmic.mkRON "enum" "WorkspaceOverview")
-          ];
-          variant = "System";
-        };
-        key = "Super";
-      }
-    ];
-
-    applets.time.settings = {
-      show_weekday = true;
-      show_date_in_top_panel = true;
-      military_time = false;
-    };
-  };
-}

modules/home/gnome.nix

@@ -6,6 +6,8 @@
       color-scheme = "prefer-dark";
       accent-color = "pink";
       clock-show-weekday = true;
+      clock-show-date = true;
+      clock-format = "12h";
     };
 
     "org/gnome/system/location" = {

modules/home/librewolf.nix

@@ -36,7 +36,6 @@
         Remove = [
           "Google"
           "Bing"
-          "DuckDuckGo"
           "Perplexity"
           "Wikipedia (en)"
         ];

modules/home/packages.nix

@@ -13,6 +13,8 @@
     pavucontrol
     texliveFull
     texlab
+    nil
+    nixd
 
     # CLI
     bitwarden-cli
@@ -24,7 +26,6 @@
     streamrip
     cider-2
     zotero
-    modrinth-app
     lrcget
     impression
     streamcontroller
@@ -34,7 +35,8 @@
     discord
     signal-desktop
     element-desktop
-    fastmail-desktop
+    unstable.fastmail-desktop
+    supersonic
   ];
 
   programs.obs-studio.enable = true;

modules/home/syncthing.nix

@@ -1,7 +0,0 @@
-{ ... }:
-
-{
-  services.syncthing = {
-    enable = true;
-  };
-}