added new echidna (nix instal inside debian container on chrome os)

flake.lock

@@ -1,41 +1,5 @@
 {
   "nodes": {
-    "deploy-rs": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs",
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1686747123,
-        "narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=",
-        "owner": "serokell",
-        "repo": "deploy-rs",
-        "rev": "724463b5a94daa810abfc64a4f87faef4e00f984",
-        "type": "github"
-      },
-      "original": {
-        "owner": "serokell",
-        "repo": "deploy-rs",
-        "type": "github"
-      }
-    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1668681692,
-        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -90,18 +54,17 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1671417167,
+        "lastModified": 1690548937,
-        "narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=",
+        "narHash": "sha256-x3ZOPGLvtC0/+iFAg9Kvqm/8hTAIkGjc634SqtgaXTA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bb31220cca6d044baa6dc2715b07497a2a7c4bc7",
+        "rev": "2a9d660ff0f7ffde9d73be328ee6e6f10ef66b28",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "id": "nixpkgs",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
+        "type": "indirect"
-        "type": "github"
       }
     },
     "nixpkgs-stable": {
@@ -119,45 +82,14 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1690548937,
-        "narHash": "sha256-x3ZOPGLvtC0/+iFAg9Kvqm/8hTAIkGjc634SqtgaXTA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2a9d660ff0f7ffde9d73be328ee6e6f10ef66b28",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-unstable",
-        "type": "indirect"
-      }
-    },
     "root": {
       "inputs": {
-        "deploy-rs": "deploy-rs",
         "home-manager": "home-manager",
         "impermanence": "impermanence",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable"
       }
-    },
-    "utils": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -8,7 +8,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     impermanence.url = "github:nix-community/impermanence";
-    deploy-rs.url = "github:serokell/deploy-rs";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };
 
@@ -19,25 +18,11 @@
     , nixos-hardware
     , home-manager
     , impermanence
-    , deploy-rs
     }@inputs:
     let
       system = "x86_64-linux";
-      pkgs = import nixpkgs { inherit system; };
+      pkgs = nixpkgs.legacyPackages.${system};
-      deployPkgs = import nixpkgs {
-        inherit system;
-        overlays = [
-          deploy-rs.overlay
-          (self: super: {
-            deploy-rs = {
-              inherit (pkgs) deploy-rs;
-              lib = deploy-rs.lib;
-            };
-          })
-        ];
-      };
     in
-
     {
       nixosConfigurations = {
         trantor = nixpkgs.lib.nixosSystem {
@@ -70,49 +55,13 @@
             impermanence.nixosModules.impermanence
           ];
         };
-
-        lb = nixpkgs-stable.lib.nixosSystem {
-          system = "aarch64-linux";
-          specialArgs = { impermanence = impermanence; };
-          modules = [
-            ./hosts/lb
-            impermanence.nixosModules.impermanence
-          ];
-        };
-      };
-      deploy.nodes = {
-
-        capibara = {
-          hostname = "capibara";
-          profiles = {
-            system = {
-              sshUser = "rilla";
-              user = "root";
-              sudo = "doas -u";
-              path = deployPkgs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.capibara;
-              autoRollback = true;
-              remoteBuild = false;
-            };
-          };
       };
 
-        lb = {
+      homeConfigurations = {
-          hostname = "lb";
+        "rilla@echidna" = home-manager.lib.homeManagerConfiguration {
-          profiles = {
+          inherit pkgs;
-            system = {
+          modules = [ ./home/hosts/echidna.nix ];
-              sshUser = "rilla";
-              user = "root";
-              sudo = "doas -u";
-              path = deployPkgs.deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.lb;
-              autoRollback = true;
-              # remoteBuild = false;
-              remoteBuild = true;
         };
       };
     };
-
-      };
-
-      checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deployPkgs.deploy-rs.lib;
-    };
 }

hardware-configuration/lb.nix

@@ -1,21 +0,0 @@
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
-  boot.initrd.availableKernelModules = [ "usbhid" "usb_storage" "sr_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enu1u1.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
-  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
-}

home/capibara.nix

@@ -1,5 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [ ./common.nix ./desktop-river ./theming ];
-}

home/hosts/capibara.nix

@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./common.nix
+    ../modules/desktop-river
+    ./theming
+  ];
+}

home/hosts/echidna.nix

