From 9075dae48775287fd673151c3c09a944ec592131 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Fri, 7 Jun 2024 14:43:10 -0400 Subject: [PATCH 1/2] Add a trimmed down version of my flake.nix This is useful for showing others how my flake is structured. --- examples/flake-structure.nix | 49 ++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 examples/flake-structure.nix diff --git a/examples/flake-structure.nix b/examples/flake-structure.nix new file mode 100644 index 0000000..a24ec94 --- /dev/null +++ b/examples/flake-structure.nix @@ -0,0 +1,49 @@ +{ + inputs = {}; + outputs = inputs@{}: let + darwinHostConfig = { system, hostname, username, additionalModules, additionalSpecialArgs }: + nix-darwin.lib.darwinSystem { }; + + nixosHostConfig = { system, hostname, username, additionalModules, additionalSpecialArgs }: + nixpkgs.lib.nixosSystem { }; + + linuxHomeConfig = { system, hostname, username, additionalModules, additionalSpecialArgs }: + home-manager.lib.homeManagerConfiguration { }; + + in { + # Darwin (macOS) hosts + darwinConfigurations = { + mightymac = darwinHostConfig { + system = "aarch64-darwin"; + hostname = "mightymac"; + username = "gene.liverman"; + additionalModules = []; + additionalSpecialArgs = {}; + }; + }; + + # NixOS hosts + nixosConfigurations = { + rainbow-planet = nixosHostConfig { + system = "x86_64-linux"; + hostname = "rainbow-planet"; + username = "gene"; + additionalModules = [ + nixos-hardware.nixosModules.dell-xps-13-9360 + ]; + additionalSpecialArgs = {}; + }; + }; + + # Home Manager (only) users + homeConfigurations = { + gene = linuxHomeConfig { + system = "x86_64-linux"; + hostname = "mini-watcher"; + username = "gene"; + additionalModules = []; + additionalSpecialArgs = {}; + }; + }; + }; +} \ No newline at end of file From 04f2d7627def41e62c8103f7c51c47483c1c7e93 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Fri, 7 Jun 2024 14:44:17 -0400 Subject: [PATCH 2/2] Add gitsigns and vim-fugitive to neovim --- .../files/nvim/lua/plugins/git-stuff.lua | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 modules/home-manager/files/nvim/lua/plugins/git-stuff.lua diff --git a/modules/home-manager/files/nvim/lua/plugins/git-stuff.lua b/modules/home-manager/files/nvim/lua/plugins/git-stuff.lua new file mode 100644 index 0000000..8a35077 --- /dev/null +++ b/modules/home-manager/files/nvim/lua/plugins/git-stuff.lua @@ -0,0 +1,15 @@ +return { + { + "lewis6991/gitsigns.nvim", + config = function() + require("gitsigns").setup({ + current_line_blame = true, + }) + + vim.keymap.set("n", "", {}) + end, + }, + { + "tpope/vim-fugitive", + }, +}