Remove user-wide work-related packages
Instead, these are now installed via a work-specific devenv environment.
This commit is contained in:
parent
0fa23fdd05
commit
71d2f7d5dd
8 changed files with 17 additions and 62 deletions
|
|
@ -80,7 +80,8 @@ the config, but especially when trying out new tools the code could be a bit wil
|
||||||
|
|
||||||
Additionally, there's a couple of ideas I have for this:
|
Additionally, there's a couple of ideas I have for this:
|
||||||
- [ ] Deploy base tooling to all hosts. This mainly includes shell and `helix` configs. They should still be configurable per-host. Potential issue here could be hosts where I don't use home manager
|
- [ ] Deploy base tooling to all hosts. This mainly includes shell and `helix` configs. They should still be configurable per-host. Potential issue here could be hosts where I don't use home manager
|
||||||
- [ ] Make everything more composable. Can make use of the `elements` config some more, like how it's done for `quirks`
|
- [ ] Make everything more composable. Can make use of the `_elements` config some more, like how it's done for `quirks`
|
||||||
|
- [ ] Create custom live-ISO that has installation tooling/shortcuts pre-configured
|
||||||
|
|
||||||
[just]: https://github.com/casey/just
|
[just]: https://github.com/casey/just
|
||||||
[snowfall]: https://snowfall.org/guides/lib/quickstart
|
[snowfall]: https://snowfall.org/guides/lib/quickstart
|
||||||
|
|
|
||||||
17
flake.lock
generated
17
flake.lock
generated
|
|
@ -156,22 +156,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"docker-compose-1": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1624397714,
|
|
||||||
"narHash": "sha256-mtIXSGsYIIK8IM6bY02bZ9ENkOpPNQEMAoHE43Dg8HE=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "b0f0b5c6c021ebafbd322899aa9a54b87d75a313",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "b0f0b5c6c021ebafbd322899aa9a54b87d75a313",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"elemental-wine-source": {
|
"elemental-wine-source": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
@ -635,7 +619,6 @@
|
||||||
"agenix-rekey": "agenix-rekey",
|
"agenix-rekey": "agenix-rekey",
|
||||||
"darwin": "darwin_2",
|
"darwin": "darwin_2",
|
||||||
"disko": "disko",
|
"disko": "disko",
|
||||||
"docker-compose-1": "docker-compose-1",
|
|
||||||
"home-manager": "home-manager_2",
|
"home-manager": "home-manager_2",
|
||||||
"musnix": "musnix",
|
"musnix": "musnix",
|
||||||
"nixpkgs": "nixpkgs_5",
|
"nixpkgs": "nixpkgs_5",
|
||||||
|
|
|
||||||
|
|
@ -100,6 +100,5 @@
|
||||||
affinity-nix.url = "github:mrshmllow/affinity-nix";
|
affinity-nix.url = "github:mrshmllow/affinity-nix";
|
||||||
quadlet.url = "github:SEIAROTg/quadlet-nix";
|
quadlet.url = "github:SEIAROTg/quadlet-nix";
|
||||||
musnix.url = "github:musnix/musnix";
|
musnix.url = "github:musnix/musnix";
|
||||||
docker-compose-1.url = github:nixos/nixpkgs/b0f0b5c6c021ebafbd322899aa9a54b87d75a313;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,10 @@
|
||||||
nodejs_20.pkgs.pnpm
|
nodejs_20.pkgs.pnpm
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.direnv.enable = true;
|
programs.direnv = {
|
||||||
|
enable = true;
|
||||||
|
config.global.log_filter = "^$";
|
||||||
|
};
|
||||||
programs.direnv.nix-direnv.enable = true;
|
programs.direnv.nix-direnv.enable = true;
|
||||||
|
|
||||||
programs.go.enable = true;
|
programs.go.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
{
|
|
||||||
pkgs,
|
|
||||||
inputs,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
home.packages = with pkgs; [
|
|
||||||
# docker has to be installed globally because we have to enable virtualization
|
|
||||||
inputs.docker-compose-1.legacyPackages."x86_64-linux".docker-compose
|
|
||||||
|
|
||||||
ruby_3_4
|
|
||||||
|
|
||||||
# Dev environment specifics
|
|
||||||
libxcrypt # maklerportal-frontend-test-suite
|
|
||||||
postgresql
|
|
||||||
geos
|
|
||||||
|
|
||||||
# mDNS support
|
|
||||||
nssmdns
|
|
||||||
avahi
|
|
||||||
|
|
||||||
slack
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
slurp # Region selection
|
slurp # Region selection
|
||||||
|
|
||||||
# GUI
|
# GUI
|
||||||
|
slack # Work chat
|
||||||
vesktop # Discord client
|
vesktop # Discord client
|
||||||
vlc # Video player
|
vlc # Video player
|
||||||
obsidian # Note taking
|
obsidian # Note taking
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,6 @@ in {
|
||||||
# clean up ~
|
# clean up ~
|
||||||
LESSHISTFILE = "${cache}/less/history";
|
LESSHISTFILE = "${cache}/less/history";
|
||||||
LESSKEY = "${conf}/less/lesskey";
|
LESSKEY = "${conf}/less/lesskey";
|
||||||
DIRENV_LOG_FORMAT = "";
|
|
||||||
|
|
||||||
BROWSER = "firefox";
|
BROWSER = "firefox";
|
||||||
TERMINAL = "kitty";
|
TERMINAL = "kitty";
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,10 @@
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
inputs,
|
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
config = lib.mkIf (builtins.elem "avahi" config.elements.quirks) {
|
config = lib.mkIf (builtins.elem "docker" config.elements.quirks) {
|
||||||
# Use legacy docker compose v1
|
virtualisation.docker = {
|
||||||
environment.systemPackages = [
|
|
||||||
inputs.docker-compose-1.legacyPackages."x86_64-linux".docker-compose
|
|
||||||
];
|
|
||||||
|
|
||||||
virtualisation = {
|
|
||||||
docker = {
|
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
# https://github.com/hausgold/knowledge/blob/master/troubleshooting/local-env-quirks.md#haproxy--docker-ulimit-glitch
|
# https://github.com/hausgold/knowledge/blob/master/troubleshooting/local-env-quirks.md#haproxy--docker-ulimit-glitch
|
||||||
|
|
@ -26,5 +19,4 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue