From 89fa2eea02afc4cc46f3694dea51ee1f5773e3dc Mon Sep 17 00:00:00 2001 From: irl Date: Thu, 3 Jul 2025 21:23:14 +0100 Subject: [PATCH 01/10] feat: more useful nvim --- home/irl.nix | 46 ++++++++-------------------------------------- 1 file changed, 8 insertions(+), 38 deletions(-) diff --git a/home/irl.nix b/home/irl.nix index fe7490e..1f40356 100644 --- a/home/irl.nix +++ b/home/irl.nix @@ -20,6 +20,7 @@ in age fish neofetch + nil rust-analyzer starship tree @@ -95,46 +96,15 @@ in vimdiffAlias = true; plugins = with pkgs.vimPlugins; [ bufferline-nvim - nvim-lspconfig - nvim-treesitter.withAllGrammars + lualine-nvim + nvim-lspconfig + nvim-web-devicons ]; extraLuaConfig = '' - vim.lsp.config('rust_analyzer', { - settings = { - ['rust-analyzer'] = {}, - }, - }) - vim.api.nvim_create_autocmd('LspAttach', { - group = vim.api.nvim_create_augroup('my.lsp', {}), - callback = function(args) - local client = assert(vim.lsp.get_client_by_id(args.data.client_id)) - if client:supports_method('textDocument/implementation') then - -- Create a keymap for vim.lsp.buf.implementation ... - end - - -- Enable auto-completion. Note: Use CTRL-Y to select an item. |complete_CTRL-Y| - if client:supports_method('textDocument/completion') then - -- Optional: trigger autocompletion on EVERY keypress. May be slow! - -- local chars = {}; for i = 32, 126 do table.insert(chars, string.char(i)) end - -- client.server_capabilities.completionProvider.triggerCharacters = chars - - vim.lsp.completion.enable(true, client.id, args.buf, {autotrigger = true}) - end - - -- Auto-format ("lint") on save. - -- Usually not needed if server supports "textDocument/willSaveWaitUntil". - if not client:supports_method('textDocument/willSaveWaitUntil') - and client:supports_method('textDocument/formatting') then - vim.api.nvim_create_autocmd('BufWritePre', { - group = vim.api.nvim_create_augroup('my.lsp', {clear=false}), - buffer = args.buf, - callback = function() - vim.lsp.buf.format({ bufnr = args.buf, id = client.id, timeout_ms = 1000 }) - end, - }) - end - end, - }) + vim.opt.termguicolors = true + require("bufferline").setup{} + require('lualine').setup{} + vim.lsp.enable("nil") ''; }; programs.starship = { From a3c711254996790ed0d5e630d1962948b47aab15 Mon Sep 17 00:00:00 2001 From: irl Date: Thu, 3 Jul 2025 21:26:07 +0100 Subject: [PATCH 02/10] feat: install element-desktop --- home/irl.nix | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/home/irl.nix b/home/irl.nix index 1f40356..d784587 100644 --- a/home/irl.nix +++ b/home/irl.nix @@ -16,15 +16,20 @@ in home.homeDirectory = if lib.strings.hasSuffix "darwin" pkgs.system then "/Users/irl" else "/home/irl"; home.stateVersion = "25.05"; - home.packages = with pkgs; [ - age - fish - neofetch - nil - rust-analyzer - starship - tree - ]; + home.packages = + with pkgs; + [ + age + fish + neofetch + nil + rust-analyzer + starship + tree + ] + ++ lib.optionals cfg.gui-packages [ + element-desktop + ]; home.shellAliases = { hms = "home-manager switch --flake ~/.config/nix-configs#irl" From ea6e162cabfc2b391db53f0e3dbdf246775e7020 Mon Sep 17 00:00:00 2001 From: irl Date: Thu, 3 Jul 2025 21:26:21 +0100 Subject: [PATCH 03/10] feat: recap firefox extension --- home/irl.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/irl.nix b/home/irl.nix index d784587..0ad3fd3 100644 --- a/home/irl.nix +++ b/home/irl.nix @@ -55,6 +55,7 @@ in bitwarden kagi-search privacy-badger + recap ]; }; settings = { From 005ffbf6a635288571a8e5edd4e1268f800ae41f Mon Sep 17 00:00:00 2001 From: irl Date: Thu, 3 Jul 2025 21:28:53 +0100 Subject: [PATCH 04/10] lint: fmt nvim config --- home/irl.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/home/irl.nix b/home/irl.nix index 0ad3fd3..b57ea23 100644 --- a/home/irl.nix +++ b/home/irl.nix @@ -102,15 +102,15 @@ in vimdiffAlias = true; plugins = with pkgs.vimPlugins; [ bufferline-nvim - lualine-nvim - nvim-lspconfig - nvim-web-devicons + lualine-nvim + nvim-lspconfig + nvim-web-devicons ]; extraLuaConfig = '' vim.opt.termguicolors = true require("bufferline").setup{} - require('lualine').setup{} - vim.lsp.enable("nil") + require('lualine').setup{} + vim.lsp.enable("nil") ''; }; programs.starship = { From 6befd7d922abbc7e5d3ef3d3a6eeb70ad674f466 Mon Sep 17 00:00:00 2001 From: irl Date: Thu, 3 Jul 2025 21:29:07 +0100 Subject: [PATCH 05/10] lint: remove unused config --- home/irl.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/home/irl.nix b/home/irl.nix index b57ea23..274f0f6 100644 --- a/home/irl.nix +++ b/home/irl.nix @@ -119,7 +119,5 @@ in enableInteractive = true; enableTransience = true; }; - programs.zellij.enable = true; - services.ssh-agent.enable = true; }; } From 0e8d08d0c5f301bedfc48c72ad6e0ec1c5c59d45 Mon Sep 17 00:00:00 2001 From: irl Date: Thu, 3 Jul 2025 21:31:06 +0100 Subject: [PATCH 06/10] feat: initial darwin config --- darwin/common.nix | 63 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 darwin/common.nix diff --git a/darwin/common.nix b/darwin/common.nix new file mode 100644 index 0000000..db6675c --- /dev/null +++ b/darwin/common.nix @@ -0,0 +1,63 @@ +{ + pkgs, + lib, + nix-darwin, + ... +}: +{ + environment.systemPackages = with pkgs; [ + discord + home-manager + jetbrains.clion + jetbrains.idea-ultimate + jetbrains.pycharm-professional + jetbrains.webstorm + ]; + + environment.darwinConfig = "/Users/irl/.config/nix-configs"; + + nix = { + package = pkgs.nix; + settings = { + "extra-experimental-features" = [ + "nix-command" + "flakes" + ]; + }; + }; + + nixpkgs.config.allowUnfreePredicate = + pkg: + builtins.elem (lib.getName pkg) [ + "clion" + "discord" + "idea-ultimate" + "pycharm-professional" + "webstorm" + ]; + + homebrew = { + enable = true; + + casks = [ + "affinity-designer" + "affinity-photo" + "affinity-publisher" + "fantastical" + "ghostty" + "notion" + "obsidian" + "tor-browser" + "vlc" + ]; + + masApps = { + "Things" = 904280696; + }; + }; + + system = { + primaryUser = "irl"; + stateVersion = 6; + }; +} From ed0b0480e68f083901c73663c330d5f812d11fa1 Mon Sep 17 00:00:00 2001 From: irl Date: Thu, 3 Jul 2025 21:33:22 +0100 Subject: [PATCH 07/10] feat: switch formatter to nixfmt-tree --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index aa859b4..315b0c5 100644 --- a/flake.nix +++ b/flake.nix @@ -89,6 +89,6 @@ ) { } supportedSystems; } // flake-utils.lib.eachSystem supportedSystems (system: { - formatter = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style; + formatter = nixpkgs.legacyPackages.${system}.nixfmt-tree; }); } From 442c9051ba1f7c05f71af8be92ff0dc843398158 Mon Sep 17 00:00:00 2001 From: irl Date: Thu, 3 Jul 2025 21:33:50 +0100 Subject: [PATCH 08/10] feat: add darwin config to flake --- flake.lock | 46 ++++++++++++++++++++++++++++++++++------------ flake.nix | 21 ++++++++++++++++++--- 2 files changed, 52 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 6331e3b..5f70800 100644 --- a/flake.lock +++ b/flake.lock @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1749131129, - "narHash": "sha256-tJ+93i7N4QttM75bE8T09LlSU3Mv6Dfi9WaVBvlWilo=", + "lastModified": 1751569544, + "narHash": "sha256-iWjzNHaSU+pm4TS/vzkzgBdbTwkyHy8Jc6PlcrgdgyU=", "owner": "nix-community", "repo": "home-manager", - "rev": "13a45ede6c17b5e923dfc18a40a3f646436f4809", + "rev": "28639e6470ef597fe9f5efc4c6594306859d62ed", "type": "github" }, "original": { @@ -95,13 +95,34 @@ "type": "github" } }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1751313918, + "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=", + "owner": "nix-darwin", + "repo": "nix-darwin", + "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf", + "type": "github" + }, + "original": { + "owner": "nix-darwin", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1749145035, - "narHash": "sha256-7hU9TqHpz3BhcgoP3J/udnvZ3QCurGEBD+ERhvKbJEE=", + "lastModified": 1751571573, + "narHash": "sha256-vyhLXk2EsyTSxZ8cETmAAUF/fp8hQ3lZ6fUC0p6+LsY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a537c74d1071ca48aa835f731998094a4058a6f3", + "rev": "e50e2a177e0aaa0fd02c10fa365252f91b50cbf4", "type": "github" }, "original": { @@ -135,11 +156,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1749201010, - "narHash": "sha256-haiPLogZwEFQTrIarZD92LUK7ScIcMbtEzPlcC988Qk=", + "lastModified": 1751571902, + "narHash": "sha256-5EimK/KBs+UHVC3d9L1oagFWIzOlU2lOq0eI5kOTTWI=", "owner": "nix-community", "repo": "NUR", - "rev": "17efc5275a8f21e2b48f39ecade74cdaff3ba411", + "rev": "b19bd45d58ab88e1700cc3032139676fae7f3ea1", "type": "github" }, "original": { @@ -153,6 +174,7 @@ "apple-silicon": "apple-silicon", "flake-utils": "flake-utils", "home-manager": "home-manager", + "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs", "nur": "nur", "sops-nix": "sops-nix" @@ -163,11 +185,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1749592509, - "narHash": "sha256-VunQzfZFA+Y6x3wYi2UE4DEQ8qKoAZZCnZPUlSoqC+A=", + "lastModified": 1750119275, + "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=", "owner": "mic92", "repo": "sops-nix", - "rev": "50754dfaa0e24e313c626900d44ef431f3210138", + "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 315b0c5..7f4f41c 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,10 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-darwin = { + url = "github:nix-darwin/nix-darwin/master"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nur = { url = "github:nix-community/NUR"; inputs.nixpkgs.follows = "nixpkgs"; @@ -23,13 +27,14 @@ }; outputs = { + self, nixpkgs, apple-silicon, flake-utils, home-manager, + nix-darwin, nur, sops-nix, - ... }@inputs: let supportedSystems = [ @@ -72,7 +77,9 @@ pkgs = import nixpkgs { inherit system overlays; }; - modules = [ ./home/irl.nix ]; + modules = [ + ./home/irl.nix + ]; }; "irl-gui-${system}" = home-manager.lib.homeManagerConfiguration { pkgs = import nixpkgs { @@ -90,5 +97,13 @@ } // flake-utils.lib.eachSystem supportedSystems (system: { formatter = nixpkgs.legacyPackages.${system}.nixfmt-tree; - }); + }) + // { + darwinConfigurations."irl-mac-mini" = nix-darwin.lib.darwinSystem { + system = "aarch64-darwin"; + modules = [ + ./darwin/common.nix + ]; + }; + }; } From fca82b60ce2dd1e4bf6e4d6d76f7ddf7cc190121 Mon Sep 17 00:00:00 2001 From: irl Date: Sun, 6 Jul 2025 21:49:22 +0100 Subject: [PATCH 09/10] feat: refactor home-manager configs --- flake.nix | 52 +++++----- home-manager/irl.nix | 40 ++++++++ home/irl.nix | 123 ----------------------- modules/home-manager/cli/cli.nix | 70 +++++++++++++ modules/home-manager/cli/starship.toml | 9 ++ modules/home-manager/default.nix | 8 ++ modules/home-manager/firefox/firefox.nix | 47 +++++++++ modules/home-manager/git/git.nix | 41 ++++++++ modules/home-manager/ops/ops.nix | 22 ++++ modules/home-manager/tmux/tmux.conf | 0 modules/home-manager/tmux/tmux.nix | 25 +++++ modules/home-manager/vim/init.lua | 29 ++++++ modules/home-manager/vim/vim.nix | 39 +++++++ 13 files changed, 355 insertions(+), 150 deletions(-) create mode 100644 home-manager/irl.nix delete mode 100644 home/irl.nix create mode 100644 modules/home-manager/cli/cli.nix create mode 100644 modules/home-manager/cli/starship.toml create mode 100644 modules/home-manager/default.nix create mode 100644 modules/home-manager/firefox/firefox.nix create mode 100644 modules/home-manager/git/git.nix create mode 100644 modules/home-manager/ops/ops.nix create mode 100644 modules/home-manager/tmux/tmux.conf create mode 100644 modules/home-manager/tmux/tmux.nix create mode 100644 modules/home-manager/vim/init.lua create mode 100644 modules/home-manager/vim/vim.nix diff --git a/flake.nix b/flake.nix index 7f4f41c..9688c4b 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,5 @@ { description = "I have no idea what I'm doing"; - inputs = { nixpkgs.url = "github:nixos/nixpkgs"; apple-silicon = { @@ -27,26 +26,31 @@ }; outputs = { - self, - nixpkgs, apple-silicon, flake-utils, home-manager, nix-darwin, + nixpkgs, nur, + self, sops-nix, }@inputs: let + homeRoles = [ + "desktop" + "minimal" + "server" + ]; + outputs = inputs.self; + overlays = [ + apple-silicon.overlays.apple-silicon-overlay + nur.overlays.default + ]; supportedSystems = [ "x86_64-linux" "aarch64-darwin" "aarch64-linux" ]; - forAllSystems = nixpkgs.lib.genAttrs supportedSystems; - overlays = [ - apple-silicon.overlays.apple-silicon-overlay - nur.overlays.default - ]; in { nixosConfigurations = { @@ -69,31 +73,24 @@ specialArgs = inputs; }; }; - homeConfigurations = nixpkgs.lib.foldl' ( - acc: system: - acc - // { - "irl-${system}" = home-manager.lib.homeManagerConfiguration { + homeManagerModules = import ./modules/home-manager; + homeConfigurations = nixpkgs.lib.foldl' (c: e: + c // { + "irl-${e.role}-${e.system}" = home-manager.lib.homeManagerConfiguration { pkgs = import nixpkgs { - inherit system overlays; + inherit overlays; + system = e.system; + }; + extraSpecialArgs = { + inherit outputs; }; modules = [ - ./home/irl.nix - ]; - }; - "irl-gui-${system}" = home-manager.lib.homeManagerConfiguration { - pkgs = import nixpkgs { - inherit system overlays; - }; - modules = [ - ./home/irl.nix - { - irl.gui-packages = true; - } + ./home-manager/irl.nix + { role = "${e.role}"; } ]; }; } - ) { } supportedSystems; + ) { } (nixpkgs.lib.cartesianProduct { role = homeRoles; system = supportedSystems; }); } // flake-utils.lib.eachSystem supportedSystems (system: { formatter = nixpkgs.legacyPackages.${system}.nixfmt-tree; @@ -103,6 +100,7 @@ system = "aarch64-darwin"; modules = [ ./darwin/common.nix + ./darwin/irl-mac-mini.nix ]; }; }; diff --git a/home-manager/irl.nix b/home-manager/irl.nix new file mode 100644 index 0000000..4e31fe9 --- /dev/null +++ b/home-manager/irl.nix @@ -0,0 +1,40 @@ +{ + config, + lib, + outputs, + pkgs, + ... +}: +{ + imports = builtins.attrValues outputs.homeManagerModules; + + options.role = lib.mkOption { + description = "Home role to set up"; + default = "minimal"; + type = with lib.types; enum ["desktop" "minimal" "server"]; + }; + + config = { + feature.cli.enable = builtins.elem config.role ["desktop" "minimal" "server"]; + feature.firefox.enable = config.role == "desktop"; + feature.git.enable = builtins.elem config.role ["desktop" "server"]; + feature.ops.enable = config.role == "desktop"; + feature.tmux.enable = builtins.elem config.role ["desktop" "server"]; + feature.vim.enable = builtins.elem config.role ["desktop" "minimal" "server"]; + + home.username = "irl"; + home.homeDirectory = + if lib.strings.hasSuffix "darwin" pkgs.system then "/Users/irl" else "/home/irl"; + home.packages = with pkgs; [ + neofetch + ]; + home.shellAliases = { + hms = + "home-manager switch --flake ~/.config/nix-configs#irl-${config.role}-${pkgs.system}"; + drs = "sudo darwin-rebuild switch --flake ~/.config/nix-configs"; + }; + home.stateVersion = "25.05"; + + programs.home-manager.enable = true; + }; +} diff --git a/home/irl.nix b/home/irl.nix deleted file mode 100644 index 274f0f6..0000000 --- a/home/irl.nix +++ /dev/null @@ -1,123 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: - -let - cfg = config.irl; -in -{ - options.irl.gui-packages = lib.mkEnableOption "GUI packages managed by home-manager"; - - config = { - home.username = "irl"; - home.homeDirectory = - if lib.strings.hasSuffix "darwin" pkgs.system then "/Users/irl" else "/home/irl"; - home.stateVersion = "25.05"; - home.packages = - with pkgs; - [ - age - fish - neofetch - nil - rust-analyzer - starship - tree - ] - ++ lib.optionals cfg.gui-packages [ - element-desktop - ]; - home.shellAliases = { - hms = - "home-manager switch --flake ~/.config/nix-configs#irl" - + (if cfg.gui-packages then "-gui" else "") - + "-${pkgs.system}"; - }; - programs.bash = { - enable = true; - initExtra = '' - if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] - then - shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" - exec ${pkgs.fish}/bin/fish $LOGIN_OPTION - fi - ''; - }; - programs.firefox = lib.mkIf cfg.gui-packages { - enable = true; - profiles.irl = { - extensions = { - force = true; - packages = with pkgs.nur.repos.rycee.firefox-addons; [ - bitwarden - kagi-search - privacy-badger - recap - ]; - }; - settings = { - "extensions.autoDisableScope" = 0; - }; - }; - }; - programs.fish.enable = true; - programs.fzf = { - enable = true; - enableFishIntegration = true; - }; - programs.git = { - delta.enable = true; - enable = true; - extraConfig = { - diff = { - algorithm = "histogram"; - }; - init = { - defaultBranch = "main"; - }; - rebase = { - autosquash = true; - autostash = true; - }; - url = { - "git@github.com:".pushInsteadOf = "https://github.com/"; - "git@gitlab.com:".pushInsteadOf = "https://gitlab.com/"; - "git@guardianproject.dev:".pushInsteadOf = "https://guardianproject.dev/"; - }; - user = { - name = "irl"; - email = "iain@learmonth.me"; - }; - }; - }; - programs.home-manager.enable = true; - programs.neovim = { - defaultEditor = true; - enable = true; - viAlias = true; - vimAlias = true; - vimdiffAlias = true; - plugins = with pkgs.vimPlugins; [ - bufferline-nvim - lualine-nvim - nvim-lspconfig - nvim-web-devicons - ]; - extraLuaConfig = '' - vim.opt.termguicolors = true - require("bufferline").setup{} - require('lualine').setup{} - vim.lsp.enable("nil") - ''; - }; - programs.starship = { - enable = true; - enableFishIntegration = true; - enableInteractive = true; - enableTransience = true; - }; - }; -} diff --git a/modules/home-manager/cli/cli.nix b/modules/home-manager/cli/cli.nix new file mode 100644 index 0000000..d472f21 --- /dev/null +++ b/modules/home-manager/cli/cli.nix @@ -0,0 +1,70 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.feature.cli; +in +{ + options.feature.cli = { + enable = lib.mkEnableOption "Set up the CLI"; + }; + + config = lib.mkIf cfg.enable { + home.packages = with pkgs; [ + starship + tree + ]; + + programs.fish = { + enable = true; + functions.fish_greeting = ""; + shellInitLast = lib.mkIf (lib.strings.hasSuffix "darwin" pkgs.system) '' + eval $(/opt/homebrew/bin/brew shellenv) + ''; + }; + + programs.fzf = { + enable = true; + enableFishIntegration = true; + }; + + programs.zsh = lib.mkIf (lib.strings.hasSuffix "darwin" pkgs.system) { + enable = true; + + # zsh is a POSIX compliant shell and a safe default, but if it's an interactive + # shell and fish is not in the parent processes (i.e. I'm not deliberately starting + # zsh to use interactively from fish) then just launch fish. + initContent = '' + [[ $- == *i* ]] || return + + is_parent_fish() { + local ppid=$$ + while [[ $ppid -ne 1 ]]; do + local ppname=$(ps -p $ppid -o comm=) + if [[ "$ppname" == *fish* ]]; then + return 1 + fi + ppid=$(ps -o ppid= -p $ppid) + done + return 0 + } + + if is_parent_fish + then + exec fish -l + fi + ''; + }; + + programs.starship = { + enable = true; + enableFishIntegration = true; + enableInteractive = true; + enableTransience = true; + settings = builtins.fromTOML (builtins.readFile ./starship.toml); + }; + }; +} diff --git a/modules/home-manager/cli/starship.toml b/modules/home-manager/cli/starship.toml new file mode 100644 index 0000000..9f58605 --- /dev/null +++ b/modules/home-manager/cli/starship.toml @@ -0,0 +1,9 @@ +[shell] +disabled = false +format = '[$indicator]($style)' +fish_indicator = '' +zsh_indicator = 'z' + +[sudo] +disabled = false + diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix new file mode 100644 index 0000000..dca2898 --- /dev/null +++ b/modules/home-manager/default.nix @@ -0,0 +1,8 @@ +{ + cli = import ./cli/cli.nix; + firefox = import ./firefox/firefox.nix; + git = import ./git/git.nix; + ops = import ./ops/ops.nix; + tmux = import ./tmux/tmux.nix; + vim = import ./vim/vim.nix; +} diff --git a/modules/home-manager/firefox/firefox.nix b/modules/home-manager/firefox/firefox.nix new file mode 100644 index 0000000..f71e876 --- /dev/null +++ b/modules/home-manager/firefox/firefox.nix @@ -0,0 +1,47 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.feature.firefox; +in +{ + options.feature.firefox = { + enable = lib.mkEnableOption "Set up firefox"; + }; + + config = lib.mkIf cfg.enable { + programs.firefox = { + enable = true; + + # Firefox is expected to be installed as a system package + package = null; + + profiles.irl = { + extensions = { + force = true; + packages = with pkgs.nur.repos.rycee.firefox-addons; [ + bitwarden + kagi-search + privacy-badger + recap + ]; + }; + settings = { + "browser.newtabpage.activity-stream.discoverystream.sendToPocket.enabled" = false; + "browser.newtabpage.activity-stream.feeds.section.topstories" = false; + "browser.newtabpage.activity-stream.showSponsored" = false; + "browser.newtabpage.activity-stream.showSponsoredCheckboxes" = false; + "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; + "browser.search.suggest.enabled.private" = false; + "datareporting.policy.firstRunURL" = "https://irl.xyz/"; + "extensions.autoDisableScope" = 0; + "extensions.pocket.enabled" = false; + "identity.fxaccounts.enabled" = false; + }; + }; + }; + }; +} diff --git a/modules/home-manager/git/git.nix b/modules/home-manager/git/git.nix new file mode 100644 index 0000000..dca5e91 --- /dev/null +++ b/modules/home-manager/git/git.nix @@ -0,0 +1,41 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.feature.git; +in +{ + options.feature.git.enable = lib.mkEnableOption "Set up git"; + + config = { + programs.git = { + delta.enable = true; + enable = true; + extraConfig = { + diff = { + algorithm = "histogram"; + }; + init = { + defaultBranch = "main"; + }; + rebase = { + autosquash = true; + autostash = true; + }; + url = { + "git@github.com:".pushInsteadOf = "https://github.com/"; + "git@gitlab.com:".pushInsteadOf = "https://gitlab.com/"; + "git@guardianproject.dev:".pushInsteadOf = "https://guardianproject.dev/"; + }; + user = { + name = "irl"; + email = "iain@learmonth.me"; + }; + }; + }; + }; +} diff --git a/modules/home-manager/ops/ops.nix b/modules/home-manager/ops/ops.nix new file mode 100644 index 0000000..b6eb711 --- /dev/null +++ b/modules/home-manager/ops/ops.nix @@ -0,0 +1,22 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.feature.ops; +in +{ + options.feature.ops = { + enable = lib.mkEnableOption "Setup DevOps tools"; + }; + + config = lib.mkIf cfg.enable { + home.packages = with pkgs; [ + age + awscli2 + opentofu + ]; + }; +} diff --git a/modules/home-manager/tmux/tmux.conf b/modules/home-manager/tmux/tmux.conf new file mode 100644 index 0000000..e69de29 diff --git a/modules/home-manager/tmux/tmux.nix b/modules/home-manager/tmux/tmux.nix new file mode 100644 index 0000000..8f5bdfe --- /dev/null +++ b/modules/home-manager/tmux/tmux.nix @@ -0,0 +1,25 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.feature.tmux; +in +{ + options.feature.tmux = { + enable = lib.mkEnableOption "Set up tmux"; + }; + + config = lib.mkIf cfg.enable { + programs.tmux = { + enable = true; + baseIndex = 1; + plugins = with pkgs.tmuxPlugins; [ + catppuccin + ]; + extraConfig = builtins.readFile ./tmux.conf; + }; + }; +} diff --git a/modules/home-manager/vim/init.lua b/modules/home-manager/vim/init.lua new file mode 100644 index 0000000..e6283c7 --- /dev/null +++ b/modules/home-manager/vim/init.lua @@ -0,0 +1,29 @@ +-- Global settings +vim.g.loaded_netrw = 1 +vim.g.loaded_netrwPlugin = 1 +vim.g.mapleader = " " + +vim.opt.termguicolors = true +vim.opt.expandtab = true + +vim.cmd.colorscheme "catppuccin" + +-- Custom bindings +vim.keymap.set("n", "n", "bn", { noremap = true, silent = true }) +vim.keymap.set("n", "p", "bp", { noremap = true, silent = true }) + +-- Bufferline (tabs) +require("bufferline").setup{} + +-- Lualine (status line) +require("lualine").setup{} + +-- Telescope (anything search) +vim.keymap.set("n", "b", "Telescope buffers", { noremap = true, silent = true }) +vim.keymap.set("n", "f", "Telescope find_files", { noremap = true, silent = true }) + +-- lspconfig (LSPs) +vim.lsp.enable("nil") +vim.lsp.enable("pyright") +vim.lsp.enable("rust-analyzer") + diff --git a/modules/home-manager/vim/vim.nix b/modules/home-manager/vim/vim.nix new file mode 100644 index 0000000..20a34a9 --- /dev/null +++ b/modules/home-manager/vim/vim.nix @@ -0,0 +1,39 @@ +{ + config, + pkgs, + lib, + ... +}: +let + cfg = config.feature.vim; +in +{ + options.feature.vim = { + enable = lib.mkEnableOption "Set up neovim"; + }; + + config = lib.mkIf cfg.enable { + home.packages = with pkgs; [ + nil + pyright + rust-analyzer + ]; + + programs.neovim = { + defaultEditor = true; + enable = true; + viAlias = true; + vimAlias = true; + vimdiffAlias = true; + plugins = with pkgs.vimPlugins; [ + bufferline-nvim + catppuccin-nvim + lualine-nvim + nvim-lspconfig + telescope-nvim + nvim-web-devicons + ]; + extraLuaConfig = builtins.readFile ./init.lua; + }; + }; +} From c4ad7204927e968a6350e2ec4c54d7b1ae7ffb56 Mon Sep 17 00:00:00 2001 From: irl Date: Sun, 6 Jul 2025 22:54:49 +0100 Subject: [PATCH 10/10] feat: darwin system apps and sk ssh keys working --- darwin/common.nix | 67 +++++++++++++++++++++++++++++++++++++++-- darwin/irl-mac-mini.nix | 7 +++++ 2 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 darwin/irl-mac-mini.nix diff --git a/darwin/common.nix b/darwin/common.nix index db6675c..6e1a75a 100644 --- a/darwin/common.nix +++ b/darwin/common.nix @@ -6,7 +6,6 @@ }: { environment.systemPackages = with pkgs; [ - discord home-manager jetbrains.clion jetbrains.idea-ultimate @@ -30,7 +29,6 @@ pkg: builtins.elem (lib.getName pkg) [ "clion" - "discord" "idea-ultimate" "pycharm-professional" "webstorm" @@ -39,11 +37,27 @@ homebrew = { enable = true; + onActivation = { + autoUpdate = true; + cleanup = "zap"; + }; + + brews = [ + "libfido2" + "mas" + "openssh" + "theseal/ssh-askpass/ssh-askpass" + ]; + casks = [ "affinity-designer" "affinity-photo" "affinity-publisher" + "audacity" + "discord" + "element" "fantastical" + "firefox" "ghostty" "notion" "obsidian" @@ -54,10 +68,59 @@ masApps = { "Things" = 904280696; }; + + taps = [ + "theseal/ssh-askpass" + ]; + }; + + programs = { + # TODO: rewrite in fish maybe + zsh.shellInit = '' + export SSH_ASKPASS=/opt/homebrew/bin/ssh-askpass + export SSH_ASKPASS_REQUIRE=force + + checkSSHAgent() { + if [ "$1" = "-k" ] ; then + pkill -9 ssh-agent + fi + + ssh_agent_conf="$HOME/.ssh/agent" + if [ -e "$ssh_agent_conf" ] ; then + . "$ssh_agent_conf" + fi + if ! ps aux | awk '{print $2}' | grep -q "$SSH_AGENT_PID" \ + || ! [ -e "$ssh_agent_conf" ] \ + || [ -z "$SSH_AGENT_PID" ] ; \ + then + ssh-agent -s | grep -v echo > "$ssh_agent_conf" + . "$ssh_agent_conf" + fi + } + + checkSSHAgent + ''; }; system = { + defaults.NSGlobalDomain = { + "com.apple.swipescrolldirection" = false; + }; primaryUser = "irl"; stateVersion = 6; }; + + users.users = { + irl = { + description = "irl"; + home = "/Users/irl"; + name = "irl"; + + # This is the macOS zsh, not from nix! + # My home-manager configuration contains some zshrc to automatically + # start fish for interactive shells where the parent process is not + # already fish. + shell = "/bin/zsh"; + }; + }; } diff --git a/darwin/irl-mac-mini.nix b/darwin/irl-mac-mini.nix new file mode 100644 index 0000000..1601199 --- /dev/null +++ b/darwin/irl-mac-mini.nix @@ -0,0 +1,7 @@ +{ + lib, + ... +}: +{ + networking.hostName = "irl-mac-mini"; +}