-13

flake.nix

reviewed

··· 69 69 (import ./hosts/supadupa.nix {inherit inputs;}) 70 70 .system; 71 71 72 72 - homeConfigurations."hauleth" = 73 73 - (import ./users/hauleth.nix {inherit inputs;}) 74 74 - .home; 75 75 - 76 72 templates = { 77 73 elixir = { 78 74 path = ./templates/elixir; ··· 96 92 // { 97 93 default = pkgs.writeScriptBin "activate" '' 98 94 #!/bin/sh 99 99 - echo ========= System ========= 100 95 ${pkgs.lib.getExe self'.packages.system} switch 101 101 - echo 102 102 - echo ========= Home ========= 103 103 - ${pkgs.lib.getExe self'.packages.home} switch 104 104 - ''; 105 105 - 106 106 - home = pkgs.writeScriptBin "activate-home" '' 107 107 - #!/bin/sh 108 108 - exec ${pkgs.lib.getExe inputs'.home-manager.packages.default} --flake "${self}" "$@" 109 96 ''; 110 97 111 98 system = let

+6 -2

hosts/modules/builders.nix

reviewed

··· 1 1 - {pkgs, inputs, ...}: let 1 1 + { 2 2 + pkgs, 3 3 + inputs, 4 4 + ... 5 5 + }: let 2 6 pkgs-stable = inputs.darwin-stable.legacyPackages.${pkgs.stdenv.hostPlatform.system}; 3 7 in { 4 8 nix.linux-builder = { ··· 9 13 config = { 10 14 virtualisation = { 11 15 darwin-builder = { 12 12 - # diskSize = 20 * 1024; 16 16 + # diskSize = 20 * 1024; 13 17 memorySize = 4 * 1024; 14 18 }; 15 19 cores = 4;

+7

hosts/niuniobook.nix

reviewed

··· 23 23 } 24 24 inputs.lix-module.nixosModules.default 25 25 inputs.home-manager.darwinModules.home-manager 26 26 + { 27 27 + users.users.hauleth.home = "/Users/hauleth"; 28 28 + home-manager.useGlobalPkgs = true; 29 29 + home-manager.useUserPackages = true; 30 30 + home-manager.users.hauleth = import ../users/hauleth.nix; 31 31 + home-manager.extraSpecialArgs = {inherit inputs;}; 32 32 + } 26 33 ]; 27 34 28 35 inherit inputs;

+1 -1

lib.nix

reviewed

··· 7 7 in 8 8 builtins.filter notComment (lib.strings.splitString "\n" content); 9 9 10 10 - dontCheck = drv: drv.overrideAttrs { doCheck = false; }; 10 10 + dontCheck = drv: drv.overrideAttrs {doCheck = false;}; 11 11 in { 12 12 inherit readFileWithComments dontCheck; 13 13 }

+2 -3

modules/curl.nix

reviewed

··· 8 8 target = ".curlrc"; 9 9 10 10 text = '' 11 11 - silent=true 12 12 - 13 13 - netrc-optional 11 11 + netrc 12 12 + netrc-file = "/User/hauleth/.netrc.fix" 14 13 ''; 15 14 }; 16 15 }

+5 -1

modules/darwin.nix

reviewed

··· 1 1 - {pkgs, inputs, ...}: { 1 1 + { 2 2 + pkgs, 3 3 + inputs, 4 4 + ... 5 5 + }: { 2 6 nix.settings.extra-sandbox-paths = [ 3 7 "/System/Library/Frameworks" 4 8 "/System/Library/PrivateFrameworks"

+5 -1

modules/ghostty.nix

reviewed

··· 1 1 - {config, lib, ...}: { 1 1 + { 2 2 + config, 3 3 + lib, 4 4 + ... 5 5 + }: { 2 6 programs.ghostty = { 3 7 enable = true; 4 8 package = null; # Set explicitly to null, as it is managed externally

-1

modules/nvim.nix

reviewed

··· 15 15 lua << EOF 16 16 vim.g.lsp_paths = { 17 17 ['lexical'] = "${pkgs.lexical}/bin/lexical", 18 18 - ['nixd'] = "${pkgs.nixd}/bin/nixd", 19 18 ['typos_lsp'] = "${pkgs.typos-lsp}/bin/typos-lsp" 20 19 } 21 20 package.path = package.path .. ";${pkgs.luajitPackages.fennel}/share/lua/5.1/?.lua"

+4 -4

modules/nvim/fnl/langclient.fnl

reviewed

··· 62 62 63 63 (setup :zls {}) 64 64 65 65 - (setup :nixd { 66 66 - :autostart true 67 67 - :cmd [vim.g.lsp_paths.nixd] 68 68 - }) 65 65 + ;(setup :nixd { 66 66 + ; :autostart true 67 67 + ; :cmd [vim.g.lsp_paths.nixd] 68 68 + ; }) 69 69 70 70 (setup :typos_lsp { 71 71 :autostart true

+24

overlays/fix-curl.nix

reviewed

··· 1 1 + # Hot fix for curl in nix breaking with netrc 2 2 + # https://github.com/NixOS/nixpkgs/pull/356133 3 3 + final: prev: let 4 4 + patched-curl = prev.curl.overrideAttrs (oldAttrs: { 5 5 + patches = 6 6 + (oldAttrs.patches or []) 7 7 + ++ [ 8 8 + # https://github.com/curl/curl/issues/15496 9 9 + (prev.fetchpatch { 10 10 + url = "https://github.com/curl/curl/commit/f5c616930b5cf148b1b2632da4f5963ff48bdf88.patch"; 11 11 + hash = "sha256-FlsAlBxAzCmHBSP+opJVrZG8XxWJ+VP2ro4RAl3g0pQ="; 12 12 + }) 13 13 + # https://github.com/curl/curl/issues/15513 14 14 + (prev.fetchpatch { 15 15 + url = "https://github.com/curl/curl/commit/0cdde0fdfbeb8c35420f6d03fa4b77ed73497694.patch"; 16 16 + hash = "sha256-WP0zahMQIx9PtLmIDyNSJICeIJvN60VzJGN2IhiEYv0="; 17 17 + }) 18 18 + ]; 19 19 + }); 20 20 + in { 21 21 + nix = prev.nix.override (old: { 22 22 + curl = patched-curl; 23 23 + }); 24 24 + }

+17 -33

users/hauleth.nix

reviewed

··· 1 1 {inputs, ...}: { 2 2 - username = "hauleth"; 3 3 - 4 4 - home = inputs.home-manager.lib.homeManagerConfiguration { 5 5 - pkgs = import inputs.nixpkgs { 6 6 - system = "aarch64-darwin"; 7 7 - }; 8 8 - 9 9 - extraSpecialArgs = { 10 10 - inherit inputs; 11 11 - }; 12 12 - 13 13 - modules = [ 14 14 - { 15 15 - home.username = "hauleth"; 16 16 - home.homeDirectory = "/Users/hauleth/"; 17 17 - } 18 18 - inputs.ghostty.homeModules.default 19 19 - ../modules/fish.nix 20 20 - ../modules/direnv.nix 21 21 - ../modules/git.nix 22 22 - ../modules/plan.nix 23 23 - ../modules/ctags.nix 24 24 - ../modules/curl.nix 25 25 - ../modules/tools.nix 26 26 - ../modules/swiftbar.nix 27 27 - ../modules/email.nix 28 28 - ../modules/pijul.nix 29 29 - ../modules/nvim.nix 30 30 - ../modules/ghostty.nix 31 31 - ./modules/dircolors.nix 32 32 - {home.stateVersion = "24.11";} 33 33 - ]; 34 34 - }; 2 2 + imports = [ 3 3 + inputs.ghostty.homeModules.default 4 4 + ../modules/fish.nix 5 5 + ../modules/direnv.nix 6 6 + ../modules/git.nix 7 7 + ../modules/plan.nix 8 8 + ../modules/ctags.nix 9 9 + ../modules/curl.nix 10 10 + ../modules/tools.nix 11 11 + ../modules/swiftbar.nix 12 12 + ../modules/email.nix 13 13 + ../modules/pijul.nix 14 14 + ../modules/nvim.nix 15 15 + ../modules/ghostty.nix 16 16 + ./modules/dircolors.nix 17 17 + {home.stateVersion = "24.11";} 18 18 + ]; 35 19 }