Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions nix/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 24 additions & 14 deletions nix/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -114,19 +114,29 @@
# Expose the package set, including overlays, for convenience.
# darwinPackages = self.darwinConfigurations."robert-mbp".pkgs;

# homeConfigurations."robert" = home-manager.lib.homeManagerConfiguration {
# inherit pkgs;
#
# # Specify your home configuration modules here, for example,
# # the path to your home.nix.
# modules = [ ./home-manager/home.nix ];
#
# # Optionally use extraSpecialArgs
# # to pass through arguments to home.nix
# extraSpecialArgs = {
# isDarwin = true;
# isLinux = false;
# };
# };
# Linux configuration for Omarchy
homeConfigurations."robert@omarchy" = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs {
system = "x86_64-linux";
config = {
allowUnfree = true;
allowUnfreePredicate = pkg: true;
};
overlays = overlays;
};

# Specify your home configuration modules here
modules = [ ./home-manager/home.nix ];

# Pass through arguments to home.nix
extraSpecialArgs = {
inherit inputs;
isDarwin = false;
isLinux = true;
configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
isPersonalMac = false;
isWorkMac = false;
};
};
};
}
66 changes: 45 additions & 21 deletions nix/home-manager/home.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
{ inputs, config, pkgs, lib, isPersonalMac, isWorkMac, ... }:
let
{ inputs, config, pkgs, lib, isPersonalMac ? false, isWorkMac ? false, isDarwin ? false, isLinux ? false, ... }:
let
# Differentiating between work and personal
username = if isPersonalMac then "robert" else if isWorkMac then "robertmenke" else "";
homeDirectory = if isPersonalMac then "/Users/robert" else if isWorkMac then "/Users/robertmenke" else "";
username = if isPersonalMac then "robert"
else if isWorkMac then "robertmenke"
else if isLinux then "robert"
else "";
homeDirectory = if isPersonalMac then "/Users/robert"
else if isWorkMac then "/Users/robertmenke"
else if isLinux then "/home/robert"
else "";
in {
# Home Manager needs a bit of information about you and the paths it should
# manage.
Expand Down Expand Up @@ -66,9 +72,10 @@ in {
yazi
imagemagick
tealdeer
neofetch
fastfetch
ruby
rust-analyzer
cargo
# python package manager
uv
fzf
Expand All @@ -81,12 +88,17 @@ in {
pkgs.atuin
];

home.sessionPath = [] ++ lib.optionals pkgs.stdenv.isDarwin [
home.sessionPath = [
"$HOME/go/bin"
"$HOME/.cargo/bin"
] ++ lib.optionals pkgs.stdenv.isDarwin [
"/Applications/Ghostty.app/Contents/MacOS"
"$HOME/Applications/GoLand.app/Contents/MacOS"
"/opt/homebrew/bin"
] ++ lib.optionals isWorkMac [
"/Users/robertmenke/.dotnet/tools"
] ++ lib.optionals isLinux [
"$HOME/.local/bin"
];

xdg = {
Expand All @@ -110,6 +122,13 @@ in {
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/dotfiles/nvim";
recursive = true;
};
"alacritty.toml" = {
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/dotfiles/alacritty.toml";
};
"starship.toml" = {
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/dotfiles/starship.toml";
};
} // lib.optionalAttrs isDarwin {
yabai = {
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/dotfiles/yabai";
recursive = true;
Expand All @@ -122,12 +141,6 @@ in {
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/dotfiles/ghostty";
recursive = true;
};
"alacritty.toml" = {
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/dotfiles/alacritty.toml";
};
"starship.toml" = {
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/dotfiles/starship.toml";
};
};
};

Expand All @@ -143,15 +156,6 @@ in {
source = "${pkgs.fish}/bin/fish";
target = "${config.home.homeDirectory}/.local/bin/fish";
};
# VSCode
"settings.json" = {
source = ./../../vscode/settings.json;
target = "${config.home.homeDirectory}/Library/Application Support/Code/User/settings.json";
};
"keybindings.json" = {
source = ./../../vscode/keybindings.json;
target = "${config.home.homeDirectory}/Library/Application Support/Code/User/keybindings.json";
};
# # Building this configuration will create a copy of 'dotfiles/screenrc' in
# # the Nix store. Activating the configuration will then make '~/.screenrc' a
# # symlink to the Nix store copy.
Expand All @@ -162,6 +166,26 @@ in {
# org.gradle.console=verbose
# org.gradle.daemon.idletimeout=3600000
# '';
} // lib.optionalAttrs isDarwin {
# VSCode on macOS
"settings.json" = {
source = ./../../vscode/settings.json;
target = "${config.home.homeDirectory}/Library/Application Support/Code/User/settings.json";
};
"keybindings.json" = {
source = ./../../vscode/keybindings.json;
target = "${config.home.homeDirectory}/Library/Application Support/Code/User/keybindings.json";
};
} // lib.optionalAttrs isLinux {
# VSCode on Linux
"settings.json" = {
source = ./../../vscode/settings.json;
target = "${config.home.homeDirectory}/.config/Code/User/settings.json";
};
"keybindings.json" = {
source = ./../../vscode/keybindings.json;
target = "${config.home.homeDirectory}/.config/Code/User/keybindings.json";
};
};

