Compare commits
2 commits
8e49eb2203
...
ddd49ed84f
Author | SHA1 | Date | |
---|---|---|---|
ddd49ed84f | |||
59987f0728 |
2 changed files with 31 additions and 19 deletions
|
@ -17,25 +17,27 @@ in
|
||||||
options.marleyos.programs.fish.enable = mkEnableOption "fish";
|
options.marleyos.programs.fish.enable = mkEnableOption "fish";
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
home.packages = with pkgs; [
|
home.packages =
|
||||||
# general
|
with pkgs;
|
||||||
babelfish
|
[
|
||||||
|
# general
|
||||||
|
babelfish
|
||||||
|
|
||||||
# for fish_greeting()
|
# for fish_greeting()
|
||||||
marleyos.figlet-xero-fonts
|
marleyos.figlet-xero-fonts
|
||||||
lolcat
|
lolcat
|
||||||
|
|
||||||
# for extract()
|
# for extract()
|
||||||
gnutar
|
gnutar
|
||||||
bzip2
|
bzip2
|
||||||
bzip3
|
bzip3
|
||||||
gzip
|
gzip
|
||||||
unzip
|
unzip
|
||||||
pax
|
pax
|
||||||
]
|
]
|
||||||
# unrar-free is broken on darwin :(
|
# unrar-free is broken on darwin :(
|
||||||
++ (optionals (is-linux system) [ unrar-free ])
|
++ (optionals (is-linux system) [ unrar-free ])
|
||||||
++ (optionals (is-darwin system) [ unrar ]);
|
++ (optionals (is-darwin system) [ unrar ]);
|
||||||
|
|
||||||
programs.fish = {
|
programs.fish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -72,7 +74,7 @@ in
|
||||||
cp = "cp -iv";
|
cp = "cp -iv";
|
||||||
mkdir = "mkdir -pv";
|
mkdir = "mkdir -pv";
|
||||||
mv = "mv -iv";
|
mv = "mv -iv";
|
||||||
rm = "rm -r";
|
rm = "rm -rf";
|
||||||
grep = "grep --color=auto";
|
grep = "grep --color=auto";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
12
readme.md
12
readme.md
|
@ -27,9 +27,12 @@ publicly released, therefore things are likely to break.
|
||||||
|
|
||||||
## 🐣 Outputs
|
## 🐣 Outputs
|
||||||
|
|
||||||
|
- _systems:_ System config
|
||||||
|
- _systems/aarch64-darwin/mairley:_ My Macbook Air 2022ish. Main laptop.
|
||||||
- _homes:_ Home manager config
|
- _homes:_ Home manager config
|
||||||
- _homes/\<system>/marley@nyx:_ My main desktop. Currently running Arch Linux
|
- _homes/x86_64-linux/marley@nyx:_ My main desktop. Currently running Arch Linux
|
||||||
but will be switched to NixOS once I've finished migrating my dotfiles.
|
but will be switched to NixOS once I've finished migrating my dotfiles.
|
||||||
|
- _homes/aarch64-darwin/marley@mairley:_ Home configuration for mairley.
|
||||||
- _modules:_ Most config is done here. The file structure is pretty
|
- _modules:_ Most config is done here. The file structure is pretty
|
||||||
self-explanatory.
|
self-explanatory.
|
||||||
- _modules/{home,nixos,darwin}/base:_ Anything in a base folder directly under
|
- _modules/{home,nixos,darwin}/base:_ Anything in a base folder directly under
|
||||||
|
@ -44,3 +47,10 @@ publicly released, therefore things are likely to break.
|
||||||
|
|
||||||
- [jakehamilton/config](https://github.com/jakehamilton/config)
|
- [jakehamilton/config](https://github.com/jakehamilton/config)
|
||||||
- [the nix logo used in this readme](https://lix.systems/)
|
- [the nix logo used in this readme](https://lix.systems/)
|
||||||
|
|
||||||
|
## ✅ Todo - Preparing to Switch to NixOS
|
||||||
|
|
||||||
|
- [x] Migrate Chezmoi dotfiles
|
||||||
|
- [x] Migrate ~/.config dotfiles
|
||||||
|
- [ ] Migrate ~ dotfiles
|
||||||
|
- [ ] Check for any personal files not in ~/data
|
||||||
|
|
Loading…
Reference in a new issue