From 4d1c3b848de67d015ec956b0735c59b82d94aa6b Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 08:41:25 +0300 Subject: [PATCH] formatting --- .../nixOnDroidHosts/atreus/configuration.nix | 157 +++++++++-------- hosts/nixOnDroidHosts/luoji/configuration.nix | 159 +++++++++--------- 2 files changed, 151 insertions(+), 165 deletions(-) diff --git a/hosts/nixOnDroidHosts/atreus/configuration.nix b/hosts/nixOnDroidHosts/atreus/configuration.nix index e6aaeef..28c4c0f 100644 --- a/hosts/nixOnDroidHosts/atreus/configuration.nix +++ b/hosts/nixOnDroidHosts/atreus/configuration.nix @@ -4,76 +4,6 @@ }: { user.userName = "osbm"; - environment.packages = with pkgs; [ - vim # or some other editor, e.g. nano or neovim - - # Some common stuff that people expect to have - procps - #killall - #diffutils - inetutils - findutils - utillinux - tzdata - hostname - man - gnugrep - #gnupg - #gnused - #gnutar - #bzip2 - #gzip - #xz - zip - unzip - fish - tmux - nano - ripgrep - git - openssh - just - nh - (pkgs.writeShellScriptBin "lg-rerouting" '' - ${pkgs.lazygit}/bin/lazygit --path /storage/emulated/0/Documents/rerouting - '') - (pkgs.writeShellScriptBin "sshd-start" '' - echo "Starting sshd on port 8022" - ${pkgs.openssh}/bin/sshd - '') - (pkgs.writeShellScriptBin "wake-ymir" '' - echo waking up ymir - ${pkgs.wakeonlan}/bin/wakeonlan 04:7c:16:e6:d9:13 - '') - # obsidian tools - # i need a background process that can just keep pulling and pushing changes just like the obsidian git plugin - # (pkgs.writeShellScriptBin "rerouting-sync-start" '' - # cd /storage/emulated/0/Documents/rerouting - # git pull - # git add --all - # git commit -m "Android sync" - # git push - # '') - (pkgs.writeShellScriptBin "rerouting-status" '' - cd /storage/emulated/0/Documents/rerouting - git fetch - git status - '') - (pkgs.writeShellScriptBin "rerouting-pull" '' - cd /storage/emulated/0/Documents/rerouting - git pull - '') - (pkgs.writeShellScriptBin "rerouting-push" '' - cd /storage/emulated/0/Documents/rerouting - git add --all - git commit -m "Android sync" - git push - '') - ani-cli - ]; - - # Backup etc files instead of failing to activate generation if a file already exists in /etc - environment.etcBackupExtension = ".bak"; # Read the changelog before changing this value system.stateVersion = "24.05"; @@ -89,16 +19,79 @@ fi ''; - environment.etc."ssh/sshd_config".text = '' - AcceptEnv LANG LC_* - KbdInteractiveAuthentication no - PasswordAuthentication no - PermitRootLogin no - Port 8022 - PrintMotd no - AuthorizedKeysFile /etc/ssh/authorized_keys.d/%u - ''; - environment.etc."ssh/authorized_keys.d/osbm".text = '' - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k - ''; + environment = { + packages = with pkgs; [ + vim # or some other editor, e.g. nano or neovim + procps + inetutils + findutils + utillinux + tzdata + hostname + man + gnugrep + zip + unzip + fish + tmux + nano + ripgrep + git + openssh + just + nh + (pkgs.writeShellScriptBin "lg-rerouting" '' + ${pkgs.lazygit}/bin/lazygit --path /storage/emulated/0/Documents/rerouting + '') + (pkgs.writeShellScriptBin "sshd-start" '' + echo "Starting sshd on port 8022" + ${pkgs.openssh}/bin/sshd + '') + (pkgs.writeShellScriptBin "wake-ymir" '' + echo waking up ymir + ${pkgs.wakeonlan}/bin/wakeonlan 04:7c:16:e6:d9:13 + '') + # obsidian tools + # i need a background process that can just keep pulling and pushing changes just like the obsidian git plugin + # (pkgs.writeShellScriptBin "rerouting-sync-start" '' + # cd /storage/emulated/0/Documents/rerouting + # git pull + # git add --all + # git commit -m "Android sync" + # git push + # '') + (pkgs.writeShellScriptBin "rerouting-status" '' + cd /storage/emulated/0/Documents/rerouting + git fetch + git status + '') + (pkgs.writeShellScriptBin "rerouting-pull" '' + cd /storage/emulated/0/Documents/rerouting + git pull + '') + (pkgs.writeShellScriptBin "rerouting-push" '' + cd /storage/emulated/0/Documents/rerouting + git add --all + git commit -m "Android sync" + git push + '') + ani-cli + ]; + + # Backup etc files instead of failing to activate generation if a file already exists in /etc + etcBackupExtension = ".bak"; + + etc."ssh/sshd_config".text = '' + AcceptEnv LANG LC_* + KbdInteractiveAuthentication no + PasswordAuthentication no + PermitRootLogin no + Port 8022 + PrintMotd no + AuthorizedKeysFile /etc/ssh/authorized_keys.d/%u + ''; + etc."ssh/authorized_keys.d/osbm".text = '' + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k + ''; + }; } diff --git a/hosts/nixOnDroidHosts/luoji/configuration.nix b/hosts/nixOnDroidHosts/luoji/configuration.nix index e6aaeef..3e1025d 100644 --- a/hosts/nixOnDroidHosts/luoji/configuration.nix +++ b/hosts/nixOnDroidHosts/luoji/configuration.nix @@ -4,79 +4,9 @@ }: { user.userName = "osbm"; - environment.packages = with pkgs; [ - vim # or some other editor, e.g. nano or neovim - - # Some common stuff that people expect to have - procps - #killall - #diffutils - inetutils - findutils - utillinux - tzdata - hostname - man - gnugrep - #gnupg - #gnused - #gnutar - #bzip2 - #gzip - #xz - zip - unzip - fish - tmux - nano - ripgrep - git - openssh - just - nh - (pkgs.writeShellScriptBin "lg-rerouting" '' - ${pkgs.lazygit}/bin/lazygit --path /storage/emulated/0/Documents/rerouting - '') - (pkgs.writeShellScriptBin "sshd-start" '' - echo "Starting sshd on port 8022" - ${pkgs.openssh}/bin/sshd - '') - (pkgs.writeShellScriptBin "wake-ymir" '' - echo waking up ymir - ${pkgs.wakeonlan}/bin/wakeonlan 04:7c:16:e6:d9:13 - '') - # obsidian tools - # i need a background process that can just keep pulling and pushing changes just like the obsidian git plugin - # (pkgs.writeShellScriptBin "rerouting-sync-start" '' - # cd /storage/emulated/0/Documents/rerouting - # git pull - # git add --all - # git commit -m "Android sync" - # git push - # '') - (pkgs.writeShellScriptBin "rerouting-status" '' - cd /storage/emulated/0/Documents/rerouting - git fetch - git status - '') - (pkgs.writeShellScriptBin "rerouting-pull" '' - cd /storage/emulated/0/Documents/rerouting - git pull - '') - (pkgs.writeShellScriptBin "rerouting-push" '' - cd /storage/emulated/0/Documents/rerouting - git add --all - git commit -m "Android sync" - git push - '') - ani-cli - ]; - - # Backup etc files instead of failing to activate generation if a file already exists in /etc - environment.etcBackupExtension = ".bak"; # Read the changelog before changing this value - system.stateVersion = "24.05"; + system.stateVersion = "25.11"; # Set up nix for flakes nix.extraOptions = '' experimental-features = nix-command flakes @@ -89,16 +19,79 @@ fi ''; - environment.etc."ssh/sshd_config".text = '' - AcceptEnv LANG LC_* - KbdInteractiveAuthentication no - PasswordAuthentication no - PermitRootLogin no - Port 8022 - PrintMotd no - AuthorizedKeysFile /etc/ssh/authorized_keys.d/%u - ''; - environment.etc."ssh/authorized_keys.d/osbm".text = '' - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k - ''; + environment = { + packages = with pkgs; [ + vim # or some other editor, e.g. nano or neovim + procps + inetutils + findutils + utillinux + tzdata + hostname + man + gnugrep + zip + unzip + fish + tmux + nano + ripgrep + git + openssh + just + nh + (pkgs.writeShellScriptBin "lg-rerouting" '' + ${pkgs.lazygit}/bin/lazygit --path /storage/emulated/0/Documents/rerouting + '') + (pkgs.writeShellScriptBin "sshd-start" '' + echo "Starting sshd on port 8022" + ${pkgs.openssh}/bin/sshd + '') + (pkgs.writeShellScriptBin "wake-ymir" '' + echo waking up ymir + ${pkgs.wakeonlan}/bin/wakeonlan 04:7c:16:e6:d9:13 + '') + # obsidian tools + # i need a background process that can just keep pulling and pushing changes just like the obsidian git plugin + # (pkgs.writeShellScriptBin "rerouting-sync-start" '' + # cd /storage/emulated/0/Documents/rerouting + # git pull + # git add --all + # git commit -m "Android sync" + # git push + # '') + (pkgs.writeShellScriptBin "rerouting-status" '' + cd /storage/emulated/0/Documents/rerouting + git fetch + git status + '') + (pkgs.writeShellScriptBin "rerouting-pull" '' + cd /storage/emulated/0/Documents/rerouting + git pull + '') + (pkgs.writeShellScriptBin "rerouting-push" '' + cd /storage/emulated/0/Documents/rerouting + git add --all + git commit -m "Android sync" + git push + '') + ani-cli + ]; + + # Backup etc files instead of failing to activate generation if a file already exists in /etc + etcBackupExtension = ".bak"; + + etc."ssh/sshd_config".text = '' + AcceptEnv LANG LC_* + KbdInteractiveAuthentication no + PasswordAuthentication no + PermitRootLogin no + Port 8022 + PrintMotd no + AuthorizedKeysFile /etc/ssh/authorized_keys.d/%u + ''; + etc."ssh/authorized_keys.d/osbm".text = '' + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k + ''; + }; }