Migrate some packages from brew to nix

work
mat ess 2022-04-20 21:26:30 -04:00
parent 20c07d46b0
commit 3a5173afa8
6 changed files with 36 additions and 31 deletions

View File

@ -1,4 +1,4 @@
{ pkgs, lib, ... }:
{ config, pkgs, lib, ... }:
{
imports = [
@ -11,15 +11,20 @@
# `home-manager` currently has issues adding them to `~/Applications`
# Issue: https://github.com/nix-community/home-manager/issues/1341
environment.systemPackages = with pkgs; [
# codium
# discord
# element-desktop
# firefox
discord-ptb
element-desktop
# firefox *
jitsi-meet
kitty
# lagrange
# signal-desktop
# steam
lagrange
# mullvad-vpn *
obsidian
# signal-desktop *
slack
# steam *
terminal-notifier
# zoom-us *
# *no nixpkgs darwin support T.T
];
# https://github.com/nix-community/home-manager/issues/423

View File

@ -52,22 +52,15 @@ in
homebrew.casks = [
"aerial"
"alfred"
"discord"
"element"
"firefox"
"gog-galaxy"
"jitsi-meet"
"knockknock"
"lagrange"
"lulu"
"mullvadvpn"
"obsidian"
"rectangle"
"signal"
"slack"
"steam"
"twitch"
"vscodium"
"zoom"
];

View File

@ -26,16 +26,14 @@
# Configuration for `nixpkgs`
nixpkgsConfig = {
config = { allowUnfree = true; };
overlays = attrValues self.overlays;
# overlays = attrValues self.overlays ++ singleton (
# # Sub in x86 version of packages that don't build on Apple Silicon yet
# final: prev: (optionalAttrs (prev.stdenv.system == "aarch64-darwin") {
# inherit (final.pkgs-x86)
# idris2
# nix-index
# purescript;
# })
# );
# overlays = attrValues self.overlays;
overlays = attrValues self.overlays ++ singleton (
# Sub in x86 version of packages that don't build on Apple Silicon yet
final: prev: (optionalAttrs (prev.stdenv.system == "aarch64-darwin") {
inherit (final.pkgs-x86)
vscodium;
})
);
};
# Shared home-manager configs

View File

@ -1,9 +1,12 @@
{ pkgs, lib, ... }:
# adapted from
# https://github.com/reckenrode/nixos-configs/blob/2acd7b0699fd57628deb7b8855b4d5f0ea8f8cb1/common/darwin/home-manager/copyApplications.nix
{ config, pkgs, lib, ... }:
{
home.activation = {
home.activation = lib.optionalAttrs pkgs.stdenv.isDarwin {
copyApplications = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
appsSrc="$newGenPath/home-path/Applications/"
appsSrc="${config.home.homeDirectory}/Applications/Nix Apps/"
if [ -d "$appsSrc" ]; then
baseDir="$HOME/Applications/Home Manager Apps"
rsyncArgs="--archive --checksum --chmod=-w --copy-unsafe-links --delete"

View File

@ -7,6 +7,7 @@
./kitty.nix
./neovim.nix
./shells.nix
./copyApplications.nix
];
home.enableNixpkgsReleaseCheck = true;
@ -62,6 +63,11 @@
set-bat-colors
'';
};
# vscode
vscode = {
enable = true;
package = pkgs.vscodium;
};
};
# }}}
@ -117,8 +123,8 @@
home.file.".pijulconfig".text = ''
[author]
name = "mat"
full_name = "mat ess"
email = "mat@mat.services"
full_name = "${config.programs.git.userName}"
email = "${config.programs.git.userEmail}"
'';
# https://docs.haskellstack.org/en/stable/yaml_configuration/#non-project-specific-config

View File

@ -140,7 +140,7 @@
nd = "nix develop";
nf = "nix flake";
nr = "nix run";
ns = "nix search";
ns = "nix search nixpkgs";
# Other
".." = "cd ..";