diff options
| -rw-r--r-- | flake.lock | 10 | ||||
| m--------- | packages | 0 | ||||
| -rw-r--r-- | system/marvin.nix | 8 | ||||
| -rw-r--r-- | user/settings/shell.nix | 4 |
4 files changed, 12 insertions, 10 deletions
diff --git a/flake.lock b/flake.lock index 483d06e6..91024edf 100644 --- a/flake.lock +++ b/flake.lock @@ -1091,13 +1091,13 @@ ] }, "locked": { - "lastModified": 1731245788, - "narHash": "sha256-PNOPHKxwaIRG+z8ABzYVFSuX8x/iPQ48PsCtqasGjPE=", + "lastModified": 1731785303, + "narHash": "sha256-beqhX+dzuAqmwCT9Ho4SQwSje29v5jpP0kZhAG+5kFw=", "ref": "refs/heads/main", - "rev": "60894904ea1fc651b96623e1355403ed08e63176", - "revCount": 33, + "rev": "565f2e1b4b1fabfd509c67b2bd7302551c7add27", + "revCount": 34, "type": "git", - "url": "https://git.alanpearce.eu/nix-packages" + "url": "file:///Users/alan/projects/alanpearce.eu/nixfiles/packages" }, "original": { "type": "git", diff --git a/packages b/packages -Subproject 60894904ea1fc651b96623e1355403ed08e6317 +Subproject 565f2e1b4b1fabfd509c67b2bd7302551c7add2 diff --git a/system/marvin.nix b/system/marvin.nix index a69342a0..cc02a202 100644 --- a/system/marvin.nix +++ b/system/marvin.nix @@ -1,4 +1,4 @@ -{ ... }: { +{ pkgs, ... }: { imports = [ ./settings/darwin.nix ./settings/dev.nix @@ -11,6 +11,12 @@ group = "wheel"; }; + programs.fish.enable = true; + environment.shells = with pkgs; [ + fish + "/Users/alan/.local/state/nix/profile/bin/fish" + ]; + environment.variables.LANG = "en_GB.UTF-8"; launchd.user.envVariables = { diff --git a/user/settings/shell.nix b/user/settings/shell.nix index 0b232d0e..18cab4ab 100644 --- a/user/settings/shell.nix +++ b/user/settings/shell.nix @@ -49,10 +49,6 @@ in hist-freq-commands = lib.mkDefault "fc -l -10000 | cut -d' ' -f4 | sort | uniq -c | sort -gr | head -n100 | less"; wprop = "xprop | egrep '^WM_(CLASS|NAME|WINDOW_ROLE|TYPE)'"; - # Enable the following commands to support aliases. - sudo = "sudo "; - watch = "watch "; - e = "$EDITOR"; se = "sudo -e"; |