Compare commits

..

No commits in common. "abaf8ee902768c045dc864de2100dfe040850f95" and "1b5dadfee557e6327fa7897fc33412e6a8547a40" have entirely different histories.

4 changed files with 45 additions and 35 deletions

View file

@ -425,11 +425,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725694918, "lastModified": 1725180166,
"narHash": "sha256-+HsjshXpqNiJHLaJaK0JnIicJ/a1NquKcfn4YZ3ILgg=", "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "aaebdea769a5c10f1c6e50ebdf5924c1a13f0cda", "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -463,11 +463,11 @@
"homebrew-cask": { "homebrew-cask": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725702115, "lastModified": 1725564674,
"narHash": "sha256-ccs2wknFadx+oT2vAK2TMPp/avJkr12v1xNVIcOJ8xE=", "narHash": "sha256-Mr7kuWMgOd0i5qbcXkjuZLdOeKkMs2cRRY2s0TJpZ1Y=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-cask", "repo": "homebrew-cask",
"rev": "a3aac332f1c7acc518364142ae5a7ae378f4d08d", "rev": "b0f4ceebb26d2e9127021558252cb2d550a0cfa4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -479,11 +479,11 @@
"homebrew-core": { "homebrew-core": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725698398, "lastModified": 1725565402,
"narHash": "sha256-rkKSNR/ShV/Wtd6ub23vrUojGgJsKNkIQzns8Y5eQAA=", "narHash": "sha256-QWux6iMEtgMwt8igC2bLMMFrxI7afw5uY+XQ8yOG5e0=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-core", "repo": "homebrew-core",
"rev": "2ad1f9b4a27bbf125aaaac70c55c4da2fbdd04e8", "rev": "bf87f4e991bc7cc62cfc33b1ab631a11c9aa3505",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -561,11 +561,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725628909, "lastModified": 1725544312,
"narHash": "sha256-xI0OSqPHcs/c/utJsU0Zvcp1VhejMI9mgwr68uHHlPs=", "narHash": "sha256-ETyDNLOF5YvFO2lVlKttXgdHTqSGdp9ZCRRCjv2gaoM=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "76559183801030451e200c90a1627c1d82bb4910", "rev": "a55b3f1ab41bb6d5025ebeebb4da5fd240b9b3b3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -678,6 +678,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable-small": {
"locked": {
"lastModified": 1725542439,
"narHash": "sha256-+c+ULwR2TVKrkkQZJcT1G85IWQwoCek+he4sMM74OIs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8b16862469fc1e239f672ddd2e9af3fa9dd9352d",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1725432240, "lastModified": 1725432240,
@ -808,6 +824,7 @@
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nix-homebrew": "nix-homebrew", "nix-homebrew": "nix-homebrew",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable-small": "nixpkgs-unstable-small",
"personal-neovim": "personal-neovim", "personal-neovim": "personal-neovim",
"spicetify": "spicetify", "spicetify": "spicetify",
"vesktop-bin": "vesktop-bin", "vesktop-bin": "vesktop-bin",
@ -864,11 +881,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725682572, "lastModified": 1725509777,
"narHash": "sha256-K5feij1p3mheXVD6NO9l5LjAHPFRXucWT60/x+l2pf0=", "narHash": "sha256-LGGifKOZr72o+u3wwqMruyCT5yUr7Q8gQ1ggOQd+kM8=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "c208a9bd17d0e0b9dc91dd20b5fe0ff5df3b9ac8", "rev": "029ce2c0145823ea1165e4d532f17ca6961975fc",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -5,7 +5,7 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
# stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05"; # stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05";
# bleedingpkgs.url = "github:nixos/nixpkgs/master"; # bleedingpkgs.url = "github:nixos/nixpkgs/master";
# nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small"; nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";

View file

@ -2,32 +2,25 @@ let
universalAllowedPorts = [ universalAllowedPorts = [
27016 # grim dawn 27016 # grim dawn
42805 # grim dawn 42805 # grim dawn
42852 # grim dawn
42872 # grim dawn
27015 # grim dawn
27036 # grim dawn
5173 # vite test server 5173 # vite test server
4173 # vite test server 4173 # vite test server
]; ];
universalAllowedRanges = [ ]; universalAllowedRanges = [
{
from = 42852;
to = 42872;
}
];
in in
{ {
services.openssh.enable = true; services.openssh.enable = true;
networking.firewall = { networking.firewall = {
enable = true;
allowedTCPPorts = universalAllowedPorts; allowedTCPPorts = universalAllowedPorts;
allowedUDPPorts = universalAllowedPorts; allowedUDPPorts = universalAllowedPorts;
allowedUDPPortRanges = universalAllowedRanges ++ [ allowedUDPPortRanges = universalAllowedRanges;
{
from = 27031;
to = 27036;
}
];
allowedTCPPortRanges = universalAllowedRanges; allowedTCPPortRanges = universalAllowedRanges;
}; };
networking.firewall.enable = true;
networking.nameservers = [ networking.nameservers = [
"1.1.1.1" "1.1.1.1"
"1.0.0.1" "1.0.0.1"

View file

@ -4,14 +4,14 @@
... ...
}: }:
let let
# stablepkgs = inputs.stablepkgs.legacyPackages.${pkgs.system};
# bleedingpkgs = inputs.bleedingpkgs.legacyPackages.${pkgs.system};
nixpkgs-small = inputs.nixpkgs-unstable-small.legacyPackages.${pkgs.system};
in in
# stablepkgs = inputs.stablepkgs.legacyPackages.${pkgs.system};
# bleedingpkgs = inputs.bleedingpkgs.legacyPackages.${pkgs.system};
# nixpkgs-small = inputs.nixpkgs-unstable-small.legacyPackages.${pkgs.system};
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { (self: super: {
# xdg-desktop-portal-hyprland = nixpkgs-small.xdg-desktop-portal-hyprland; xdg-desktop-portal-hyprland = nixpkgs-small.xdg-desktop-portal-hyprland;
}) })
]; ];
} }