From d23c70e2a22996de0a741ab42cc6f9ba76b9e571 Mon Sep 17 00:00:00 2001
From: Ricard Illa <rilla@monotremata.xyz>
Date: Sun, 23 Jul 2023 16:53:16 +0200
Subject: [PATCH] feat: big cleanup

---
 capibara.nix                                  |   5 +-
 nixos/common.nix => common.nix                |   2 +-
 echidna.nix                                   | 157 ------------------
 flake.lock                                    |  22 ---
 flake.nix                                     |  19 +--
 grub_background.png                           | Bin 10659 -> 0 bytes
 .../capibara.nix                              |   0
 .../trantor.nix                               |   0
 home/barrier/default.nix                      |   1 -
 home/capibara.nix                             |   5 +-
 home/{nixos-common.nix => common.nix}         |   2 +-
 home/echidna.nix                              |  10 --
 home/ssh/default.nix                          |   1 -
 home/trantor.nix                              |   2 +-
 macos/choose-pass.nix                         |  18 --
 macos/desktop.nix                             | 131 ---------------
 trantor.nix                                   |   2 +-
 17 files changed, 16 insertions(+), 361 deletions(-)
 rename nixos/common.nix => common.nix (99%)
 delete mode 100644 echidna.nix
 delete mode 100644 grub_background.png
 rename {nixos/hardware-configuration => hardware-configuration}/capibara.nix (100%)
 rename {nixos/hardware-configuration => hardware-configuration}/trantor.nix (100%)
 rename home/{nixos-common.nix => common.nix} (99%)
 delete mode 100644 home/echidna.nix
 delete mode 100644 macos/choose-pass.nix
 delete mode 100644 macos/desktop.nix

diff --git a/capibara.nix b/capibara.nix
index 1348391..70557b7 100644
--- a/capibara.nix
+++ b/capibara.nix
@@ -22,8 +22,9 @@ let
         "$@"
   '';
 
