+16 -47

flake.nix

··· 55 55 56 56 outputs = 57 57 inputs: 58 58 - let 59 59 - inherit (inputs.nixpkgs) lib; 60 60 - packages' = 61 61 - pkgs': 62 62 - pkgs'.lib.packagesFromDirectoryRecursive { 63 63 - inherit (pkgs') callPackage; 64 64 - directory = ./packages; 65 65 - }; 66 66 - specialArgs = { inherit inputs; }; 67 67 - in 68 58 inputs.flake-parts.lib.mkFlake { inherit inputs; } { 69 69 - systems = lib.systems.flakeExposed; 70 70 - 71 71 - flake = { 72 72 - overlays.default = final: prev: packages' prev // import ./overlay.nix final prev; 59 59 + systems = [ 60 60 + "x86_64-linux" 61 61 + "x86_64-darwin" 62 62 + ]; 73 63 74 74 - # Personal computers 75 75 - nixosConfigurations.fettuccine = lib.nixosSystem { 76 76 - modules = [ ./systems/fettuccine ]; 77 77 - inherit specialArgs; 78 78 - }; 64 64 + imports = [ 65 65 + ./overlay.nix 66 66 + ./systems/fettuccine 67 67 + ./systems/pappardelle 68 68 + ./systems/focaccia 69 69 + ]; 79 70 80 80 - nixosConfigurations.pappardelle = lib.nixosSystem { 81 81 - modules = [ ./systems/pappardelle ]; 82 82 - inherit specialArgs; 83 83 - }; 84 84 - 85 85 - # Servers 86 86 - nixosConfigurations.focaccia = lib.nixosSystem { 87 87 - modules = [ ./systems/focaccia ]; 88 88 - inherit specialArgs; 89 89 - }; 90 90 - 71 71 + flake = { 91 72 hjemModules = { 92 73 hjem-ext = import ./modules/hjem-ext; 93 74 hjem-ctp = import ./modules/hjem-ctp; 94 75 }; 95 76 96 96 - # deploy-rs Nodes 97 97 - deploy.nodes.focaccia = { 98 98 - sshOpts = [ 99 99 - "-p" 100 100 - "42069" 101 101 - ]; 102 102 - hostname = "focaccia.pluie.me"; 103 103 - profiles = { 104 104 - system = { 105 105 - path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.focaccia; 106 106 - user = "root"; 107 107 - sshUser = "root"; 108 108 - }; 109 109 - }; 110 110 - }; 111 111 - 112 77 # This is highly advised, and will prevent many possible mistakes 113 78 checks = builtins.mapAttrs ( 114 79 _: deployLib: deployLib.deployChecks inputs.self.deploy ··· 118 83 perSystem = 119 84 { 120 85 pkgs, 86 86 + lib, 121 87 system, 122 88 ... 123 89 }: ··· 128 94 config.allowUnfree = true; 129 95 }; 130 96 131 131 - packages = packages' pkgs; 97 97 + packages = lib.packagesFromDirectoryRecursive { 98 98 + inherit (pkgs) callPackage; 99 99 + directory = ./packages; 100 100 + }; 132 101 133 102 devShells.default = pkgs.mkShellNoCC { 134 103 packages = with pkgs; [

+38 -24

overlay.nix

··· 1 1 # May lord have mercy on my soul 2 2 - final: prev: { 3 3 - jujutsu = prev.jujutsu.overrideAttrs { 4 4 - patches = (prev.patches or [ ]) ++ [ 5 5 - # HACK: I am so sick and tired of not being able to push to Nixpkgs 6 6 - # because some edgy fucking idiot thought that it's a good idea to not 7 7 - # specify an email address in a commit 8 8 - # 9 9 - # See https://github.com/NixOS/nixpkgs/pull/453871 10 10 - # See https://github.com/jj-vcs/jj/issues/5723 11 11 - (prev.fetchpatch2 { 12 12 - url = "https://github.com/pluiedev/jj/commit/daa88d4dd485ed0c188023d2af8f811fd4db4a14.patch"; 13 13 - hash = "sha256-F8fp+LXQwuFVVVnYHJAEaQ9dFr6z9tdCkmcKDC39mM8="; 14 14 - }) 15 15 - ]; 16 16 - doCheck = false; 17 17 - }; 2 2 + { 3 3 + self, 4 4 + ... 5 5 + }: 6 6 + { 7 7 + flake.overlays.default = 8 8 + final: prev: 9 9 + let 10 10 + inherit (prev.stdenv.hostPlatform) system; 18 11 19 19 - # TODO: Remove when nixpkgs#473189 is available in unstable 20 20 - vicinae = final.runCommand "vicinae-patched" { } '' 21 21 - mkdir -p $out 22 22 - cp -r ${prev.vicinae}/* $out 23 23 - substituteInPlace $out/share/systemd/user/vicinae.service \ 24 24 - --replace-fail "/bin/kill" "${final.lib.getExe' final.coreutils "kill"}" \ 25 25 - --replace-fail "vicinae" "$out/bin/vicinae" 26 26 - ''; 12 12 + myPkgs = prev.lib.optionalAttrs (builtins.hasAttr system self.packages) self.packages.${system}; 13 13 + in 14 14 + myPkgs 15 15 + // { 16 16 + jujutsu = prev.jujutsu.overrideAttrs { 17 17 + patches = (prev.patches or [ ]) ++ [ 18 18 + # HACK: I am so sick and tired of not being able to push to Nixpkgs 19 19 + # because some edgy fucking idiot thought that it's a good idea to not 20 20 + # specify an email address in a commit 21 21 + # 22 22 + # See https://github.com/NixOS/nixpkgs/pull/453871 23 23 + # See https://github.com/jj-vcs/jj/issues/5723 24 24 + (prev.fetchpatch2 { 25 25 + url = "https://github.com/pluiedev/jj/commit/daa88d4dd485ed0c188023d2af8f811fd4db4a14.patch"; 26 26 + hash = "sha256-F8fp+LXQwuFVVVnYHJAEaQ9dFr6z9tdCkmcKDC39mM8="; 27 27 + }) 28 28 + ]; 29 29 + doCheck = false; 30 30 + }; 31 31 + 32 32 + # TODO: Remove when nixpkgs#473189 is available in unstable 33 33 + vicinae = final.runCommand "vicinae-patched" { } '' 34 34 + mkdir -p $out 35 35 + cp -r ${prev.vicinae}/* $out 36 36 + substituteInPlace $out/share/systemd/user/vicinae.service \ 37 37 + --replace-fail "/bin/kill" "${final.lib.getExe' final.coreutils "kill"}" \ 38 38 + --replace-fail "vicinae" "$out/bin/vicinae" 39 39 + ''; 40 40 + }; 27 41 }

+43

systems/fettuccine/configuration.nix

··· 1 1 + { 2 2 + config, 3 3 + lib, 4 4 + inputs, 5 5 + ... 6 6 + }: 7 7 + { 8 8 + imports = with inputs.nixos-hardware.nixosModules; [ 9 9 + ../laptop.nix 10 10 + ./hardware-configuration.nix 11 11 + asus-zephyrus-gu603h 12 12 + ]; 13 13 + 14 14 + networking.hostName = "fettuccine"; 15 15 + 16 16 + users.users.leah.enable = true; 17 17 + 18 18 + # Disable Nvidia's HDMI audio 19 19 + boot.blacklistedKernelModules = [ "snd_hda_codec_hdmi" ]; 20 20 + 21 21 + # Allow CUDA 22 22 + nixpkgs.config.cudaSupport = true; 23 23 + 24 24 + hardware = { 25 25 + bluetooth.enable = true; 26 26 + 27 27 + nvidia = { 28 28 + # PCI bus IDs are already conveniently set by nixos-hardware 29 29 + prime.offload.enable = lib.mkForce true; 30 30 + 31 31 + # Beta can sometimes be more stable than, well, stable 32 32 + package = config.boot.kernelPackages.nvidiaPackages.beta; 33 33 + }; 34 34 + }; 35 35 + 36 36 + # Nix can sometimes overload my poor, poor laptop CPU 37 37 + # so much that it can freeze my entire system. Amazing. 38 38 + # Please don't do that. 39 39 + nix.daemonCPUSchedPolicy = "idle"; 40 40 + 41 41 + # This is an ASUS computer after all 42 42 + services.asusd.enable = true; 43 43 + }

+4 -36

systems/fettuccine/default.nix

··· 1 1 { 2 2 - config, 2 2 + inputs, 3 3 lib, 4 4 - inputs, 5 4 ... 6 5 }: 7 6 { 8 8 - imports = with inputs.nixos-hardware.nixosModules; [ 9 9 - ../laptop.nix 10 10 - ./hardware-configuration.nix 11 11 - asus-zephyrus-gu603h 12 12 - ]; 13 13 - 14 14 - networking.hostName = "fettuccine"; 15 15 - 16 16 - users.users.leah.enable = true; 17 17 - 18 18 - # Disable Nvidia's HDMI audio 19 19 - boot.blacklistedKernelModules = [ "snd_hda_codec_hdmi" ]; 20 20 - 21 21 - # Allow CUDA 22 22 - nixpkgs.config.cudaSupport = true; 23 23 - 24 24 - hardware = { 25 25 - bluetooth.enable = true; 26 26 - 27 27 - nvidia = { 28 28 - # PCI bus IDs are already conveniently set by nixos-hardware 29 29 - prime.offload.enable = lib.mkForce true; 30 30 - 31 31 - # Beta can sometimes be more stable than, well, stable 32 32 - package = config.boot.kernelPackages.nvidiaPackages.beta; 33 33 - }; 7 7 + flake.nixosConfigurations.fettuccine = lib.nixosSystem { 8 8 + modules = [ ./configuration.nix ]; 9 9 + specialArgs = { inherit inputs; }; 34 10 }; 35 35 - 36 36 - # Nix can sometimes overload my poor, poor laptop CPU 37 37 - # so much that it can freeze my entire system. Amazing. 38 38 - # Please don't do that. 39 39 - nix.daemonCPUSchedPolicy = "idle"; 40 40 - 41 41 - # This is an ASUS computer after all 42 42 - services.asusd.enable = true; 43 11 }

+76

systems/focaccia/configuration.nix

··· 1 1 + { 2 2 + imports = [ 3 3 + ../common.nix 4 4 + ./hardware-configuration.nix 5 5 + ./networking.nix 6 6 + ../../modules/nixos/hysteria.nix 7 7 + ]; 8 8 + 9 9 + networking = { 10 10 + hostName = "focaccia"; 11 11 + domain = "pluie.me"; 12 12 + firewall = { 13 13 + allowedUDPPorts = [ 53 ]; 14 14 + allowedTCPPorts = [ 15 15 + 80 16 16 + 443 17 17 + ]; 18 18 + }; 19 19 + }; 20 20 + 21 21 + users.users.leah = { 22 22 + enable = true; 23 23 + isNormalUser = true; 24 24 + description = "Leah C"; 25 25 + extraGroups = [ 26 26 + "wheel" # 1984 powers 27 27 + ]; 28 28 + home = "/home/leah"; 29 29 + 30 30 + openssh.authorizedKeys.keys = [ 31 31 + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbsavGX9rGRx5R+7ovLn+r7D/w3zkbqCik4bS31moSz" 32 32 + ]; 33 33 + }; 34 34 + 35 35 + services.openssh = { 36 36 + enable = true; 37 37 + ports = [ 42069 ]; 38 38 + settings.PermitRootLogin = "prohibit-password"; 39 39 + }; 40 40 + 41 41 + programs.mosh = { 42 42 + enable = true; 43 43 + openFirewall = true; 44 44 + }; 45 45 + 46 46 + users.users.root.openssh.authorizedKeys.keys = [ 47 47 + ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbsavGX9rGRx5R+7ovLn+r7D/w3zkbqCik4bS31moSz'' 48 48 + ]; 49 49 + 50 50 + boot.kernel.sysctl = { 51 51 + "net.core.rmem_max" = 16777216; 52 52 + "net.core.wmem_max" = 16777216; 53 53 + }; 54 54 + 55 55 + services.hysteria = { 56 56 + enable = true; 57 57 + settings = { 58 58 + listen = ":53"; 59 59 + acme = { 60 60 + domains = [ "focaccia.pluie.me" ]; 61 61 + email = "srv@acc.pluie.me"; 62 62 + }; 63 63 + auth = { 64 64 + type = "password"; 65 65 + password._secret = "/var/lib/hysteria/passwd"; 66 66 + }; 67 67 + masquerade = { 68 68 + type = "proxy"; 69 69 + proxy = { 70 70 + url = "https://news.ycombinator.com/"; 71 71 + rewriteHost = true; 72 72 + }; 73 73 + }; 74 74 + }; 75 75 + }; 76 76 + }

+15 -74

systems/focaccia/default.nix

··· 1 1 { 2 2 + self, 3 3 + inputs, 2 4 lib, 3 3 - utils, 4 5 ... 5 6 }: 6 6 - let 7 7 - settings = { 8 8 - 9 9 - }; 10 10 - in 11 7 { 12 12 - imports = [ 13 13 - ../common.nix 14 14 - ./hardware-configuration.nix 15 15 - ./networking.nix 16 16 - ../../modules/nixos/hysteria.nix 17 17 - ]; 18 18 - 19 19 - networking = { 20 20 - hostName = "focaccia"; 21 21 - domain = "pluie.me"; 22 22 - firewall = { 23 23 - allowedUDPPorts = [ 53 ]; 24 24 - allowedTCPPorts = [ 25 25 - 80 26 26 - 443 27 27 - ]; 28 28 - }; 8 8 + flake.nixosConfigurations.focaccia = lib.nixosSystem { 9 9 + modules = [ ./configuration.nix ]; 10 10 + specialArgs = { inherit inputs; }; 29 11 }; 30 12 31 31 - users.users.leah = { 32 32 - enable = true; 33 33 - isNormalUser = true; 34 34 - description = "Leah C"; 35 35 - extraGroups = [ 36 36 - "wheel" # 1984 powers 13 13 + flake.deploy.nodes.focaccia = { 14 14 + sshOpts = [ 15 15 + "-p" 16 16 + "42069" 37 17 ]; 38 38 - home = "/home/leah"; 39 39 - 40 40 - openssh.authorizedKeys.keys = [ 41 41 - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbsavGX9rGRx5R+7ovLn+r7D/w3zkbqCik4bS31moSz" 42 42 - ]; 43 43 - }; 44 44 - 45 45 - services.openssh = { 46 46 - enable = true; 47 47 - ports = [ 42069 ]; 48 48 - settings.PermitRootLogin = "prohibit-password"; 49 49 - }; 50 50 - 51 51 - programs.mosh = { 52 52 - enable = true; 53 53 - openFirewall = true; 54 54 - }; 55 55 - 56 56 - users.users.root.openssh.authorizedKeys.keys = [ 57 57 - ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbsavGX9rGRx5R+7ovLn+r7D/w3zkbqCik4bS31moSz'' 58 58 - ]; 59 59 - 60 60 - boot.kernel.sysctl = { 61 61 - "net.core.rmem_max" = 16777216; 62 62 - "net.core.wmem_max" = 16777216; 63 63 - }; 64 64 - 65 65 - services.hysteria = { 66 66 - enable = true; 67 67 - settings = { 68 68 - listen = ":53"; 69 69 - acme = { 70 70 - domains = [ "focaccia.pluie.me" ]; 71 71 - email = "srv@acc.pluie.me"; 72 72 - }; 73 73 - auth = { 74 74 - type = "password"; 75 75 - password._secret = "/var/lib/hysteria/passwd"; 76 76 - }; 77 77 - masquerade = { 78 78 - type = "proxy"; 79 79 - proxy = { 80 80 - url = "https://news.ycombinator.com/"; 81 81 - rewriteHost = true; 82 82 - }; 18 18 + hostname = "focaccia.pluie.me"; 19 19 + profiles = { 20 20 + system = { 21 21 + path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.focaccia; 22 22 + user = "root"; 23 23 + sshUser = "root"; 83 24 }; 84 25 }; 85 26 };

+15

systems/pappardelle/configuration.nix

··· 1 1 + { 2 2 + inputs, 3 3 + ... 4 4 + }: 5 5 + { 6 6 + imports = with inputs.nixos-hardware.nixosModules; [ 7 7 + ../laptop.nix 8 8 + ./hardware-configuration.nix 9 9 + lenovo-ideapad-14iah10 10 10 + ]; 11 11 + 12 12 + hardware.bluetooth.enable = true; 13 13 + networking.hostName = "pappardelle"; 14 14 + users.users.leah.enable = true; 15 15 + }

+5 -9

systems/pappardelle/default.nix

··· 1 1 { 2 2 inputs, 3 3 + lib, 3 4 ... 4 5 }: 5 6 { 6 6 - imports = with inputs.nixos-hardware.nixosModules; [ 7 7 - ../laptop.nix 8 8 - ./hardware-configuration.nix 9 9 - lenovo-ideapad-14iah10 10 10 - ]; 11 11 - 12 12 - hardware.bluetooth.enable = true; 13 13 - networking.hostName = "pappardelle"; 14 14 - users.users.leah.enable = true; 7 7 + flake.nixosConfigurations.pappardelle = lib.nixosSystem { 8 8 + modules = [ ./configuration.nix ]; 9 9 + specialArgs = { inherit inputs; }; 10 10 + }; 15 11 }