misc changes

hosts/home/home_common.nix

@@ -17,40 +17,24 @@
     };
     tmux.enable = true;
     starship.enable = true;
-    nushell = {
+    zsh = {
       enable = true;
-      shellAliases = {
+      autosuggestion.enable = true;
-        cat = "bat";
+      enableCompletion = true;
-      };
+      syntaxHighlighting.enable = true;
-      extraConfig = ''
+      autocd = true;
-        $env.config = {
+      plugins = [
-         show_banner: false,
+        {
+          name = "zsh-nix-shell";
+          file = "nix-shell.plugin.zsh";
+          src = pkgs.fetchFromGitHub {
+            owner = "chisui";
+            repo = "zsh-nix-shell";
+            rev = "v0.8.0";
+            sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
+          };
         }
-      '';
+      ];
     };
-    carapace = {
-      enable = true;
-      enableNushellIntegration = true;
-    };
-    bat.enable = true;
-    # zsh = {
-    #   enable = true;
-    #   autosuggestion.enable = true;
-    #   enableCompletion = true;
-    #   syntaxHighlighting.enable = true;
-    #   autocd = true;
-    #   plugins = [
-    #     {
-    #       name = "zsh-nix-shell";
-    #       file = "nix-shell.plugin.zsh";
-    #       src = pkgs.fetchFromGitHub {
-    #         owner = "chisui";
-    #         repo = "zsh-nix-shell";
-    #         rev = "v0.8.0";
-    #         sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
-    #       };
-    #     }
-    #   ];
-    # };
   };
 }

hosts/home/tile.nix

@@ -14,7 +14,7 @@
     alacritty = {enable = true;};
     wofi = {enable = true;};
     zathura = {enable = true;};
-   #mpv = {enable = true;};
+    mpv = {enable = true;};
     lf = {enable = true;};
   };
   home.packages = with pkgs; [

hosts/home/waybar.nix

@@ -15,7 +15,7 @@
         margin-right = 45;
         spacing = 15;
 
-        modules-left = ["sway/workspaces" "sway/mode"];
+        modules-left = ["sway/workspaces" "sway/mode" "hyprland/window"];
         modules-center = ["clock"];
         modules-right = ["pulseaudio" "network" "battery"];
 

hosts/laptop/configuration.nix

@@ -27,8 +27,8 @@
     gc.automatic = false;
     settings = {
       experimental-features = ["nix-command" "flakes"];
-      #substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"];
+      substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"];
-      #trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="];
+      trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="];
     };
   };
 
@@ -55,6 +55,10 @@
 
   services = {
     hardware.bolt = {enable = false;};
+    xserver = {
+      displayManager.gdm.enable = true;
+      desktopManager.gnome.enable = true;
+    };
     pipewire = {
       enable = true;
       alsa.enable = true;
@@ -67,7 +71,7 @@
       package = pkgs.ollama-intel;
     };
     auto-cpufreq = {
-      enable = true;
+      enable = false;
       settings = {
         battery = {
           governor = "powersave";
@@ -165,20 +169,14 @@
 
   programs = {
     zsh.enable = true;
-    regreet.enable = true;
-    hyprlock.enable = true;
-    hyprland = {
-      enable = true;
-      withUWSM = true;
-    };
   };
 
   users.users.k = {
     isNormalUser = true;
     description = "k";
     extraGroups = ["networkmanager" "wheel" "cdrom" "libvirtd"];
-    packages = with pkgs; [nushell];
+    packages = with pkgs; [zsh];
-    shell = pkgs.nushell;
+    shell = pkgs.zsh;
   };
 
   home-manager = {
@@ -189,7 +187,22 @@
   environment = {
     sessionVariables = {MOZ_USE_XINPUT2 = "1";};
     systemPackages = with pkgs; [
+config.boot.kernelPackages.perf
     ];
+    gnome.excludePackages = (with pkgs; [
+      atomix # puzzle game
+      cheese # webcam tool
+      epiphany # web browser
+      geary # email reader
+      gedit # text editor
+      gnome-characters
+      gnome-music
+      gnome-photos
+      gnome-tour
+      hitori # sudoku game
+      iagno # go game
+      tali # poker game
+    ]);
   };
 
   systemd.sleep.extraConfig = ''

hosts/laptop/home.nix

@@ -6,7 +6,7 @@
 }: {
   imports = [
     ../home/home_common.nix
-    ../home/hyprland.nix
+    ../home/gnome.nix
   ];
 
   nixpkgs.config.allowUnfree = true;
@@ -22,7 +22,6 @@
 
       btop
       zip
-      emacs-gtk
 
       prismlauncher
       steam
@@ -40,6 +39,14 @@
       enableZshIntegration = true;
       nix-direnv.enable = true;
     };
+
+    emacs = {
+      enable = true;
+      package = pkgs.emacs-pgtk;
+      extraPackages = epkgs: [
+        epkgs.vterm
+      ];
+    };
   };
 
   services = {