mirror of
https://github.com/larstvei/nix-config.git
synced 2024-11-26 08:58:31 +00:00
Start cleaning up
This commit is contained in:
parent
a97c687d62
commit
87849b99cd
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
description = "Lars' MacBook Pro";
|
description = "My nix configuration.";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
@ -21,7 +21,9 @@
|
|||||||
system = "aarch64-darwin";
|
system = "aarch64-darwin";
|
||||||
|
|
||||||
modules = [
|
modules = [
|
||||||
|
./modules/core.nix
|
||||||
./modules/mac.nix
|
./modules/mac.nix
|
||||||
|
|
||||||
home-manager.darwinModule
|
home-manager.darwinModule
|
||||||
{
|
{
|
||||||
home-manager = {
|
home-manager = {
|
||||||
|
26
modules/core.nix
Normal file
26
modules/core.nix
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
nix = {
|
||||||
|
package = pkgs.nix;
|
||||||
|
|
||||||
|
settings = {
|
||||||
|
system = "aarch64-darwin";
|
||||||
|
extra-platforms = [ "aarch64-darwin" "x86_64-darwin" ];
|
||||||
|
experimental-features = [ "nix-command" "flakes" ];
|
||||||
|
build-users-group = "nixbld";
|
||||||
|
trusted-users = [ "root" "larstvei" ];
|
||||||
|
|
||||||
|
substituters = [
|
||||||
|
"https://cache.nixos.org"
|
||||||
|
"https://nix-community.cachix.org"
|
||||||
|
"https://larstvei.cachix.org"
|
||||||
|
];
|
||||||
|
|
||||||
|
trusted-public-keys = [
|
||||||
|
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||||
|
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||||
|
"larstvei.cachix.org-1:mJq98qeTBnm2xNNibn2BEwN1ggi6uQg+5hWASdG1Vys="
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
@ -65,30 +65,6 @@
|
|||||||
|
|
||||||
home.file.".config/enchant/hunspell/".source = "${pkgs.hunspellDicts.nb_NO}/share/hunspell/";
|
home.file.".config/enchant/hunspell/".source = "${pkgs.hunspellDicts.nb_NO}/share/hunspell/";
|
||||||
|
|
||||||
home.file.karabiner = {
|
|
||||||
target = ".config/karabiner/assets/complex_modifications/df_escape.json";
|
|
||||||
text = builtins.toJSON {
|
|
||||||
title = "Simultaneously press f + d to escape";
|
|
||||||
rules = [{
|
|
||||||
description = "Simultaneously press f + d to escape";
|
|
||||||
manipulators = [
|
|
||||||
{
|
|
||||||
type = "basic";
|
|
||||||
from = {
|
|
||||||
simultaneous = [
|
|
||||||
{ key_code = "f"; }
|
|
||||||
{ key_code = "d"; }
|
|
||||||
];
|
|
||||||
};
|
|
||||||
to = [
|
|
||||||
{ key_code = "escape"; }
|
|
||||||
];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
fzf = {
|
fzf = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -1,17 +1,5 @@
|
|||||||
{ pkgs, lib, ... }: {
|
{ pkgs, lib, ... }: {
|
||||||
|
|
||||||
nix = {
|
|
||||||
package = pkgs.nix;
|
|
||||||
|
|
||||||
settings = {
|
|
||||||
system = "aarch64-darwin";
|
|
||||||
extra-platforms = [ "aarch64-darwin" "x86_64-darwin" ];
|
|
||||||
experimental-features = [ "nix-command" "flakes" ];
|
|
||||||
build-users-group = "nixbld";
|
|
||||||
trusted-users = [ "root" "larstvei" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
fonts.packages = with pkgs; [
|
fonts.packages = with pkgs; [
|
||||||
fira
|
fira
|
||||||
fira-code
|
fira-code
|
||||||
@ -26,6 +14,7 @@
|
|||||||
users.users."larstvei".home = "/Users/larstvei";
|
users.users."larstvei".home = "/Users/larstvei";
|
||||||
|
|
||||||
programs.fish.enable = true;
|
programs.fish.enable = true;
|
||||||
|
|
||||||
system.activationScripts.postActivation.text = ''
|
system.activationScripts.postActivation.text = ''
|
||||||
# Set the default shell as fish for the user. MacOS doesn't do this like nixOS does
|
# Set the default shell as fish for the user. MacOS doesn't do this like nixOS does
|
||||||
sudo chsh -s ${lib.getBin pkgs.fish}/bin/fish larstvei
|
sudo chsh -s ${lib.getBin pkgs.fish}/bin/fish larstvei
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
experimental-features = nix-command flakes
|
|
||||||
substituters = https://cache.nixos.org https://cache.nixos.org/ https://nix-community.cachix.org https://larstvei.cachix.org
|
|
||||||
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= larstvei.cachix.org-1:mJq98qeTBnm2xNNibn2BEwN1ggi6uQg+5hWASdG1Vys=
|
|
Loading…
Reference in New Issue
Block a user