# Home Manager can also manage your environment variables through
Expand Down
46 changes: 23 additions & 23 deletions nvim/lazy-lock.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
{
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
"LuaSnip": { "branch": "master", "commit": "3732756842a2f7e0e76a7b0487e9692072857277" },
"alpha-nvim": { "branch": "main", "commit": "3979b01cb05734331c7873049001d3f2bb8477f4" },
"LuaSnip": { "branch": "master", "commit": "dae4f5aaa3574bd0c2b9dd20fb9542a02c10471c" },
"alpha-nvim": { "branch": "main", "commit": "a9d8fb72213c8b461e791409e7feabb74eb6ce73" },
"auto-save.nvim": { "branch": "main", "commit": "979b6c82f60cfa80f4cf437d77446d0ded0addf0" },
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
"cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
"cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"conform.nvim": { "branch": "master", "commit": "afce105eb47b0869dfafdac90d82f02ef2419d61" },
"conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" },
"crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"fidget.nvim": { "branch": "main", "commit": "e32b672d8fd343f9d6a76944fedb8c61d7d8111a" },
"gitsigns.nvim": { "branch": "main", "commit": "cdafc320f03f2572c40ab93a4eecb733d4016d07" },
"fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" },
"gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" },
"kanagawa": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" },
"lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
"lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
"lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" },
"lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
"lspkind-nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" },
"lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "7d527c76c43f46294de9c19d39c5a86317809b4b" },
"mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
"mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" },
"mini.indentscope": { "branch": "main", "commit": "0308f949f31769e509696af5d5f91cebb2159c69" },
"mini.nvim": { "branch": "main", "commit": "6e885e4c27743ae6bf5957ea78ce86c032835f09" },
"neo-tree.nvim": { "branch": "main", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" },
"neoconf.nvim": { "branch": "main", "commit": "c417fdeb58aede4097826b3aab9aae7fac7ee758" },
"lspkind-nvim": { "branch": "master", "commit": "c7274c48137396526b59d86232eabcdc7fed8a32" },
"lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "a676ab7282da8d651e175118bcf54483ca11e46d" },
"mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" },
"mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
"mini.indentscope": { "branch": "main", "commit": "065c7713fb4cd0124fe1462f15f27feeb8b04406" },
"mini.nvim": { "branch": "main", "commit": "9990c41f10f54f29a888d13024c9f765037bde23" },
"neo-tree.nvim": { "branch": "main", "commit": "ba6871d15528e36657d19a3112cc1697c59da19a" },
"neoconf.nvim": { "branch": "main", "commit": "1a7f925b245915eaaa610c8a67525da50af8f15a" },
"neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
"neogit": { "branch": "master", "commit": "4ba620addbeeca2594c794b151e611c037973480" },
"neogit": { "branch": "master", "commit": "d3890fc3cdf0859845a86b2be306bba01458df1a" },
"noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
"nvim-bqf": { "branch": "main", "commit": "ba2b365969d7c2c6301d48e13aeee59568765529" },
"nvim-cmp": { "branch": "main", "commit": "d97d85e01339f01b842e6ec1502f639b080cb0fc" },
"nvim-lspconfig": { "branch": "master", "commit": "a2a277114dbb93e98f04b5087a9b832918b7da15" },
"nvim-bqf": { "branch": "main", "commit": "f65fba733268ffcf9c5b8ac381287eca7c223422" },
"nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" },
"nvim-lspconfig": { "branch": "master", "commit": "dc2f86d2b66a6e01a98c37cdadd3be3e90f8ab9a" },
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
"nvim-treesitter-context": { "branch": "master", "commit": "660861b1849256398f70450afdf93908d28dc945" },
"nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" },
"oil.nvim": { "branch": "master", "commit": "01cb3a8ad7d5e8707041edc775af83dbf33838f4" },
"nvim-treesitter-context": { "branch": "master", "commit": "9a8e39993e3b895601bf8227124a48ea8268149e" },
"nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" },
"oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" },
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
"rustaceanvim": { "branch": "master", "commit": "047f9c9d8cd2861745eb9de6c1570ee0875aa795" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
Expand Down