diff --git a/.config/zsh/history b/.config/zsh/history index 4686320..788fc6a 100644 --- a/.config/zsh/history +++ b/.config/zsh/history @@ -5,30 +5,79 @@ ls v home.nix hx home.nix rb -: 1721746770:0;git init -: 1721746775:0;rb -: 1721746802:0;fish -: 1721746843:0;v nix-on-droid.nix -: 1721746869:0;rb -: 1721746902:0;git init -: 1721746952:0;git config --global init.defaultBranch majn -: 1721746957:0;git config --global init.defaultBranch main -: 1721746968:0;rm -fr .git -: 1721746973:0;git init -: 1721746979:0;git add . -: 1721746995:0;git commit -m "nix on droid" -: 1721747287:0;git remote add main https://1fc2ec9e22889453afef2e095ab1ad91b863ffce@git.joygnu.org/joygnu/nix-on-droid.git -: 1721747297:0;pu -: 1721747337:0;git push main main -: 1721747350:0;git remote remove main -: 1721747378:0;git remote add origin https://1fc2ec9e22889453afef2e095ab1ad91b863ffce@git.joygnu.org/joygnu/nix-on-droid.git -: 1721747386:0;git push origin -: 1721747410:0;git push --set-upstream origin main -: 1721747480:0;v home/zsh -: 1721747541:0;rb -: 1721747562:0;zsh -: 1721747650:0;v home/zsh -: 1721747679:0;rb -: 1721747702:0;cd .. -: 1721751900:0;git add -: 1721751903:0;git add . +git init +rb +fish +v nix-on-droid.nix +rb +git init +git config --global init.defaultBranch majn +git config --global init.defaultBranch main +rm -fr .git +git init +git add . +git commit -m "nix on droid" +git remote add main https://1fc2ec9e22889453afef2e095ab1ad91b863ffce@git.joygnu.org/joygnu/nix-on-droid.git +pu +git push main main +git remote remove main +git remote add origin https://1fc2ec9e22889453afef2e095ab1ad91b863ffce@git.joygnu.org/joygnu/nix-on-droid.git +git push origin +git push --set-upstream origin main +v home/zsh +rb +zsh +v home/zsh +rb +cd .. +git add +git add . +git commit -m "nix on droid" +git push origin +nix-shell -p toybox +v home/zsh +rb +fastfetch +zsh +ep +rb +: 1722602333:0;ls +: 1722602339:0;ls -a +: 1722602350:0;git remote -v +: 1722603360:0;cd +: 1723458351:0;ep +: 1723458381:0;rb +: 1723458392:0;ep +: 1723458406:0;rb +: 1723458463:0;l +: 1723458489:0;ep +: 1723458594:0;la +: 1723458600:0;ls +: 1723458606:0;ls -a +: 1723458611:0;lazygit +: 1725352454:0;fastfetch +: 1725352463:0;ll +: 1725352466:0;ls +: 1725352476:0;hyprpaper +: 1725352493:0;v flake.nix +: 1725352542:0;rb +: 1725356099:0;ls +: 1725356105:0;v home.nix +: 1725356112:0;cd home +: 1725356113:0;ls +: 1725356119:3;v default.nix +: 1725356129:14;v git +: 1725356144:1;ls +: 1725356149:0;cd .. +: 1725356150:0;ls +: 1725356155:0;v nix-on-droid.nix +: 1725356201:0;v home.nix +: 1725356219:0;rb +: 1725356237:0;v home.nix +: 1725356280:0;v nix-on-droid.nix flake.nix +: 1725356287:0;v flake.nix +: 1725356327:0;rb +: 1725356337:0;v flake.nix +: 1725356376:0;rb +: 1725356395:0;git add +: 1725356401:0;git add . diff --git a/flake.lock b/flake.lock index a87da85..d2d4927 100644 --- a/flake.lock +++ b/flake.lock @@ -72,16 +72,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1721226092, - "narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=", + "lastModified": 1725103162, + "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c716603a63aca44f39bef1986c13402167450e0a", + "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index ea44705..a7016ec 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,6 @@ { - description = "Basic example of Nix-on-Droid system config."; - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nix-on-droid = { url = "github:nix-community/nix-on-droid/release-24.05"; diff --git a/home/zsh/default.nix b/home/zsh/default.nix index 0dcfc43..89bfc9f 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -13,6 +13,7 @@ v = "hx"; ser = "ssh root@joygnu.org"; rb = "nix-on-droid switch --flake ~/.config/nix-on-droid"; + ep = "hx ~/.config/nix-on-droid/nix-on-droid.nix"; }; history.size = 1000000; diff --git a/nix-on-droid.nix b/nix-on-droid.nix index e740b4a..2419250 100644 --- a/nix-on-droid.nix +++ b/nix-on-droid.nix @@ -6,23 +6,26 @@ # User-facing stuff that you really really want to have vim # or some other editor, e.g. nano or neovim zsh - font-awesome fish - helix + font-awesome fastfetch - mpv + ipfetch ffmpeg yt-dlp + lazygit + # toybox + unixtools.ping + cowsay # Some common stuff that people expect to have procps - killall + # killall openssh_hpn git diffutils findutils utillinux tzdata - hostname + # hostname man gnugrep gnupg