Merge branch 'main' of gitlab.com:ahoneybun/nix-configs

configuration.nix

@@ -25,10 +25,7 @@
       };
    };
 
-   boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+   #nix.settings.auto-optimise-store = true;
-
-   nix.settings.extra-platforms = [ "aarch64-linux" ];
-   nix.settings.auto-optimise-store = true;
    nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
    nix.gc = {
@@ -68,6 +65,33 @@
          neofetch
       ];
    };
+
+   programs.bash = {
+     shellAliases = {
+       generations = "sudo nix-env -p /nix/var/nix/profiles/system --list-generations";
+       nix-upgrade = "sudo nixos-rebuild switch --upgrade";
+     };
+   };
+
+   programs.git = {
+     lfs.enable = true;
+     config = {
+        color = {
+           ui = "auto";
+        };
+        color.status = {
+          added = "green bold";
+          changed = "yellow bold";
+          untracked = "red bold";
+        };
+        push = {
+          autoSetupRemote = "true";
+        };
+        init = {
+           defaultBranch = "main";
+        };
+      };
+   };
     
    # Allow Unfree
    nixpkgs.config.allowUnfree = true;

shell/COSMIC/shell.nix

@@ -11,6 +11,7 @@
        desktop-file-utils
        egl-wayland
        glib
+       gtk3
        gtk4
        lld
        llvm

systems/vm.nix

@@ -26,7 +26,7 @@
       };
    };
 
-   nix.settings.auto-optimise-store = true;
+   #nix.settings.auto-optimise-store = true;
    nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
    nix.gc = {