-in {
-  imports = [ ./nixos/hardware-configuration/capibara.nix ./nixos/common.nix ];
+in
+{
+  imports = [ ./hardware-configuration/capibara.nix ./common.nix ];
 
   home-manager = {
     users.rilla.imports =
diff --git a/nixos/common.nix b/common.nix
similarity index 99%
rename from nixos/common.nix
rename to common.nix
index 8e1957c..d7c2f90 100644
--- a/nixos/common.nix
+++ b/common.nix
@@ -229,7 +229,7 @@
     }];
 
     knownHosts = {
-      "*.monotremata.xyz,10.*,narwhal,suricata,pikvm,caladan,fugu,snitch,trantor,capibara,axolotl,echidna" =
+      "*.monotremata.xyz,10.*,narwhal,suricata,pikvm,caladan,fugu,snitch,trantor,capibara,axolotl" =
         {
           certAuthority = true;
           publicKey =
diff --git a/echidna.nix b/echidna.nix
deleted file mode 100644
index f259e8b..0000000
--- a/echidna.nix
+++ /dev/null
@@ -1,157 +0,0 @@
-{ config, pkgs, ... }:
-
-let
-  choose-pass =
-    pkgs.callPackage ./macos/choose-pass.nix { inherit config pkgs; };
-in {
-  nix.extraOptions = ''
-    experimental-features = nix-command flakes
-  '';
-
-  # nixpkgs.config.permittedInsecurePackages = [ "python-2.7.18.6" ];
-
-  # List packages installed in system profile. To search by name, run:
-  # $ nix-env -qaP | grep wget
-  # environment.systemPackages = [ ];
-  environment.systemPackages = [
-    (pkgs.pass.withExtensions (exts: [ exts.pass-otp ]))
-    choose-pass
-    # pkgs.khal
-    pkgs.alacritty
-    pkgs.gopass
-    pkgs.ansible
-    pkgs.bat
-    pkgs.black
-    pkgs.cheat
-    pkgs.cmatrix
-    pkgs.colima
-    pkgs.coreutils-full
-    pkgs.csvkit
-    pkgs.curl
-    pkgs.diff-so-fancy
-    pkgs.docker-client
-    pkgs.docker-machine
-    pkgs.exa
-    pkgs.fzf
-    pkgs.getopt
-    pkgs.gnupg
-    pkgs.go
-    pkgs.google-cloud-sdk
-    pkgs.gping
-    pkgs.hlint
-    pkgs.htop
-    pkgs.imagemagick
-    pkgs.jq
-    pkgs.khard
-    pkgs.libmysqlclient.dev
-    pkgs.mosh
-    pkgs.mpc-cli
-    pkgs.ncmpcpp
-    pkgs.neofetch
-    pkgs.neomutt
-    pkgs.newsboat
-    pkgs.nixfmt
-    pkgs.nodePackages.pyright
-    pkgs.python310Packages.python-lsp-server
-    # pkgs.python310Packages.pylsp-mypy
-    pkgs.openssh
-    pkgs.pinentry_mac
-    pkgs.pipenv
-    pkgs.python310Full
-    pkgs.python310Packages.pip
-    pkgs.python310Packages.virtualenvwrapper
-    # pkgs.pythonFull
-    pkgs.ripgrep
-    pkgs.shellcheck
-    pkgs.shfmt
-    pkgs.sqlfluff
-    pkgs.starship
-    pkgs.stow
-    pkgs.terraform
-    pkgs.tmux
-    pkgs.tree
-    pkgs.urlscan
-    pkgs.vagrant
-    pkgs.vdirsyncer
-    pkgs.virtualenv
-    pkgs.wget
-    pkgs.wireguard-go
-    pkgs.wireguard-tools
-    pkgs.yubikey-personalization
-    pkgs.zsh
-  ];
-  # Use a custom configuration.nix location.
-  # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
-  environment.darwinConfig = "/Users/rilla/configs/nix-config/echidna.nix";
-  # environment.variables.DOCKER_HOST = "tcp://localhost:2375";
-
-  # Auto upgrade nix package and the daemon service.
-  services.nix-daemon.enable = true;
-  # nix.package = pkgs.nix;
-
-  # Create /etc/bashrc that loads the nix-darwin environment.
-  programs.zsh.enable = true; # default shell on catalina
-  # programs.fish.enable = true;
-
-  # Used for backwards compatibility, please read the changelog before changing.
-  # $ darwin-rebuild changelog
-
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-
-  homebrew = {
-    enable = true;
-    onActivation = {
-      cleanup = "zap";
-      autoUpdate = true;
-      upgrade = true;
-    };
-    global = {
-      brewfile = true;
-      lockfiles = true;
-    };
-    casks = [ "kmbmpdc" "librewolf" "virtualbox" "bluetility" ];
-    brews = [
-      "pyenv"
-      "pyenv-virtualenv"
-      "mpd"
-      "choose-gui"
-      "vitetris"
-      "yabai"
-      "skhd"
-      "spacebar"
-      "gnu-getopt"
-      "coreutils"
-      "pinentry-mac"
-    ];
-    taps = [
-      "homebrew/bundle"
-      "homebrew/cask"
-      "homebrew/core"
-      "homebrew/services"
-      "koekeishiya/formulae"
-      "cmacrae/formulae"
-    ];
-  };
-
-  fonts = {
-    fontDir.enable = true;
-    fonts = [
-      (pkgs.nerdfonts.override { fonts = [ "Hack" "MPlus" ]; })
-      pkgs.inter
-      pkgs.hack-font
-      pkgs.libertinus
-    ];
-  };
-
-  users.users.rilla = {
-    name = "rilla";
-    home = "/Users/rilla";
-  };
-
-  home-manager = { users.rilla.imports = [ home/echidna.nix ]; };
-
-  system.stateVersion = 4;
-}
diff --git a/flake.lock b/flake.lock
index 30acfc4..e9e1971 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,26 +1,5 @@
 {
   "nodes": {
-    "darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1690100173,
-        "narHash": "sha256-v3DT7u5KlW1ZoulvFQPndbg0gVD0zKGkJmPqGsBVQ3I=",
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "rev": "0f9058e739dbefc676dee557b4b627962268d556",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lnl7",
-        "ref": "master",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -105,7 +84,6 @@
     },
     "root": {
       "inputs": {
-        "darwin": "darwin",
         "home-manager": "home-manager",
         "impermanence": "impermanence",
         "nixos-hardware": "nixos-hardware",
diff --git a/flake.nix b/flake.nix
index 034cbdc..6664127 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,14 +9,16 @@
     };
     impermanence.url = "github:nix-community/impermanence";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
-    darwin = {
-      url = "github:lnl7/nix-darwin/master";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
-  outputs = { self, nixpkgs, nixpkgs-stable, nixos-hardware, home-manager
-    , impermanence, darwin }@inputs: {
+  outputs =
+    { self
+    , nixpkgs
+    , nixpkgs-stable
+    , nixos-hardware
+    , home-manager
+    , impermanence
+    }@inputs: {
       nixosConfigurations = {
         trantor = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
@@ -49,10 +51,5 @@
           ];
         };
       };
-
-      darwinConfigurations.echidna = darwin.lib.darwinSystem {
-        system = "x86_64-darwin";
-        modules = [ ./echidna.nix home-manager.darwinModule ];
-      };
     };
 }
diff --git a/grub_background.png b/grub_background.png
deleted file mode 100644
index 9f6d847d26e320464a54ba5383f7e6b65dce711c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10659
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

diff --git a/nixos/hardware-configuration/capibara.nix b/hardware-configuration/capibara.nix
similarity index 100%
rename from nixos/hardware-configuration/capibara.nix
rename to hardware-configuration/capibara.nix
diff --git a/nixos/hardware-configuration/trantor.nix b/hardware-configuration/trantor.nix
similarity index 100%
rename from nixos/hardware-configuration/trantor.nix
rename to hardware-configuration/trantor.nix
diff --git a/home/barrier/default.nix b/home/barrier/default.nix
index 3381ae5..8927bf9 100644
--- a/home/barrier/default.nix
+++ b/home/barrier/default.nix
@@ -9,7 +9,6 @@ in
     # enableDragDrop = true;
     enableCrypto = true;
     name = "capibara";
-    server = "echidna";
   };
 
   home.file.".local/share/barrier/SSL/Fingerprints/TrustedServers.txt".text = "${fingerprint}\n";
diff --git a/home/capibara.nix b/home/capibara.nix
index 3d4c0db..0cdb483 100644
--- a/home/capibara.nix
+++ b/home/capibara.nix
@@ -1,8 +1,5 @@
 { config, pkgs, ... }:
 
 {
-  imports =
-    # [ ./nixos-common.nix ./desktop-sway ./alacritty/capibara.nix ./theming ];
-    # [ ./nixos-common.nix ./desktop-xmonad/capibara.nix ./alacritty/capibara.nix ./theming ];
-    [ ./nixos-common.nix ./desktop-river ./alacritty/capibara.nix ./theming ];
+  imports = [ ./common.nix ./desktop-river ./theming ];
 }
diff --git a/home/nixos-common.nix b/home/common.nix
similarity index 99%
rename from home/nixos-common.nix
rename to home/common.nix
index 55a4fc9..dbe80cd 100644
--- a/home/nixos-common.nix
+++ b/home/common.nix
@@ -62,7 +62,7 @@
 
   imports = [
     ./arduino
-    ./barrier
+    # ./barrier
     ./browsers
     ./cheat
     ./dav
diff --git a/home/echidna.nix b/home/echidna.nix
deleted file mode 100644
index f4a13a2..0000000
--- a/home/echidna.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  programs.direnv = {
-    enable = true;
-    nix-direnv.enable = true;
-  };
-  imports = [ ./neovim ];
-  home.stateVersion = "22.11";
-}
diff --git a/home/ssh/default.nix b/home/ssh/default.nix
index a790dff..513efe1 100644
--- a/home/ssh/default.nix
+++ b/home/ssh/default.nix
@@ -27,7 +27,6 @@ in {
       "lb" = defaultBlock;
       "kitchen" = defaultBlock;
       "capibara" = defaultBlock;
-      "echidna" = defaultBlock;
       "pikvm" = defaultBlock;
       "narwhal" = defaultBlock;
       "trantor" = defaultBlock;
diff --git a/home/trantor.nix b/home/trantor.nix
index b7cda67..c1a366b 100644
--- a/home/trantor.nix
+++ b/home/trantor.nix
@@ -1,5 +1,5 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ./nixos-common.nix ./desktop-river ./theming/trantor.nix ];
+  imports = [ ./common.nix ./desktop-river ./theming/trantor.nix ];
 }
diff --git a/macos/choose-pass.nix b/macos/choose-pass.nix
deleted file mode 100644
index 772c76d..0000000
--- a/macos/choose-pass.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ config, pkgs, ... }:
-
-pkgs.writeScriptBin "choose-pass" ''
-  #!${pkgs.dash}/bin/dash
-
-  prefix=''${PASSWORD_STORE_DIR-"''${HOME}/.password-store"}
-
-  sel=$(
-      ${pkgs.findutils}/bin/find "$prefix" -name '*.gpg' | \
-          ${pkgs.gnused}/bin/sed -E "s|^''${prefix}/?||" | \
-          ${pkgs.gnused}/bin/sed 's/.gpg$//' | \
-          /usr/local/bin/choose -f Inter -s 20 -c fbf1c7 -b 458588
-  )
-
-  [ -n "$sel" ] || exit
-
-  ${pkgs.pass}/bin/pass show "$sel" | tr -d "\n" | /usr/bin/pbcopy
-''
diff --git a/macos/desktop.nix b/macos/desktop.nix
deleted file mode 100644
index 07616da..0000000
--- a/macos/desktop.nix
+++ /dev/null
@@ -1,131 +0,0 @@
-{ config, pkgs, ... }:
-
-let choose-pass = pkgs.callPackage ./choose-pass.nix { inherit config pkgs; };
-in {
-  # services.yabai = {
-  #   enable = true;
-  #   package = pkgs.yabai;
-  #   # enableScriptingAddition = true;
-  #   enableScriptingAddition = false;
-  #   config = {
-  #     external_bar = "all:28:0";
-  #     layout = "bsp";
-  #     auto_balance = "off";
-  #     mouse_modifier = "fn";
-  #     mouse_action1 = "move";
-  #     mouse_action2 = "resize";
-  #     mouse_follows_focus = "on";
-  #     focus_follows_mouse = "autoraise";
-  #     window_topmost = "on"; # floating windows always on top
-  #     window_shadow = "float";
-  #     window_opacity = "on";
-  #     active_window_opacity = "1.0";
-  #     normal_window_opacity = "1.0";
-  #     window_border = "on";
-  #     window_border_width = 8;
-  #     active_window_border_color = "0xff458588";
-  #     normal_window_border_color = "0xff504945";
-  #   };
-  #   extraConfig = ''
-  #     yabai -m rule --add app="^choose" manage=off
-  #   '';
-  # };
-
-  services.skhd = {
-    enable = true;
-    package = pkgs.skhd;
-    skhdConfig = ''
-      # ctrl + alt - return : osascript /Users/rilla/configs/scripts/osascripts/iterm.scpt
-      ctrl + alt - return : ${pkgs.alacritty}/bin/alacritty
-
-      ctrl + alt - 1 : yabai -m space --focus 1
-      ctrl + alt - 2 : yabai -m space --focus 2
-      ctrl + alt - 3 : yabai -m space --focus 3
-      ctrl + alt - 4 : yabai -m space --focus 4
-      ctrl + alt - 5 : yabai -m space --focus 5
-      ctrl + alt - 6 : yabai -m space --focus 6
-      ctrl + alt - 7 : yabai -m space --focus 7
-      ctrl + alt - 8 : yabai -m space --focus 8
-      ctrl + alt - 9 : yabai -m space --focus 9
-      ctrl + alt - 0 : yabai -m space --focus 10
-
-      ctrl + alt - n : yabai -m window --focus next || yabai -m window --focus first
-      ctrl + alt - p : yabai -m window --focus prev || yabai -m window --focus last
-
-      ctrl + alt + shift - r : yabai -m space --rotate 90
-
-      ctrl + alt + shift - 1 : yabai -m window --space 1
-      ctrl + alt + shift - 2 : yabai -m window --space 2
-      ctrl + alt + shift - 3 : yabai -m window --space 3
-      ctrl + alt + shift - 4 : yabai -m window --space 4
-      ctrl + alt + shift - 5 : yabai -m window --space 5
-      ctrl + alt + shift - 6 : yabai -m window --space 6
-      ctrl + alt + shift - 7 : yabai -m window --space 7
-      ctrl + alt + shift - 8 : yabai -m window --space 8
-      ctrl + alt + shift - 9 : yabai -m window --space 9
-      ctrl + alt + shift - 0 : yabai -m window --space 10
-
-      # ctrl + alt + shift - space : yabai -m space --balance
-      ctrl + alt - space : yabai -m space --layout $(yabai -m query --spaces --space | jq -r 'if .["type"] == "bsp" then "float" else "bsp" end')
-      ctrl + alt - b : yabai -m space --balance
-      ctrl + alt + shift - space : yabai -m space --layout bsp
-
-      # ctrl + alt + shift - c : yabai -m window --close
-
-      ctrl + alt - right : yabai -m space --focus next || yabai -m space --focus first
-      ctrl + alt - left  : yabai -m space --focus prev || yabai -m space --focus last
-
-      ctrl + alt - h : yabai -m window --focus west
-      ctrl + alt - l : yabai -m window --focus east
-      ctrl + alt - j : yabai -m window --focus south
-      ctrl + alt - k : yabai -m window --focus north
-
-      ctrl + alt + shift - h : yabai -m window --swap west
-      ctrl + alt + shift - l : yabai -m window --swap east
-      ctrl + alt + shift - j : yabai -m window --swap south
-      ctrl + alt + shift - k : yabai -m window --swap north
-
-      ctrl + alt - w : yabai -m display --focus 1
-      ctrl + alt - e : yabai -m display --focus 2
-
-      ctrl + alt - g : yabai -m space --toggle gap && yabai -m space --toggle padding
-
-      ctrl + alt - x : yabai -m space --mirror y-axis
-      ctrl + alt - y : yabai -m space --mirror x-axis
-
-      ctrl + alt - m : yabai -m window --toggle zoom-fullscreen
-      ctrl + alt - t : yabai -m window --toggle float
-
-      :: choose
-      ctrl + alt - a ; choose
-      choose < p : skhd -k 'escape'; ${choose-pass}/bin/choose-pass
-      choose < escape ; default
-
-      play : ${pkgs.mpc_cli}/bin/mpc toggle
-    '';
-  };
-
-  # services.spacebar = {
-  #   enable = true;
-  #   package = pkgs.spacebar;
-  #   config = {
-  #     position = "top";
-  #     height = 28;
-  #     spacing_left = 25;
-  #     spacing_right = 25;
-  #     text_font = ''"Inter:Regular:12.0"'';
-  #     icon_font = ''"Font Awesome 5 Free:Solid:12.0"'';
-  #     background_color = "0xff282828";
-  #     foreground_color = "0xffebdbb2";
-
-  #     space_icon_color = "0xff83a598";
-  #     space_icon = "•";
-  #     space_icon_strip = "1 2 3 4 5 6 7 8 9 10";
-
-  #     power_icon_strip = " ";
-
-  #     clock_icon = "";
-  #     clock_format = ''"%d/%m/%y %R"'';
-  #   };
-  # };
-}
diff --git a/trantor.nix b/trantor.nix
index aa39ab8..6336f7e 100644
--- a/trantor.nix
+++ b/trantor.nix
@@ -6,7 +6,7 @@
 
 let home = "/home/rilla";
 in {
-  imports = [ ./nixos/hardware-configuration/trantor.nix ./nixos/common.nix ];
+  imports = [ ./hardware-configuration/trantor.nix ./common.nix ];
 
   home-manager = {
     users.rilla.imports =