+3 -1

flake.nix

reviewed

··· 239 239 nixfmt 240 240 nil 241 241 nixd 242 242 + shellcheck 243 243 + shfmt 242 244 ]; 243 245 }; 244 246 ··· 673 675 agenix-rekey = agenix-rekey.configure { 674 676 userFlake = self; 675 677 nixosConfigurations = self.nixosConfigurations; 676 676 - darwinConfigurations = self.darwinConfigurations or { }; 678 678 + #darwinConfigurations = self.darwinConfigurations or { }; 677 679 # Example for colmena: 678 680 # nixosConfigurations = ((colmena.lib.makeHive self.colmena).introspect (x: x)).nodes; 679 681 };

+49 -43

shared/meta.nix

reviewed

··· 9 9 { 10 10 # import configs first 11 11 imports = [ 12 12 + # module opts 12 13 ./options.nix 13 13 - # import shared configs 14 14 - ./1password.nix 14 14 + # nix stuff and systemd 15 15 ./nix.nix 16 16 - ./appimages.nix 17 17 - ./gnupg.nix 18 16 ./locale.nix 19 17 ./networking.nix 20 18 ./systemd.nix 19 19 + ./agenix.nix 20 20 + # shells and dev tools 21 21 + ./gnupg.nix 21 22 ./shells/bash.nix 22 23 ./shells/custom-prompts.nix 23 24 ./vscode/main.nix 24 25 ./server/ssh.nix 25 26 ./server/tailscale.nix 26 26 - ./agenix.nix 27 27 + # desktop stuff 28 28 + ./1password.nix 29 29 + ./appimages.nix 27 30 ]; 28 31 29 32 # and then the base packages itself 30 30 - environment.systemPackages = with pkgs; [ 31 31 - # tmux and friendos 32 32 - byobu 33 33 - tmux 34 34 - htop 35 35 - btop 33 33 + config = { 34 34 + environment.systemPackages = with pkgs; [ 35 35 + # tmux and friendos 36 36 + byobu 37 37 + tmux 38 38 + htop 39 39 + btop 36 40 37 37 - # git tools 38 38 - gitFull 41 41 + # git tools 42 42 + gitFull 39 43 40 40 - # misc tools and utils 41 41 - curl 42 42 - wget 43 43 - fastfetch 44 44 - jq 45 45 - rclone 46 46 - ntfsprogs 44 44 + # misc tools and utils 45 45 + curl 46 46 + wget 47 47 + fastfetch 48 48 + jq 49 49 + rclone 50 50 + ntfsprogs 47 51 48 48 - # TUI-based text editors 49 49 - nano 50 50 - neovim 51 51 - emacs 52 52 + # TUI-based text editors 53 53 + nano 54 54 + neovim 55 55 + emacs 52 56 53 53 - # shell prompt customizations 54 54 - starship 55 55 - oh-my-posh # as backup lol 57 57 + # shell prompt customizations 58 58 + starship 59 59 + oh-my-posh # as backup lol 56 60 57 57 - # iykyk secretops (see also agenix.nix) 58 58 - age 59 59 - rage 60 60 - ]; 61 61 + # iykyk secretops (see also agenix.nix) 62 62 + age 63 63 + rage 64 64 + ]; 61 65 62 62 - # home-manager stuff 63 63 - home-manager.useGlobalPkgs = true; 64 64 - home-manager.useUserPackages = true; 66 66 + # home-manager stuff 67 67 + home-manager.useGlobalPkgs = true; 68 68 + home-manager.useUserPackages = true; 69 69 + home.enableNixpkgsReleaseCheck = false; # ignore warnings about outdated nixpkgs in home-manager 65 70 66 66 - # nix-ld flake opts 67 67 - programs.nix-ld.dev = { 68 68 - enable = true; 69 69 - }; 71 71 + # nix-ld flake opts 72 72 + programs.nix-ld.dev = { 73 73 + enable = true; 74 74 + }; 70 75 71 71 - # sysctl stuff 72 72 - boot.kernel.sysctl = { 73 73 - "net.ipv4.ip_forward" = 1; 74 74 - "net.ipv6.conf.all.forwarding" = 1; 75 75 - "vm.swappiness" = 60; 76 76 + # sysctl stuff 77 77 + boot.kernel.sysctl = { 78 78 + "net.ipv4.ip_forward" = 1; 79 79 + "net.ipv6.conf.all.forwarding" = 1; 80 80 + "vm.swappiness" = 60; 81 81 + }; 76 82 }; 77 83 }

+9 -7

shared/options/agenix.nix

reviewed

··· 1 1 - { lib, config, options, pkgs, ... }: 1 1 + { 2 2 + lib, 3 3 + config, 4 4 + options, 5 5 + pkgs, 6 6 + ... 7 7 + }: 2 8 3 9 { 4 10 options.nixops-config.secretOps.agenix = { 5 5 - enable = lib.mkOption { 6 6 - description = "Enable agenix and agenix-reky for this NixOS or home-manager config. Requires `rekey.hostPubkey` to be set."; 7 7 - default = false; 8 8 - type = lib.types.bool; 9 9 - }; 11 11 + enable = lib.mkEnableOption "Enable agenix and agenix-reky for this NixOS or home-manager config. Requires `rekey.hostPubkey` to be set."; 10 12 }; 11 11 - } 13 13 + }