From 0bd86a067fc25d6c4717e0211bb0ab6591a4328e Mon Sep 17 00:00:00 2001
From: Atridad Lahiji <me@atri.dad>
Date: Wed, 11 Mar 2026 16:11:19 -0600
Subject: [PATCH] 1773267079

---
 common.nix             |  6 ++++--
 flake.nix              | 42 ++++++++++++++++++++++++------------------
 modules/home.nix       |  3 +--
 modules/home/cli.nix   | 11 +++--------
 modules/home/gnome.nix | 11 ++++++++++-
 modules/programs.nix   |  3 +++
 modules/users.nix      |  3 ++-
 7 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/common.nix b/common.nix
index 604169a..79507e7 100644
--- a/common.nix
+++ b/common.nix
@@ -15,8 +15,10 @@
     ./modules/home.nix
   ];
 
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-  # xdg.portal.config.common.default = [ "cosmic" ];
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
 
   system.stateVersion = "25.11";
 }
diff --git a/flake.nix b/flake.nix
index 3c88f3c..bac868b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,16 +9,16 @@
       url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    cosmic-manager = {
-      url = "github:HeitorAugustoLN/cosmic-manager";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        home-manager.follows = "home-manager";
-      };
-    };
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }@inputs:
+  outputs =
+    {
+      self,
+      nixpkgs,
+      nixpkgs-unstable,
+      home-manager,
+      ...
+    }@inputs:
     let
       settings = import ./settings.nix;
       system = "x86_64-linux";
@@ -28,15 +28,21 @@
           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
-      ];
+    in
+    {
+      nixosConfigurations."${settings.hostname}" = nixpkgs.lib.nixosSystem {
+        inherit system;
+        specialArgs = { inherit inputs; };
+        modules = [
+          (
+            { ... }:
+            {
+              nixpkgs.overlays = [ overlay-unstable ];
+            }
+          )
+          ./configuration.nix
+          home-manager.nixosModules.home-manager
+        ];
+      };
     };
-  };
 }
diff --git a/modules/home.nix b/modules/home.nix
index 3bba0af..0ae33a0 100644
--- a/modules/home.nix
+++ b/modules/home.nix
@@ -1,9 +1,8 @@
-{ inputs, ... }:
+{ ... }:
 
 let
   settings = import ../settings.nix;
   homeModules = [
-    inputs.cosmic-manager.homeManagerModules.cosmic-manager
     ./home/session.nix
     ./home/packages.nix
     ./home/git.nix
diff --git a/modules/home/cli.nix b/modules/home/cli.nix
index b942ce8..c6ca695 100644
--- a/modules/home/cli.nix
+++ b/modules/home/cli.nix
@@ -18,17 +18,15 @@
     "nf" = "neofetch";
   };
 
-  programs.bash = {
-    enable = true;
-  };
-
   programs.zsh = {
     enable = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
+    historySubstringSearch.enable = true;
   };
 
   programs.starship = {
     enable = true;
-    enableBashIntegration = true;
     enableZshIntegration = true;
     settings = {
       add_newline = false;
@@ -41,13 +39,11 @@
 
   programs.zoxide = {
     enable = true;
-    enableBashIntegration = true;
     enableZshIntegration = true;
   };
 
   programs.eza = {
     enable = true;
-    enableBashIntegration = true;
     enableZshIntegration = true;
     git = true;
     icons = "auto";
@@ -62,7 +58,6 @@
 
   programs.direnv = {
     enable = true;
-    enableBashIntegration = true;
     enableZshIntegration = true;
     nix-direnv.enable = true;
   };
diff --git a/modules/home/gnome.nix b/modules/home/gnome.nix
index 708f5b9..a4bad50 100644
--- a/modules/home/gnome.nix
+++ b/modules/home/gnome.nix
@@ -1,6 +1,14 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 
 {
+  gtk = {
+    enable = true;
+    iconTheme = {
+      name = "Papirus-Dark";
+      package = pkgs.papirus-icon-theme;
+    };
+  };
+
   dconf.settings = {
     "org/gnome/desktop/interface" = {
       color-scheme = "prefer-dark";
@@ -8,6 +16,7 @@
       clock-show-weekday = true;
       clock-show-date = true;
       clock-format = "12h";
+      icon-theme = "Papirus-Dark";
     };
 
     "org/gnome/system/location" = {
diff --git a/modules/programs.nix b/modules/programs.nix
index 973c8b8..a6f05c3 100644
--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -4,6 +4,9 @@
   # Enable unfree globally
   nixpkgs.config.allowUnfree = true;
 
+  # Enable zsh globally
+  programs.zsh.enable = true;
+
   environment.systemPackages = with pkgs; [
     killall
     usbutils
diff --git a/modules/users.nix b/modules/users.nix
index 50ad777..bbf7ca0 100644
--- a/modules/users.nix
+++ b/modules/users.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 
 let
   settings = import ../settings.nix;
@@ -10,6 +10,7 @@ in
     isNormalUser = true;
     description = settings.userDescription;
     extraGroups = settings.userGroups;
+    shell = pkgs.zsh;
   };
 
   # Security