From 3c9d9e9529ee902adcf6fa55042ea8c4cca214f0 Mon Sep 17 00:00:00 2001 From: Thomas Syms Date: Mon, 26 May 2025 23:55:11 -0300 Subject: [PATCH] Updated configuration --- flake.lock | 388 ++++++++++++++---- flake.nix | 6 +- home/panotaka/common/core/default.nix | 4 +- home/panotaka/common/core/screen.nix | 9 - home/panotaka/common/core/shell/atuin.nix | 6 + home/panotaka/common/core/shell/autojump.nix | 5 + .../panotaka/common/core/{ => shell}/bash.nix | 0 home/panotaka/common/core/shell/bat.nix | 5 + home/panotaka/common/core/shell/btop.nix | 5 + home/panotaka/common/core/shell/carapace.nix | 9 + home/panotaka/common/core/shell/default.nix | 18 + .../common/core/{ => shell}/direnv.nix | 1 + home/panotaka/common/core/shell/eza.nix | 14 + .../panotaka/common/core/{ => shell}/fish.nix | 0 home/panotaka/common/core/shell/rip.nix | 5 + home/panotaka/common/core/shell/tldr.nix | 11 + home/panotaka/common/core/shell/zellij.nix | 13 + home/panotaka/common/core/shell/zoxide.nix | 9 + home/panotaka/common/core/ssh.nix | 29 +- shell.nix | 26 +- 20 files changed, 440 insertions(+), 123 deletions(-) delete mode 100644 home/panotaka/common/core/screen.nix create mode 100644 home/panotaka/common/core/shell/atuin.nix create mode 100644 home/panotaka/common/core/shell/autojump.nix rename home/panotaka/common/core/{ => shell}/bash.nix (100%) create mode 100644 home/panotaka/common/core/shell/bat.nix create mode 100644 home/panotaka/common/core/shell/btop.nix create mode 100644 home/panotaka/common/core/shell/carapace.nix create mode 100644 home/panotaka/common/core/shell/default.nix rename home/panotaka/common/core/{ => shell}/direnv.nix (87%) create mode 100644 home/panotaka/common/core/shell/eza.nix rename home/panotaka/common/core/{ => shell}/fish.nix (100%) create mode 100644 home/panotaka/common/core/shell/rip.nix create mode 100644 home/panotaka/common/core/shell/tldr.nix create mode 100644 home/panotaka/common/core/shell/zellij.nix create mode 100644 home/panotaka/common/core/shell/zoxide.nix diff --git a/flake.lock b/flake.lock index aec1207..ceee5d5 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,55 @@ { "nodes": { + "cachix": { + "inputs": { + "devenv": [ + "devenv" + ], + "flake-compat": [ + "devenv" + ], + "git-hooks": [ + "devenv" + ], + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1744206633, + "narHash": "sha256-pb5aYkE8FOoa4n123slgHiOf1UbNSnKe5pEZC+xXD5g=", + "owner": "cachix", + "repo": "cachix", + "rev": "8a60090640b96f9df95d1ab99e5763a586be1404", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "latest", + "repo": "cachix", + "type": "github" + } + }, + "devenv": { + "inputs": { + "cachix": "cachix", + "flake-compat": "flake-compat", + "git-hooks": "git-hooks", + "nix": "nix", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1748273445, + "narHash": "sha256-5V0dzpNgQM0CHDsMzh+ludYeu1S+Y+IMjbaskSSdFh0=", + "owner": "cachix", + "repo": "devenv", + "rev": "668a50d8b7bdb19a0131f53c9f6c25c9071e1ffb", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -7,11 +57,11 @@ ] }, "locked": { - "lastModified": 1747742835, - "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", + "lastModified": 1748225455, + "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", "owner": "nix-community", "repo": "disko", - "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", + "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", "type": "github" }, "original": { @@ -21,6 +71,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -36,7 +102,76 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "devenv", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "devenv" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1746537231, + "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { + "inputs": { + "nixpkgs": [ + "devenv", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "pre-commit-hooks", @@ -59,11 +194,11 @@ }, "hardware": { "locked": { - "lastModified": 1747723695, - "narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=", + "lastModified": 1747900541, + "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282", + "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "type": "github" }, "original": { @@ -79,20 +214,68 @@ ] }, "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "lastModified": 1748227609, + "narHash": "sha256-SaSdslyo6UGDpPUlmrPA4dWOEuxCy2ihRN9K6BnqYsA=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", + "rev": "d23d20f55d49d8818ac1f1b2783671e8a6725022", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", "repo": "home-manager", "type": "github" } }, + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1697646580, + "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", + "type": "github" + }, + "original": { + "owner": "libgit2", + "repo": "libgit2", + "type": "github" + } + }, + "nix": { + "inputs": { + "flake-compat": [ + "devenv" + ], + "flake-parts": "flake-parts", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs_2", + "nixpkgs-23-11": [ + "devenv" + ], + "nixpkgs-regression": [ + "devenv" + ], + "pre-commit-hooks": [ + "devenv" + ] + }, + "locked": { + "lastModified": 1745930071, + "narHash": "sha256-bYyjarS3qSNqxfgc89IoVz8cAFDkF9yPE63EJr+h50s=", + "owner": "domenkozar", + "repo": "nix", + "rev": "b455edf3505f1bf0172b39a735caef94687d0d9c", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.24", + "repo": "nix", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -100,11 +283,11 @@ ] }, "locked": { - "lastModified": 1747521943, - "narHash": "sha256-GMAJcB8oB9cC+TbYTE7QDfw9fwHZyloxUWnUpHnQRko=", + "lastModified": 1748149228, + "narHash": "sha256-mmonYFesFo42UUS49Hd0bcbVJRWX/aHBCDYUkkvylf4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "b9b927dd1f24094b271e8ec5277a672dc4fc860d", + "rev": "a9939228f661df370c4094fe85f683e45d761dbe", "type": "github" }, "original": { @@ -122,11 +305,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1747702560, - "narHash": "sha256-IlYihDQctzQEVvkqmjP0z1SG4dwfB3f6tOcgQFNQ6Mg=", + "lastModified": 1748307350, + "narHash": "sha256-x0Zvw+isjnqfv8GucjdPeHGR8l5oPd9/JKRnC30DZgs=", "owner": "nix-community", "repo": "nix4vscode", - "rev": "663aa5c1f2411212f963f4591871aaa4a20ffdee", + "rev": "84efa6340919ee69699a31cf8ff43cbbbd0012d6", "type": "github" }, "original": { @@ -137,11 +320,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747723695, - "narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=", + "lastModified": 1747900541, + "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282", + "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "type": "github" }, "original": { @@ -152,6 +335,102 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-darwin": { + "locked": { + "lastModified": 1748037224, + "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-24.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1748037224, + "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1717432640, + "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1746807397, + "narHash": "sha256-zU2z0jlkJGWLhdNr/8AJSxqK8XD0IlQgHp3VZcP56Aw=", + "owner": "cachix", + "repo": "devenv-nixpkgs", + "rev": "c5208b594838ea8e6cca5997fbf784b7cca1ca90", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "rolling", + "repo": "devenv-nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1736320768, "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=", @@ -167,45 +446,13 @@ "type": "github" } }, - "nixpkgs-darwin": { + "nixpkgs_5": { "locked": { - "lastModified": 1747514354, - "narHash": "sha256-ohO4Uox8WzonwEtxNvr1SsDbvnZLilxrqco1u0bEWHU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a3552bafe05e3c2f24e6bc6482135837984f7073", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-24.11-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1747485343, - "narHash": "sha256-YbsZyuRE1tobO9sv0PUwg81QryYo3L1F3R3rF9bcG38=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b5ac7ad45298d58640540d0323ca217f32a6762", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -215,26 +462,10 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1747485343, - "narHash": "sha256-YbsZyuRE1tobO9sv0PUwg81QryYo3L1F3R3rF9bcG38=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9b5ac7ad45298d58640540d0323ca217f32a6762", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", + "flake-compat": "flake-compat_2", + "gitignore": "gitignore_2", "nixpkgs": [ "nixpkgs" ] @@ -255,13 +486,14 @@ }, "root": { "inputs": { + "devenv": "devenv", "disko": "disko", "hardware": "hardware", "home-manager": "home-manager", "nix-darwin": "nix-darwin", "nix4vscode": "nix4vscode", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_5", "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", @@ -271,7 +503,7 @@ }, "rust-overlay": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1742178793, @@ -313,11 +545,11 @@ ] }, "locked": { - "lastModified": 1747736530, - "narHash": "sha256-t3Fno11OhiWoOHRnbwzuuW80j20w9EV+vIV44Xkxg7g=", + "lastModified": 1748229380, + "narHash": "sha256-ulYljT6A8/v9QsMWnTsDYxa1/bG/22Ufy+KfrN4jA74=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "ebeabdb79392f3dfac8c6019754e76997e4d5dfa", + "rev": "14207b0fc7caba6b6a9c7a9aecf7f901435daa93", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ddb304f..abd6a7f 100644 --- a/flake.nix +++ b/flake.nix @@ -111,7 +111,7 @@ # # NOTE(starter): As with typical flake-based configs, you'll need to update the nixOS, hm, # and darwin version numbers below when new releases are available. - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # The next two inputs are for pinning nixpkgs to stable vs unstable regardless of what the above is set to. # This is particularly useful when an upcoming stable release is in beta because you can effectively # keep 'nixpkgs-stable' set to stable for critical packages while setting 'nixpkgs' to the beta branch to @@ -122,7 +122,7 @@ hardware.url = "github:nixos/nixos-hardware"; home-manager = { - url = "github:nix-community/home-manager/release-24.11"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -154,6 +154,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + devenv.url = "github:cachix/devenv"; + # # ========= Extra Applications ========= # diff --git a/home/panotaka/common/core/default.nix b/home/panotaka/common/core/default.nix index 5afe667..b7a2321 100644 --- a/home/panotaka/common/core/default.nix +++ b/home/panotaka/common/core/default.nix @@ -19,13 +19,11 @@ in { ./${platform}.nix # FIXME(starter): add/edit as desired - ./fish.nix - ./bash.nix - ./direnv.nix ./fonts.nix ./kitty.nix ./git.nix ./ssh.nix + ./shell ]; inherit hostSpec; diff --git a/home/panotaka/common/core/screen.nix b/home/panotaka/common/core/screen.nix deleted file mode 100644 index 7c2592a..0000000 --- a/home/panotaka/common/core/screen.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.screen ]; - home.file.".screenrc".text = '' - startup_message off - defbce on - setenv TERM xterm-256color - ''; -} diff --git a/home/panotaka/common/core/shell/atuin.nix b/home/panotaka/common/core/shell/atuin.nix new file mode 100644 index 0000000..9017775 --- /dev/null +++ b/home/panotaka/common/core/shell/atuin.nix @@ -0,0 +1,6 @@ +{ + programs.atuin = { + enable = true; + flags = ["--disable-up-arrow"]; + }; +} diff --git a/home/panotaka/common/core/shell/autojump.nix b/home/panotaka/common/core/shell/autojump.nix new file mode 100644 index 0000000..31128dc --- /dev/null +++ b/home/panotaka/common/core/shell/autojump.nix @@ -0,0 +1,5 @@ +{...}: { + programs.autojump = { + enable = true; + }; +} diff --git a/home/panotaka/common/core/bash.nix b/home/panotaka/common/core/shell/bash.nix similarity index 100% rename from home/panotaka/common/core/bash.nix rename to home/panotaka/common/core/shell/bash.nix diff --git a/home/panotaka/common/core/shell/bat.nix b/home/panotaka/common/core/shell/bat.nix new file mode 100644 index 0000000..4cb0b03 --- /dev/null +++ b/home/panotaka/common/core/shell/bat.nix @@ -0,0 +1,5 @@ +{ + programs.bat = { + enable = true; + }; +} diff --git a/home/panotaka/common/core/shell/btop.nix b/home/panotaka/common/core/shell/btop.nix new file mode 100644 index 0000000..4f1a73b --- /dev/null +++ b/home/panotaka/common/core/shell/btop.nix @@ -0,0 +1,5 @@ +{ + programs.btop = { + enable = true; + }; +} diff --git a/home/panotaka/common/core/shell/carapace.nix b/home/panotaka/common/core/shell/carapace.nix new file mode 100644 index 0000000..42fd421 --- /dev/null +++ b/home/panotaka/common/core/shell/carapace.nix @@ -0,0 +1,9 @@ +{ + programs.carapace = { + enable = true; + enableBashIntegration = true; + enableZshIntegration = true; + enableNushellIntegration = true; + enableFishIntegration = true; + }; +} diff --git a/home/panotaka/common/core/shell/default.nix b/home/panotaka/common/core/shell/default.nix new file mode 100644 index 0000000..c65ce41 --- /dev/null +++ b/home/panotaka/common/core/shell/default.nix @@ -0,0 +1,18 @@ +# FIXME(starter): customize your bash preferences here +{ + imports = [ + ./atuin.nix + ./autojump.nix + ./bash.nix + ./bat.nix + ./btop.nix + ./carapace.nix + ./direnv.nix + ./eza.nix + ./fish.nix + ./rip.nix + ./tldr.nix + ./zellij.nix + ./zoxide.nix + ]; +} diff --git a/home/panotaka/common/core/direnv.nix b/home/panotaka/common/core/shell/direnv.nix similarity index 87% rename from home/panotaka/common/core/direnv.nix rename to home/panotaka/common/core/shell/direnv.nix index da3a428..ac3b405 100644 --- a/home/panotaka/common/core/direnv.nix +++ b/home/panotaka/common/core/shell/direnv.nix @@ -3,6 +3,7 @@ enable = true; enableBashIntegration = true; enableZshIntegration = true; + #enableFishIntegration = true; nix-direnv.enable = true; # better than native direnv nix functionality - https://github.com/nix-community/nix-direnv }; } diff --git a/home/panotaka/common/core/shell/eza.nix b/home/panotaka/common/core/shell/eza.nix new file mode 100644 index 0000000..19a6922 --- /dev/null +++ b/home/panotaka/common/core/shell/eza.nix @@ -0,0 +1,14 @@ +{...}: { + programs.eza = { + enable = true; + extraOptions = [ + "--group-directories-first" + "--header" + ]; + icons = "auto"; + }; + + home.shellAliases = { + l = "eza -1 --group-directories-first"; + }; +} diff --git a/home/panotaka/common/core/fish.nix b/home/panotaka/common/core/shell/fish.nix similarity index 100% rename from home/panotaka/common/core/fish.nix rename to home/panotaka/common/core/shell/fish.nix diff --git a/home/panotaka/common/core/shell/rip.nix b/home/panotaka/common/core/shell/rip.nix new file mode 100644 index 0000000..ba46e3a --- /dev/null +++ b/home/panotaka/common/core/shell/rip.nix @@ -0,0 +1,5 @@ +{pkgs, ...}: { + home.packages = with pkgs; [ + rm-improved + ]; +} diff --git a/home/panotaka/common/core/shell/tldr.nix b/home/panotaka/common/core/shell/tldr.nix new file mode 100644 index 0000000..5301c2b --- /dev/null +++ b/home/panotaka/common/core/shell/tldr.nix @@ -0,0 +1,11 @@ +{pkgs, ...}: { + home.packages = with pkgs; [ + #tlrc + ]; + + services.tldr-update = { + enable = true; + package = pkgs.tlrc; + period = "weekly"; + }; +} diff --git a/home/panotaka/common/core/shell/zellij.nix b/home/panotaka/common/core/shell/zellij.nix new file mode 100644 index 0000000..0a9448e --- /dev/null +++ b/home/panotaka/common/core/shell/zellij.nix @@ -0,0 +1,13 @@ +{ + programs.zellij = { + enable = true; + enableBashIntegration = true; + enableZshIntegration = true; + enableFishIntegration = true; + settings = { + #simplified_ui = true; + pane_frames = false; + copy_on_select = false; + }; + }; +} diff --git a/home/panotaka/common/core/shell/zoxide.nix b/home/panotaka/common/core/shell/zoxide.nix new file mode 100644 index 0000000..30adf1c --- /dev/null +++ b/home/panotaka/common/core/shell/zoxide.nix @@ -0,0 +1,9 @@ +{ + programs.zoxide = { + enable = true; + enableBashIntegration = true; + enableZshIntegration = true; + enableNushellIntegration = true; + enableFishIntegration = true; + }; +} diff --git a/home/panotaka/common/core/ssh.nix b/home/panotaka/common/core/ssh.nix index 8ffe4e7..4f72669 100644 --- a/home/panotaka/common/core/ssh.nix +++ b/home/panotaka/common/core/ssh.nix @@ -1,22 +1,17 @@ # FIXME(starter): adjust to you security requirements -{ - config, - ... -}: -{ - programs.ssh = - { - enable = true; +{config, ...}: { + programs.ssh = { + enable = true; - controlMaster = "auto"; - controlPath = "${config.home.homeDirectory}/.ssh/sockets/S.%r@%h:%p"; - controlPersist = "20m"; - # Avoids infinite hang if control socket connection interrupted. ex: vpn goes down/up - serverAliveCountMax = 3; - serverAliveInterval = 5; # 3 * 5s - hashKnownHosts = true; - addKeysToAgent = "yes"; - }; + controlMaster = "auto"; + controlPath = "${config.home.homeDirectory}/.ssh/sockets/S.%r@%h:%p"; + controlPersist = "20m"; + # Avoids infinite hang if control socket connection interrupted. ex: vpn goes down/up + serverAliveCountMax = 3; + serverAliveInterval = 5; # 3 * 5s + hashKnownHosts = true; + addKeysToAgent = "yes"; + }; home.file = { ".ssh/config.d/.keep".text = "# Managed by Home Manager"; ".ssh/sockets/.keep".text = "# Managed by Home Manager"; diff --git a/shell.nix b/shell.nix index b79e71d..0917951 100644 --- a/shell.nix +++ b/shell.nix @@ -1,28 +1,26 @@ # Shell for bootstrapping flake-enabled nix and other tooling { pkgs ? - # If pkgs is not defined, instantiate nixpkgs from locked commit - let - lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked; - nixpkgs = fetchTarball { - url = "https://github.com/nixos/nixpkgs/archive/${lock.rev}.tar.gz"; - sha256 = lock.narHash; - }; - in - import nixpkgs { overlays = [ ]; }, + # If pkgs is not defined, instantiate nixpkgs from locked commit + let + lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked; + nixpkgs = fetchTarball { + url = "https://github.com/nixos/nixpkgs/archive/${lock.rev}.tar.gz"; + sha256 = lock.narHash; + }; + in + import nixpkgs {overlays = [];}, ... -}: -{ +}: { default = pkgs.mkShell { NIX_CONFIG = "extra-experimental-features = nix-command flakes"; BOOTSTRAP_USER = "panotaka"; BOOTSTRAP_SSH_PORT = "22"; BOOTSTRAP_SSH_KEY = "~/.ssh/id_manu"; - nativeBuildInputs = builtins.attrValues { - inherit (pkgs) - + inherit + (pkgs) # NOTE(starter): add any packages you want available in the shell when accessing the parent directory. # These will be installed regardless of what was installed specific for the host or home configs nix