diff --git a/flake.lock b/flake.lock index a6b748f..70309aa 100644 --- a/flake.lock +++ b/flake.lock @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1694266353, - "narHash": "sha256-NutPFFKc5FK05zq8JYm8quBKJ93goYowxjW/FKcXAdI=", + "lastModified": 1694461360, + "narHash": "sha256-8pD4sER07KvFjaa+8Uh5zuUrWVmAtT2UocFMktq80SA=", "owner": "nix-community", "repo": "disko", - "rev": "f9907fcf6df79a76ea7e3a3afe9340a672cb9c6e", + "rev": "fc6f863fe175a0e7e4ca39f44740627815f0da39", "type": "github" }, "original": { @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1694133570, - "narHash": "sha256-+99xBnlqbXXG0hyu132nkIYJlAi98RDKKWqTdBWzyGU=", + "lastModified": 1694479111, + "narHash": "sha256-os/KFcAORI8OBpPA4J5llib9sVLn9lEtDBgf0th5lhE=", "owner": "bandithedoge", "repo": "nixpkgs-firefox-darwin", - "rev": "78f48f8814e16c23e2f95473b23f5f3ce9a4bcb8", + "rev": "bd9d69cec7e3f62c22d1b3bbe68b4ddaa2b6e480", "type": "github" }, "original": { @@ -144,12 +144,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", "type": "github" }, "original": { @@ -160,7 +163,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1685518550, @@ -178,7 +181,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1692799911, @@ -217,11 +220,11 @@ ] }, "locked": { - "lastModified": 1694134858, - "narHash": "sha256-fG/ESauOGmiojKlpJG8gB62dJa5Wd+ZIuiDMKK/HD3g=", + "lastModified": 1694469544, + "narHash": "sha256-eqZng5dZnAUyb7xXyFk5z871GY/++KVv3Gyld5mVh20=", "owner": "nix-community", "repo": "home-manager", - "rev": "19c6a4081b14443420358262f8416149bd79561a", + "rev": "5171f5ef654425e09d9c2100f856d887da595437", "type": "github" }, "original": { @@ -349,11 +352,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1693985761, - "narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=", + "lastModified": 1694183432, + "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0bffda19b8af722f8069d09d8b6a24594c80b352", + "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b", "type": "github" }, "original": { @@ -397,11 +400,11 @@ }, "nur": { "locked": { - "lastModified": 1694267186, - "narHash": "sha256-LQosi2J9XCA5zXg2Fg3+Crthxd9JS7sKQF8X+EnxuHE=", + "lastModified": 1694486691, + "narHash": "sha256-IGSLikeWyExLQTxVLRwuY8d7MkO9omKxIVoR9NWwJDs=", "owner": "nix-community", "repo": "nur", - "rev": "bb7dc60ce4084565323cb414a074e0d849bfdebb", + "rev": "e223f266dd375ace846bf524979bf900f4f069a7", "type": "github" }, "original": { @@ -430,11 +433,11 @@ "nvim-tree-lua-src": { "flake": false, "locked": { - "lastModified": 1694236394, - "narHash": "sha256-Q0QFj7Bz1wbVLzHzV57WWY+uN6GFYD8qh2olgyG1SNM=", + "lastModified": 1694306329, + "narHash": "sha256-Rv3DdlqRppEum09N4cKRlj0xdPbf5QLYHzYDuxb55w8=", "owner": "kyazdani42", "repo": "nvim-tree.lua", - "rev": "b7f6600bc2b4e48e4af45f1e77d2bf170685a542", + "rev": "94c7c810af205c0f00c8f105dcf490c8eb17658a", "type": "github" }, "original": { @@ -509,11 +512,11 @@ ] }, "locked": { - "lastModified": 1680488274, - "narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=", + "lastModified": 1688783586, + "narHash": "sha256-HHaM2hk2azslv1kH8zmQxXo2e7i5cKgzNIuK4yftzB0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8", + "rev": "7a29283cc242c2486fc67f60b431ef708046d176", "type": "github" }, "original": { @@ -552,6 +555,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "telescope-nvim-src": { "flake": false, "locked": { @@ -723,11 +741,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1694268073, - "narHash": "sha256-/D1ec7oBZYB9eYJw8BdAQ4GHILO2iPkHpQ2GekvcN8k=", + "lastModified": 1694339281, + "narHash": "sha256-0wdDtsl9jBxW8ld2+1SwD12OzpcmEha0KsgoFGlz+P8=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "18691b5d9cc425ba0cee192cf4b582be8c570999", + "rev": "212e2d6b0d820fc9f1e79f7b5feeea2824db51bb", "type": "github" }, "original": { diff --git a/modules/common/shell/fish/default.nix b/modules/common/shell/fish/default.nix index cb69b6e..fb07057 100644 --- a/modules/common/shell/fish/default.nix +++ b/modules/common/shell/fish/default.nix @@ -6,7 +6,7 @@ home-manager.users.${config.user} = { # Packages used in abbreviations and aliases - home.packages = with pkgs; [ curl exa ]; + home.packages = with pkgs; [ curl ]; programs.fish = { enable = true; @@ -15,8 +15,8 @@ # Version of bash which works much better on the terminal bash = "${pkgs.bashInteractive}/bin/bash"; - # Use exa instead of ls for fancier output - ls = "exa --group"; + # Use eza (exa) instead of ls for fancier output + ls = "${pkgs.eza}/bin/eza --group"; # Move files to XDG trash on the commandline trash = lib.mkIf pkgs.stdenv.isLinux "${pkgs.trash-cli}/bin/trash-put";