lytedev/nix
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Daniel Flanagan 2023-09-22 12:56:48 -05:00
parent db74308187
commit 451e6cd89a
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
4 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fish/shellInit.fish
View file

@ -72,6 +72,6 @@ if has_command rtx
rtx activate fish | source rtx activate fish | source
end end
for dir in $HOME/.cargo/bin for dir in ~/.cargo/bin ~/.nimble/bin
fish_add_path $dir fish_add_path $dir
end end

5
home/user.nix
View file

@ -31,7 +31,7 @@ in
pkgs.nixpkgs-fmt pkgs.nixpkgs-fmt
# TODO: os-specific scripts? macOS versus Linux (arch or nixos? do I need to distinguish at that point?) # TODO: os-specific scripts? macOS versus Linux (arch or nixos? do I need to distinguish at that point?)
(pkgs.buildEnv { name = "my-scripts"; paths = [ ../scripts ]; }) (pkgs.buildEnv { name = "my-scripts-common"; paths = [ ../scripts/common ]; })
]; ];
file = { file = {
@ -588,6 +588,3 @@ in
# maybe we can share somehow so things for nix-y systems and non-nix-y systems alike # maybe we can share somehow so things for nix-y systems and non-nix-y systems alike
# am I going to _have_ non-nix systems anymore? # am I going to _have_ non-nix systems anymore?
} }

11
nixos/common.nix
View file

@ -1,11 +1,12 @@
{ config, lib, inputs, system, ... }: { config, lib, inputs, system, ... }:
let let
overlay = final: prev: { overlay = final: prev: {
helix = prev.helix // inputs.helix.packages.${system}.helix; helix = prev.helix // inputs.helix.packages.${system}.helix;
rtx = prev.rtx // inputs.rtx.packages.${system}.rtx; rtx = prev.rtx // inputs.rtx.packages.${system}.rtx;
}; };
pkgs = inputs.nixpkgs.legacyPackages.${system}.extend overlay; pkgs = inputs.nixpkgs.legacyPackages.${system}.extend overlay;
in { in
{
services.journald.extraConfig = "SystemMaxUse=1G"; services.journald.extraConfig = "SystemMaxUse=1G";
environment = { environment = {
@ -97,7 +98,7 @@ in {
}; };
# tailscale handles this I think # tailscale handles this I think
openFirewall = lib.mkDefault false; openFirewall = lib.mkDefault true;
# listenAddresses = [ # listenAddresses = [
# { addr = "0.0.0.0"; port = 22; } # { addr = "0.0.0.0"; port = 22; }
@ -144,7 +145,7 @@ in {
firewall = { firewall = {
enable = lib.mkDefault true; enable = lib.mkDefault true;
allowPing = lib.mkDefault true; allowPing = lib.mkDefault true;
allowedTCPPorts = lib.mkDefault [ ]; allowedTCPPorts = lib.mkDefault [ 22 ];
allowedUDPPorts = lib.mkDefault [ ]; allowedUDPPorts = lib.mkDefault [ ];
}; };
}; };

9
nixos/thinker.nix
View file

@ -28,6 +28,15 @@
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
services.printing.enable = true; # I own a printer in the year of our Lord 2023 services.printing.enable = true; # I own a printer in the year of our Lord 2023
networking = {
firewall = {
enable = true;
allowPing = true;
allowedTCPPorts = [ 22 ];
allowedUDPPorts = [ ];
};
};
system.stateVersion = "23.05"; system.stateVersion = "23.05";
} }