@@ -0,0 +1,90 @@
+{ config, pkgs, ... }:
+
+{
+  home.username = "rilla";
+  home.homeDirectory = "/home/rilla";
+
+  home.stateVersion = "23.05";
+  programs.home-manager.enable = true;
+
+  nixpkgs.config = { allowUnfree = true; };
+
+  imports = [
+    ../modules/cheat
+    ../modules/foot
+    ../modules/dav
+    ../modules/fonts
+    ../modules/git
+    ../modules/gpg
+    ../modules/lf
+    ../modules/mail
+    ../modules/neovim
+    ../modules/pass
+    ../modules/rss
+    ../modules/ssh
+    ../modules/tmux
+    ../modules/vitetris
+    ../modules/xdg
+    ../modules/zsh
+  ];
+
+  home.sessionVariables = {
+    EDITOR = "${pkgs.neovim}/bin/nvim";
+    VISUAL = "${pkgs.neovim}/bin/nvim";
+    BROWSER = "${pkgs.firefox}/bin/firefox";
+    # OPENER = "todo";  # todo
+    TERMINAL = "${pkgs.alacritty}/bin/alacritty";
+    CM_LAUNCHER = "rofi"; # for clipmenu
+    LEDGER_FILE = "${config.home.homeDirectory}/finance/2021.journal";
+  };
+
+  home.packages = with pkgs; [
+    R
+    ansible
+    bind.dnsutils
+    docker-compose
+    file
+    just
+    gnumake
+    html-tidy
+    htop
+    inetutils # telnet
+    j2cli
+    jq
+    killall
+    kubectl
+    libnotify
+    mosh
+    neofetch
+    pandoc
+    podman-compose
+    pv
+    ripgrep
+    sassc
+    screen
+    shellcheck
+    signify
+    unzip
+    wget
+  ];
+
+  programs.bat = {
+    enable = true;
+    config = { theme = "gruvbox-dark"; };
+  };
+
+  programs.fzf = {
+    enable = true;
+    enableZshIntegration = true;
+    # defaultOptions = [
+    #   "--preview --preview 'bat --color=always --style=header,grid --line-range :300 {}'"
+    # ];
+    tmux.enableShellIntegration = true;
+  };
+
+  programs.direnv = {
+    enable = true;
+    enableZshIntegration = true;
+    nix-direnv.enable = true;
+  };
+}

home/hosts/trantor.nix

@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./common.nix
+    ../modules/desktop-river
+    ../modules/theming/trantor.nix
+  ];
+}

home/modules/foot/default.nix

@@ -0,0 +1,47 @@
+{ config, pkgs, ... }:
+
+let
+  font-name = "Hack Nerd Font";
+  font-size = "10";
+in
+{
+  programs.foot = {
+    enable = true;
+    server.enable = true;
+    settings = {
+      main = {
+        shell = "${pkgs.tmux}/bin/tmux -u";
+        font = "${font-name}:size=${font-size}:style=Regular";
+        font-bold = "${font-name}:size=${font-size}:style=Bold";
+        font-italic = "${font-name}:size=${font-size}:style=Italic";
+        font-bold-italic = "${font-name}:size=${font-size}:style=Bold Italic";
+        dpi-aware = "no";
+        selection-target = "both";
+      };
+      colors = {
+        alpha = 0.9;
+        background = "282828";
+        foreground = "ebdbb2";
+
+        regular0 = "282828"; # black
+        regular1 = "cc241d"; # red
+        regular2 = "98971a"; # green
+        regular3 = "d79921"; # yellow
+        regular4 = "458588"; # blue
+        regular5 = "b16286"; # magenta
+        regular6 = "689d6a"; # cyan
+        regular7 = "ebdbb2"; # white
+
+        bright0 = "928374"; # black
+        bright1 = "fb4934"; # red
+        bright2 = "b8bb26"; # green
+        bright3 = "fabd2f"; # yellow
+        bright4 = "83a598"; # blue
+        bright5 = "d3869b"; # magenta
+        bright6 = "8ec07c"; # cyan
+        bright7 = "ebdbb2"; # white
+      };
+    };
+  };
+
+}

home/modules/zsh/default.nix

@@ -21,7 +21,8 @@ in {
         truncation_symbol = "…/";
         read_only = "";
       };
-      aws = { disabled = true; };
+      aws.disabled = true;
+      container.disabled = true;
       line_break = { disabled = true; };
       gcloud = { disabled = true; };
       python = { disabled = true; };