From 0d7bf993a4092e09edcc596723d4d2ea651af0f9 Mon Sep 17 00:00:00 2001 From: Mira Volitaris Date: Thu, 4 Dec 2025 23:56:54 -0500 Subject: [PATCH] add jujutsu, switch shel to xonsh, enable zoxide integration, replace thefuck --- common.nix | 19 ++- flake.lock | 330 ----------------------------------------------------- 2 files changed, 13 insertions(+), 336 deletions(-) delete mode 100644 flake.lock diff --git a/common.nix b/common.nix index 63bc31c..440831c 100644 --- a/common.nix +++ b/common.nix @@ -121,7 +121,7 @@ in { firefox tree ]; - shell = pkgs.zsh; + shell = pkgs.xonsh; openssh.authorizedKeys.keys = sshKeys; }; anish = { @@ -134,6 +134,7 @@ in { }; environment.systemPackages = with pkgs; lib.lists.unique [ + bat bat brightnessctl btdu @@ -153,6 +154,7 @@ in { ghostty glibcLocales hyfetch + jujutsu killall lsd lsof @@ -173,10 +175,9 @@ in { xonsh zoxide zsh - ] - ++ [ - alejandra - lua-language-server + ] ++ [ + alejandra + lua-language-server stylua ]; programs = { @@ -193,10 +194,16 @@ in { lazygit.enable = true; yazi.enable = true; zsh.enable = true; - # thefuck.enable = true; + pay-respects.enable = true; # direnv.enable = true; neovim.enable = true; starship.enable = true; fzf.fuzzyCompletion = true; + zoxide = { + enable = true; + enableZshIntegration = true; + enableXonshIntegration = true; + enableBashIntegration = true; + }; }; } diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 0934774..0000000 --- a/flake.lock +++ /dev/null @@ -1,330 +0,0 @@ -{ - "nodes": { - "cargo2nix": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1705129117, - "narHash": "sha256-LgdDHibvimzYhxBK3kxCk2gAL7k4Hyigl5KI0X9cijA=", - "owner": "cargo2nix", - "repo": "cargo2nix", - "rev": "ae19a9e1f8f0880c088ea155ab66cee1fa001f59", - "type": "github" - }, - "original": { - "owner": "cargo2nix", - "ref": "release-0.11.0", - "repo": "cargo2nix", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1762980239, - "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "mirafetch": { - "inputs": { - "cargo2nix": "cargo2nix", - "flake-utils": [ - "mirafetch", - "cargo2nix", - "flake-utils" - ], - "nixpkgs": [ - "mirafetch", - "cargo2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736958443, - "narHash": "sha256-RygnAZb+BQ+hx9eDmk7ucAg28l5cIM8sM0zbGX0bHbM=", - "owner": "ArgentumCation", - "repo": "mirafetch", - "rev": "a03be8e4340fbf93a29c9904393ff3721c060667", - "type": "github" - }, - "original": { - "owner": "ArgentumCation", - "repo": "mirafetch", - "type": "github" - } - }, - "neovim-nightly-overlay": { - "inputs": { - "flake-parts": "flake-parts", - "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1763683496, - "narHash": "sha256-k20voxbsi+899PeXlvWpKU5tcgNYfNqC52rgrh+MOto=", - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "rev": "1ddc8e956c8165df29735202b76bb0cfa827916d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "type": "github" - } - }, - "neovim-src": { - "flake": false, - "locked": { - "lastModified": 1763682595, - "narHash": "sha256-/dUf5I0DyLvPgFzjJj0/lUHKZ2M1sVlbYCgudDabxIo=", - "owner": "neovim", - "repo": "neovim", - "rev": "a8b9660ca3452a27b68bf914f618df2d78b64180", - "type": "github" - }, - "original": { - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, - "nix-darwin": { - "inputs": { - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1763505477, - "narHash": "sha256-nJRd4LY2kT3OELfHqdgWjvToNZ4w+zKCMzS2R6z4sXE=", - "owner": "LnL7", - "repo": "nix-darwin", - "rev": "3bda9f6b14161becbd07b3c56411f1670e19b9b5", - "type": "github" - }, - "original": { - "owner": "LnL7", - "repo": "nix-darwin", - "type": "github" - } - }, - "nixos-unstable": { - "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1705099185, - "narHash": "sha256-SxJenKtvcrKJd0TyJQMO3p6VA7PEp+vmMnmlKFzWMNs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2bce5ccff0ad7abda23e8bb56434b6877a446694", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-darwin": { - "locked": { - "lastModified": 1735564410, - "narHash": "sha256-HB/FA0+1gpSs8+/boEavrGJH+Eq08/R2wWNph1sM1Dg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1e7a8f391f1a490460760065fa0630b5520f9cf8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-24.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1763618868, - "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1763618868, - "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1747728033, - "narHash": "sha256-NnXFQu7g4LnvPIPfJmBuZF7LFy/fey2g2+LCzjQhTUk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2f9173bde1d3fbf1ad26ff6d52f952f9e9da52ea", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "mirafetch": "mirafetch", - "neovim-nightly-overlay": "neovim-nightly-overlay", - "nix-darwin": "nix-darwin", - "nixos-unstable": "nixos-unstable", - "nixpkgs": "nixpkgs_4", - "nixpkgs-darwin": "nixpkgs-darwin", - "nixpkgs-unstable": "nixpkgs-unstable" - } - }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "mirafetch", - "cargo2nix", - "flake-utils" - ], - "nixpkgs": [ - "mirafetch", - "cargo2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1705112162, - "narHash": "sha256-IAM0+Uijh/fwlfoeDrOwau9MxcZW3zeDoUHc6Z3xfqM=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "9e0af26ffe52bf955ad5575888f093e41fba0104", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -}