diff options
author | sefidel <contact@sefidel.net> | 2023-06-02 22:11:08 +0900 |
---|---|---|
committer | sefidel <contact@sefidel.net> | 2023-06-02 22:11:08 +0900 |
commit | 1642de788ccac8098d944066184a0c71b7a8e537 (patch) | |
tree | eb6ddd182008486a6ac6234b997113d346f9dcc0 /home | |
parent | fab665812fa1d507fbfb0fc143afe873163b7d36 (diff) | |
download | nixrc-1642de788ccac8098d944066184a0c71b7a8e537.tar.gz nixrc-1642de788ccac8098d944066184a0c71b7a8e537.zip |
fix(darwin/kompakt-darwin): fixup
Diffstat (limited to 'home')
-rw-r--r-- | home/default.nix | 21 | ||||
-rw-r--r-- | home/kompakt-darwin/sefidel.nix | 9 | ||||
-rw-r--r-- | home/profiles/base-darwin/default.nix | 1 | ||||
-rw-r--r-- | home/profiles/browsing/default.nix | 5 | ||||
-rw-r--r-- | home/profiles/communication/default.nix | 6 |
5 files changed, 39 insertions, 3 deletions
diff --git a/home/default.nix b/home/default.nix index 9c9e324..b338929 100644 --- a/home/default.nix +++ b/home/default.nix @@ -41,4 +41,25 @@ version = "23.05"; }; + + "sefidel@kompakt-darwin" = self.lib.mkHome { + username = "sefidel"; + hostname = "kompakt-darwin"; + pkgs = import unstable { system = "aarch64-darwin"; overlays = with inputs; [ rust.overlays.default (import ../overlays/neovim.nix) neovim.overlay ]; }; + + extraModules = [ + ./profiles/populate.nix + ./profiles/base-darwin + ./profiles/browsing + ./profiles/development + ./profiles/communication + ./profiles/multimedia + ./profiles/research + ./profiles/fonts + + inputs.sops-nix.homeManagerModules.sops + ]; + + version = "23.05"; + }; } diff --git a/home/kompakt-darwin/sefidel.nix b/home/kompakt-darwin/sefidel.nix new file mode 100644 index 0000000..51c2519 --- /dev/null +++ b/home/kompakt-darwin/sefidel.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: + +{ + config = { + activeProfiles = [ "base-darwin" "development" "research" "fonts" ]; + + programs.htop.settings.detailed_cpu_time = true; + }; +} diff --git a/home/profiles/base-darwin/default.nix b/home/profiles/base-darwin/default.nix index 332bb2b..2ce67e7 100644 --- a/home/profiles/base-darwin/default.nix +++ b/home/profiles/base-darwin/default.nix @@ -164,6 +164,7 @@ in default-cache-ttl-ssh 3600 pinentry-program ${pkgs.pinentry_mac}/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac allow-preset-passphrase + enable-ssh-support ''; }; } diff --git a/home/profiles/browsing/default.nix b/home/profiles/browsing/default.nix index ab5470c..b6478a5 100644 --- a/home/profiles/browsing/default.nix +++ b/home/profiles/browsing/default.nix @@ -8,7 +8,10 @@ in }; config = lib.mkIf cfg.enable { - home.packages = with pkgs; [ lynx firefox ]; + home.packages = with pkgs; [ lynx ] ++ pkgs.lib.optionals (pkgs.stdenv.isLinux) [ + # TODO: currently broken/doesn't support Darwin + pkgs.firefox + ]; programs.qutebrowser = { enable = true; diff --git a/home/profiles/communication/default.nix b/home/profiles/communication/default.nix index 76f73b2..4c46b83 100644 --- a/home/profiles/communication/default.nix +++ b/home/profiles/communication/default.nix @@ -14,7 +14,7 @@ let }); mbsyncCmd = if pkgs.stdenv.isLinux then "${config.programs.mbsync.package}/bin/mbsync" else ""; # https://github.com/Mic92/sops-nix/issues/284 - fixSopsPrefix = x: y: builtins.replaceStrings ["%r"] ["/run/user/${toString x}"] y; + fixSopsPrefix = x: y: builtins.replaceStrings [ "%r" ] [ "/run/user/${toString x}" ] y; in { imports = [ ../../modules/programs/nixpkgs ]; @@ -400,7 +400,6 @@ in slack discord-canary schildichat-desktop-wayland - nheko (weechat.override { configure = { availablePlugins, ... }: { plugins = [ @@ -414,6 +413,9 @@ in ]; }; }) + ] ++ pkgs.lib.optionals (pkgs.stdenv.isLinux) [ + # TODO: currently broken/doesn't support Darwin + pkgs.nheko ]; nixpkgs.allowedUnfree = [ "slack" "discord-canary" ]; |