.gitignore

@@ -1 +0,0 @@
-/result*

configuration-nixbsd.nix

@@ -13,8 +13,4 @@ in {
     dependencies = [ "FILESYSTEMS" ];
     before = [ "nix-daemon" ];
   };
-
-  environment.systemPackages = with pkgs; [
-    freebsd.truss
-  ];
 }

configuration-nixos.nix

@@ -27,8 +27,6 @@ in {
   };
 
   environment.systemPackages = with pkgs; [
-    strace
-
     # language servers
     nil
     rust-analyzer

configuration.nix

@@ -34,7 +34,6 @@
     btop
     file
     patchelf
-    gdb
 
     (python3.withPackages (p: with p; [
       virtualenvwrapper
@@ -58,6 +57,12 @@
       '' + builtins.readFile ./dotfiles/zsh-prompt.sh;
       shellInit = builtins.readFile ./dotfiles/zsh-init.sh;
       shellAliases = {
+        nixos-edit = "(cd ~/nixos-config && vim configuration.nix)";
+        nixos-apply = "sudo nixos-rebuild switch --flake ~/nixos-config#$HOST";
+        ls = "ls --group-directories-first --color=auto";
+        ll = "ls -lh";
+        lh = "ll -ab";
+        l = "ls -ab";
         grep = "grep --color=auto";
         egrep = "egrep --color=auto";
         objdump = "objdump -M intel";

dotfiles/zsh-init.sh

@@ -68,24 +68,6 @@ fi
 
 # standard functions
 
-function nixos-edit() {
-    (cd ~/nixos-config && vim configuration.nix)
-}
-
-function nixos-apply() {
-    sudo nixos-rebuild switch --flake ~/nixos-config#$HOST "$@"
-}
-
-lsflags=()
-if ls --group-directories-first &>/dev/null; then
-    lsflags+=("--group-directories-first")
-fi
-
-alias ls="ls ${lsflags[@]} --color=auto";
-alias ll="ls -lh";
-alias lh="ll -ab";
-alias l="ls -ab";
-
 # https://stackoverflow.com/questions/6250698/how-to-decode-url-encoded-string-in-shell
 function urldecode() {
     python3 -c "import sys; from urllib.parse import unquote; print(unquote(sys.stdin.read()));"

flake.nix

@@ -19,7 +19,6 @@
       forBuildSystem = platform: let
         toBuildSystem = config: config.extendModules { modules = [ { nixpkgs.buildPlatform = platform; } ]; };
         toToplevel = extended: {
-          inherit (extended) config;
           system = extended.config.system.build.toplevel;
         };
         toSystem = name: config: toToplevel (toBuildSystem config);