change many thing

common/auth.nix

@@ -0,0 +1,41 @@
+{
+  lib,
+  inputs,
+  getFlakePkg,
+  ...
+}:
+{
+  environment.shellAliases = {
+    #make run0 use aliases
+    run0 = "run0 --background='' ";
+    s = "run0";
+  };
+  services.dbus.implementation = "broker";
+  security = {
+    sudo.enable = false;
+    polkit = {
+      enable = true;
+      extraConfig = ''
+        polkit.addRule(function(action, subject) {
+          if (action.id == "org.freedesktop.policykit.exec") {
+            return polkit.Result.AUTH_ADMIN_KEEP;
+          }
+        });
+
+        polkit.addRule(function(action, subject) {
+          if (action.id.indexOf("org.freedesktop.systemd1.") == 0) {
+            return polkit.Result.AUTH_ADMIN_KEEP;
+          }
+        });
+      '';
+    };
+  };
+  environment.etc."polkit-1/polkitd.conf".text = ''
+    [Polkitd]
+    ExpirationSeconds=60
+  '';
+  imports = [ inputs.run0-shim.nixosModules.default ];
+  environment.systemPackages = [ (getFlakePkg inputs.run0-shim) ];
+  security.soteria.enable = true;
+  systemd.user.services.niri-flake-polkit = lib.mkForce { };
+}

common/binfmts.nix

@@ -0,0 +1 @@
+{ inputs, scope, ... }: scope "imports" <| [ inputs.qstn.nixosModules.default ]

common/cli.nix

@@ -1,6 +1,5 @@
 {
   pkgs,
-  localPkgs,
   getPkgs,
   ...
 }:
@@ -17,6 +16,7 @@
       ouch
       ;
   };
+
   user.packages = getPkgs {
     inherit (pkgs)
       lazygit

common/debloat.nix

@@ -2,7 +2,6 @@
 {
   system.disableInstallerTools = true;
   programs.less.lessopen = null;
-  programs.command-not-found.enable = false;
   boot.enableContainers = false;
   boot.loader.grub.enable = false;
   environment.defaultPackages = lib.mkDefault [ ];

common/nix/gc.nix

@@ -1,7 +1,5 @@
 {
   inputs,
-  getFlakePkg,
-  getFlakePkg',
   ...
 }:
 {
@@ -18,10 +16,7 @@
 
   services.angrr = {
     enable = true;
-    enableNixGcIntegration = true;
-    period = "2weeks";
-    package = getFlakePkg inputs.angrr;
+    period = "7d";
   };
-  programs.direnv.angrr.package = getFlakePkg' inputs.angrr "angrr-direnv";
 
 }

common/nix/settings.nix

@@ -6,7 +6,6 @@
 }:
 {
   nix = {
-    package = pkgs.nixVersions.latest;
     settings = {
       experimental-features = [
         "nix-command"

common/nix/substituters.nix

@@ -6,13 +6,19 @@ scope "nix.settings" {
   substituters = [
     "https://nix-community.cachix.org"
     "https://anmonteiro.nix-cache.workers.dev"
-    "https://cache.atagen.co"
+    "https://cache.lobotomise.me"
+    # "https://cache.atagen.co"
     # "https://cache.privatevoid.net"
+    "https://cache.flox.dev"
+    "https://cache.amaanq.com"
   ];
   trusted-public-keys = [
     "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
     "ocaml.nix-cache.com-1:/xI2h2+56rwFfKyyFVbkJSeGqSIYMC/Je+7XXqGKDIY="
-    "cache.atagen.co:SOUkNQxuu/eQ7FcI8nlUe7FpV27e7YjQlDQdn8HTUnw="
+    "cache.lobotomise.me:oF5s/f/RDfVuMH7hl0q/Cby4V/KbPCrZJn8SjKOf/bk="
+    # "cache.atagen.co:SOUkNQxuu/eQ7FcI8nlUe7FpV27e7YjQlDQdn8HTUnw="
     # "cache.privatevoid.net:SErQ8bvNWANeAvtsOESUwVYr2VJynfuc9JRwlzTTkVg="
+    "flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs="
+    "cache.amaanq.com:3qm0ZOxlHr7UQqj0G3MKlAn1votV9/3KjHGU2GQ9rEM="
   ];
 }

common/nix/tools.nix

@@ -2,15 +2,18 @@
   pkgs,
   inputs,
   getPkgs,
+  getFlakePkg,
   ...
 }:
 {
-  environment.systemPackages = getPkgs {
-    inherit (pkgs)
-      nixfmt-rfc-style
-      nil
-      ;
-  };
+  environment.systemPackages =
+    getPkgs {
+      inherit (pkgs)
+        nixfmt
+        nil
+        ;
+    }
+    ++ [ (getFlakePkg inputs.yoke) ];
   imports = [
     inputs.nix-index-database.nixosModules.nix-index
   ];

common/terminal.nix

@@ -6,7 +6,7 @@
   ...
 }:
 let
-  inherit (pkgs) fish;
+  inherit (pkgs) fish nushell;
 in
 {
   imports = [
@@ -36,6 +36,7 @@ in
       "la" = "eza -lg --icons=always --colour=always $argv | culr";
       "p" = "ps $argv | culr";
       "mnt" = "mount | culr";
+      "fresh" = "clear; ${./rice/header.sh}; echo";
     };
     interactiveShellInit =
       let
@@ -62,8 +63,12 @@ in
   };
   environment.systemPackages = [
     fish
+    nushell
+  ];
+  environment.shells = [
+    fish
+    nushell
   ];
-  environment.shells = [ fish ];
   users.defaultUserShell = fish;
   console.font = "Lat2-Terminus16";