diff options
Diffstat (limited to 'macos.local')
28 files changed, 163 insertions, 9 deletions
diff --git a/macos.local/.clang-format.org b/macos.local/.clang-format.org deleted file mode 120000 index 4b4ef61..0000000 --- a/macos.local/.clang-format.org +++ /dev/null @@ -1 +0,0 @@ -../common/.clang-format.org
\ No newline at end of file diff --git a/macos.local/.config/emacs b/macos.local/.config/emacs deleted file mode 120000 index f4e5e56..0000000 --- a/macos.local/.config/emacs +++ /dev/null @@ -1 +0,0 @@ -../../common/.config/emacs
\ No newline at end of file diff --git a/macos.local/.config/fastfetch b/macos.local/.config/fastfetch deleted file mode 120000 index a73d684..0000000 --- a/macos.local/.config/fastfetch +++ /dev/null @@ -1 +0,0 @@ -../../common/.config/fastfetch
\ No newline at end of file diff --git a/macos.local/.config/nvim b/macos.local/.config/nvim deleted file mode 120000 index a0abd03..0000000 --- a/macos.local/.config/nvim +++ /dev/null @@ -1 +0,0 @@ -../../common/.config/nvim
\ No newline at end of file diff --git a/macos.local/.flake/flake.nix.org b/macos.local/.flake/flake.nix.org new file mode 100644 index 0000000..b971bf6 --- /dev/null +++ b/macos.local/.flake/flake.nix.org @@ -0,0 +1,32 @@ +#+title: macOS Nix Configuration + +#+begin_src nix + { + description = "My Darwin Configuration"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + nix-darwin.url = "github:LnL7/nix-darwin"; + nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; + home-manager.url = "github:nix-community/home-manager"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; + }; + + outputs = inputs@{ self, nix-darwin, nixpkgs, home-manager }: { + darwinConfigurations."macos" = nix-darwin.lib.darwinSystem { + specialArgs = { inherit inputs; }; + modules = [ + ./system/core.nix + home-manager.darwinModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.jjanzen = import ./home/core.nix; + } + ]; + }; + + darwinPackages = self.darwinConfigurations."macos".pkgs; + }; + } +#+end_src diff --git a/macos.local/.flake/home/.wallpaper b/macos.local/.flake/home/.wallpaper new file mode 120000 index 0000000..316db81 --- /dev/null +++ b/macos.local/.flake/home/.wallpaper @@ -0,0 +1 @@ +../../../common/.wallpaper
\ No newline at end of file diff --git a/macos.local/.flake/home/clang-format.nix.org b/macos.local/.flake/home/clang-format.nix.org new file mode 120000 index 0000000..db7166a --- /dev/null +++ b/macos.local/.flake/home/clang-format.nix.org @@ -0,0 +1 @@ +../../../common/.flake/home/clang-format.nix.org
\ No newline at end of file diff --git a/macos.local/.flake/home/core.nix.org b/macos.local/.flake/home/core.nix.org new file mode 100644 index 0000000..bb84514 --- /dev/null +++ b/macos.local/.flake/home/core.nix.org @@ -0,0 +1,21 @@ +#+title: Home Configuration + +Set up home manager for my user account and import submodules. +#+begin_src nix + { config, pkgs, ... }: + + { + imports = [ + ./clang-format.nix + ./fonts.nix + ./programs/core.nix + ]; + + home.username = "jjanzen"; + home.homeDirectory = "/Users/jjanzen"; + home.file.".wallpaper".source = ./.wallpaper; + + home.stateVersion = "24.05"; + programs.home-manager.enable = true; + } +#+end_src diff --git a/macos.local/.flake/home/fonts.nix.org b/macos.local/.flake/home/fonts.nix.org new file mode 120000 index 0000000..53bec1c --- /dev/null +++ b/macos.local/.flake/home/fonts.nix.org @@ -0,0 +1 @@ +../../../common/.flake/home/fonts.nix.org
\ No newline at end of file diff --git a/macos.local/.flake/home/programs/core.nix.org b/macos.local/.flake/home/programs/core.nix.org new file mode 100644 index 0000000..ba6818f --- /dev/null +++ b/macos.local/.flake/home/programs/core.nix.org @@ -0,0 +1,39 @@ +#+title: Core Program Configuration + +#+begin_src nix + { config, pkgs, ... }: + + { + imports = [ + ./emacs/core.nix + ./fastfetch.nix + ./git.nix + ./neovim.nix + ./zsh.nix + ]; + + home.packages = with pkgs; [ + aspell + bash-language-server + inetutils + clang-tools + cmake + cmake-language-server + eza + gcc-arm-embedded + htop + hyfetch + marksman + mpv + openocd + pinentry_mac + python312 + python312Packages.black + python312Packages.pylint + python312Packages.python-lsp-server + sqlite + texliveFull + yt-dlp + ]; + } +#+end_src diff --git a/macos.local/.flake/home/programs/emacs/core.nix.org b/macos.local/.flake/home/programs/emacs/core.nix.org new file mode 100644 index 0000000..627d725 --- /dev/null +++ b/macos.local/.flake/home/programs/emacs/core.nix.org @@ -0,0 +1,20 @@ +#+title: Emacs Configuration + +#+begin_src nix + { config, pkgs, ... }: + + { + home.file = { + "./.config/emacs/init.el".source = ./init.el; + "./.config/emacs/force-custom-file.el".source = ./force-custom-file.el; + "./.config/emacs/package-setup.el".source = ./package-setup.el; + "./.config/emacs/user-interface.el".source = ./user-interface.el; + "./.config/emacs/tools.el".source = ./tools.el; + "./.config/emacs/languages.el".source = ./languages.el; + }; + programs.emacs = { + # enable = true; + # package = pkgs.emacs-macport; + }; + } +#+end_src diff --git a/macos.local/.flake/home/programs/emacs/feed.org.org b/macos.local/.flake/home/programs/emacs/feed.org.org new file mode 120000 index 0000000..d074855 --- /dev/null +++ b/macos.local/.flake/home/programs/emacs/feed.org.org @@ -0,0 +1 @@ +../../../../../common/.config/emacs/feed.org.org
\ No newline at end of file diff --git a/macos.local/.flake/home/programs/emacs/force-custom-file.el.org b/macos.local/.flake/home/programs/emacs/force-custom-file.el.org new file mode 120000 index 0000000..06a4dc7 --- /dev/null +++ b/macos.local/.flake/home/programs/emacs/force-custom-file.el.org @@ -0,0 +1 @@ +../../../../../common/.config/emacs/force-custom-file.el.org
\ No newline at end of file diff --git a/macos.local/.flake/home/programs/emacs/init.el.org b/macos.local/.flake/home/programs/emacs/init.el.org new file mode 120000 index 0000000..6b2f721 --- /dev/null +++ b/macos.local/.flake/home/programs/emacs/init.el.org @@ -0,0 +1 @@ +../../../../../common/.config/emacs/init.el.org
\ No newline at end of file diff --git a/macos.local/.flake/home/programs/emacs/languages.el.org b/macos.local/.flake/home/programs/emacs/languages.el.org new file mode 120000 index 0000000..dd60c9f --- /dev/null +++ b/macos.local/.flake/home/programs/emacs/languages.el.org @@ -0,0 +1 @@ +../../../../../common/.config/emacs/languages.el.org
\ No newline at end of file diff --git a/macos.local/.flake/home/programs/emacs/package-setup.el.org b/macos.local/.flake/home/programs/emacs/package-setup.el.org new file mode 120000 index 0000000..c0f3ead --- /dev/null +++ b/macos.local/.flake/home/programs/emacs/package-setup.el.org @@ -0,0 +1 @@ +../../../../../common/.config/emacs/package-setup.el.org
\ No newline at end of file diff --git a/macos.local/.flake/home/programs/emacs/tools.el.org b/macos.local/.flake/home/programs/emacs/tools.el.org new file mode 120000 index 0000000..ff0296b --- /dev/null +++ b/macos.local/.flake/home/programs/emacs/tools.el.org @@ -0,0 +1 @@ +../../../../../common/.config/emacs/tools.el.org
\ No newline at end of file diff --git a/macos.local/.flake/home/programs/emacs/user-interface.el.org b/macos.local/.flake/home/programs/emacs/user-interface.el.org new file mode 120000 index 0000000..8a7f782 --- /dev/null +++ b/macos.local/.flake/home/programs/emacs/user-interface.el.org @@ -0,0 +1 @@ +../../../../../common/.config/emacs/user-interface.el.org
\ No newline at end of file diff --git a/macos.local/.flake/home/programs/fastfetch.nix.org b/macos.local/.flake/home/programs/fastfetch.nix.org new file mode 120000 index 0000000..25e2716 --- /dev/null +++ b/macos.local/.flake/home/programs/fastfetch.nix.org @@ -0,0 +1 @@ +../../../../common/.flake/home/programs/fastfetch.nix.org
\ No newline at end of file diff --git a/macos.local/.flake/home/programs/git.nix.org b/macos.local/.flake/home/programs/git.nix.org new file mode 120000 index 0000000..e8ddd28 --- /dev/null +++ b/macos.local/.flake/home/programs/git.nix.org @@ -0,0 +1 @@ +../../../../common/.flake/home/programs/git.nix.org
\ No newline at end of file diff --git a/macos.local/.flake/home/programs/neovim.nix.org b/macos.local/.flake/home/programs/neovim.nix.org new file mode 120000 index 0000000..871eafa --- /dev/null +++ b/macos.local/.flake/home/programs/neovim.nix.org @@ -0,0 +1 @@ +../../../../common/.flake/home/programs/neovim.nix.org
\ No newline at end of file diff --git a/macos.local/.flake/home/programs/zsh.nix.org b/macos.local/.flake/home/programs/zsh.nix.org new file mode 120000 index 0000000..59d4ec7 --- /dev/null +++ b/macos.local/.flake/home/programs/zsh.nix.org @@ -0,0 +1 @@ +../../../../common/.flake/home/programs/zsh.nix.org
\ No newline at end of file diff --git a/macos.local/.flake/system/core.nix.org b/macos.local/.flake/system/core.nix.org new file mode 100644 index 0000000..d38073f --- /dev/null +++ b/macos.local/.flake/system/core.nix.org @@ -0,0 +1,37 @@ +#+title: System Core + +This file imports various system configuration components in addition to enabling flakes and defining the system version. + +#+begin_src nix + { config, pkgs, ... }: + + { + environment.systemPackages = with pkgs; [ + emacs-macport + gnupg + neovim + yabai + skhd + ]; + + environment.variables.EDITOR = "nvim"; + + programs.gnupg.agent.enable = true; + + services.nix-daemon.enable = true; + nix.package = pkgs.nix; + + nix.settings.experimental-features = "nix-command flakes"; + + programs.zsh.enable = true; + + system.stateVersion = 5; + + nixpkgs.hostPlatform = "aarch64-darwin"; + + users.users.jjanzen = { + name = "jjanzen"; + home = "/Users/jjanzen"; + }; + } +#+end_src diff --git a/macos.local/.gitconfig.org.gpg b/macos.local/.gitconfig.org.gpg deleted file mode 120000 index b4b87c9..0000000 --- a/macos.local/.gitconfig.org.gpg +++ /dev/null @@ -1 +0,0 @@ -../common/.gitconfig.org.gpg
\ No newline at end of file diff --git a/macos.local/.local/share/fonts b/macos.local/.local/share/fonts deleted file mode 120000 index 9ab89c4..0000000 --- a/macos.local/.local/share/fonts +++ /dev/null @@ -1 +0,0 @@ -../../../common/.local/share/fonts
\ No newline at end of file diff --git a/macos.local/.profile.org b/macos.local/.profile.org deleted file mode 120000 index 6341fcf..0000000 --- a/macos.local/.profile.org +++ /dev/null @@ -1 +0,0 @@ -../common/.profile.org
\ No newline at end of file diff --git a/macos.local/.wallpaper b/macos.local/.wallpaper deleted file mode 120000 index ec41b94..0000000 --- a/macos.local/.wallpaper +++ /dev/null @@ -1 +0,0 @@ -../common/.wallpaper
\ No newline at end of file diff --git a/macos.local/.zshrc.org b/macos.local/.zshrc.org deleted file mode 120000 index ccbdc43..0000000 --- a/macos.local/.zshrc.org +++ /dev/null @@ -1 +0,0 @@ -../common/.zshrc.org
\ No newline at end of file |