Superredstone/nixos
1
0
Fork 0
mirror of https://github.com/Superredstone/nixos.git synced 2026-03-08 04:38:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added NordVPN via NUR

Browse Source
This commit is contained in:
Patrick Canal
2026-01-04 22:59:23 +01:00
parent 7959af3e39
commit 662afe7238
9 changed files with 137 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
flake.lock generated
View File

@@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764714051, "lastModified": 1767024902,
"narHash": "sha256-AjcMlM3UoavFoLzr0YrcvsIxALShjyvwe+o7ikibpCM=", "narHash": "sha256-sMdk6QkMDhIOnvULXKUM8WW8iyi551SWw2i6KQHbrrU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "a43bedcceced5c21ad36578ed823e6099af78214", "rev": "b8a0c5ba5a9fbd2c660be7dd98bdde0ff3798556",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -36,15 +36,15 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1761588595, "lastModified": 1767039857,
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"owner": "edolstra", "owner": "NixOS",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "edolstra", "owner": "NixOS",
"repo": "flake-compat", "repo": "flake-compat",
"type": "github" "type": "github"
} }
@@ -89,6 +89,27 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": [
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733312601,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
@@ -136,11 +157,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1766171975, "lastModified": 1767515539,
"narHash": "sha256-47Ee0bTidhF/3/sHuYnWRuxcCrrm0mBNDxBkOTd3wWQ=", "narHash": "sha256-4fHDswBZac5vE8WA9qczUgPo3TvJVF9uOvcXhPpnqJ0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "bb35f07cc95a73aacbaf1f7f46bb8a3f40f265b5", "rev": "12cc14271b250b2b46bf681352da91a8d2efec26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -198,11 +219,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1766171975, "lastModified": 1767515539,
"narHash": "sha256-47Ee0bTidhF/3/sHuYnWRuxcCrrm0mBNDxBkOTd3wWQ=", "narHash": "sha256-4fHDswBZac5vE8WA9qczUgPo3TvJVF9uOvcXhPpnqJ0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "bb35f07cc95a73aacbaf1f7f46bb8a3f40f265b5", "rev": "12cc14271b250b2b46bf681352da91a8d2efec26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -256,11 +277,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1763733840, "lastModified": 1766946335,
"narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=", "narHash": "sha256-MRD+Jr2bY11MzNDfenENhiK6pvN+nHygxdHoHbZ1HtE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a", "rev": "4af02a3925b454deb1c36603843da528b67ded6c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -286,11 +307,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1766160862, "lastModified": 1767474766,
"narHash": "sha256-rEOiUTknr+/t9p6C9o2UH2sK98h3HqeiYj7UydqiZn4=", "narHash": "sha256-Vkl6ta0Jaim6MvbNKfhb5GR/FtW3NyMRXyioBH1rcC0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "315806f59816aacdbf7c66aaeaa0e49d3a33a66d", "rev": "583c4074a5d4229f841d9e470ab427339773b592",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -332,11 +353,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764812575, "lastModified": 1767023960,
"narHash": "sha256-1bK1yGgaR82vajUrt6z+BSljQvFn91D74WJ/vJsydtE=", "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-guiutils", "repo": "hyprland-guiutils",
"rev": "fd321368a40c782cfa299991e5584ca338e36ebe", "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -357,11 +378,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759610243, "lastModified": 1765214753,
"narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=", "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622", "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -463,11 +484,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764962281, "lastModified": 1766253372,
"narHash": "sha256-rGbEMhTTyTzw4iyz45lch5kXseqnqcEpmrHdy+zHsfo=", "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "fe686486ac867a1a24f99c753bb40ffed338e4b0", "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -517,11 +538,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764872015, "lastModified": 1767473322,
"narHash": "sha256-INI9AVrQG5nJZFvGPSiUZ9FEUZJLfGdsqjF1QSak7Gc=", "narHash": "sha256-RGOeG+wQHeJ6BKcsSB8r0ZU77g9mDvoQzoTKj2dFHwA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwire", "repo": "hyprwire",
"rev": "7997451dcaab7b9d9d442f18985d514ec5891608", "rev": "d5e7d6b49fe780353c1cf9a1cf39fa8970bd9d11",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -555,11 +576,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1764950072, "lastModified": 1767379071,
"narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f61125a668a320878494449750330ca58b78c557", "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -618,11 +639,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1766125104, "lastModified": 1767364772,
"narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=", "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7d853e518814cca2a657b72eeba67ae20ebf7059", "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -634,11 +655,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1766125104, "lastModified": 1767364772,
"narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=", "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7d853e518814cca2a657b72eeba67ae20ebf7059", "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -706,6 +727,27 @@
"type": "github" "type": "github"
} }
}, },
"nur": {
"inputs": {
"flake-parts": "flake-parts_3",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1767559091,
"narHash": "sha256-10jdeDPosempcHzHqYHOcZ6ui/EYksodwByy0M2OnN0=",
"owner": "nix-community",
"repo": "NUR",
"rev": "949638acbc19dfde0649efe5d684e1c154f7d52a",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
@@ -716,11 +758,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765016596, "lastModified": 1767281941,
"narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -741,7 +783,8 @@
"nixpkgs-stable-darwin": "nixpkgs-stable-darwin", "nixpkgs-stable-darwin": "nixpkgs-stable-darwin",
"nixpkgs-stable-nixos": "nixpkgs-stable-nixos", "nixpkgs-stable-nixos": "nixpkgs-stable-nixos",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nixvim": "nixvim" "nixvim": "nixvim",
"nur": "nur"
} }
}, },
"systems": { "systems": {

8
flake.nix
View File

@@ -31,12 +31,17 @@
url = "git+https://github.com/SteamClientHomebrew/Millennium?ref=legacy"; url = "git+https://github.com/SteamClientHomebrew/Millennium?ref=legacy";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nur = {
url = "github:nix-community/NUR";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { self, nixpkgs, home-manager, nixvim, millennium, hyprland, ... }@inputs: outputs = { self, nixpkgs, home-manager, nixvim, millennium, hyprland, nur, ... }@inputs:
let let
overlays = [ overlays = [
millennium.overlays.default millennium.overlays.default
nur.overlays.default
]; ];
personalEmail = "patrickcanal3@gmail.com"; personalEmail = "patrickcanal3@gmail.com";
mkSystem = import ./lib/mksystem.nix { mkSystem = import ./lib/mksystem.nix {
@@ -44,6 +49,7 @@
overlays overlays
nixvim nixvim
millennium millennium
nur
inputs; inputs;
}; };
in in

4
lib/mksystem.nix
View File

@@ -3,6 +3,7 @@
overlays, overlays,
nixvim, nixvim,
millennium, millennium,
nur,
inputs, inputs,
}: }:
name: name:
@@ -72,6 +73,7 @@ let
isDarwin = isDarwin; isDarwin = isDarwin;
nixvim = nixvim; nixvim = nixvim;
millennium = millennium; millennium = millennium;
nur = nur;
inputs = inputs; inputs = inputs;
}; };
in in
@@ -86,6 +88,8 @@ systemFunc {
systemPackages systemPackages
nix-homebrew nix-homebrew
nix-homebrew-config nix-homebrew-config
nur.modules.nixos.default
nur.legacyPackages."${system}".repos.iopq.modules.xraya
home-manager.home-manager home-manager.home-manager
{ {
home-manager.backupFileExtension = "backup"; home-manager.backupFileExtension = "backup";

2
machines/katana/boot.nix
View File

@@ -4,5 +4,5 @@
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.loader.systemd-boot.configurationLimit = 10; boot.loader.systemd-boot.configurationLimit = 10;
boot.initrd.luks.devices."luks-332a07bd-65fb-4d91-91ba-fe3f594063b1".device = "/dev/disk/by-uuid/332a07bd-65fb-4d91-91ba-fe3f594063b1"; boot.initrd.luks.devices."luks-332a07bd-65fb-4d91-91ba-fe3f594063b1".device = "/dev/disk/by-uuid/332a07bd-65fb-4d91-91ba-fe3f594063b1";
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_zen; # pkgs.linuxPackages_latest;
} }

8
machines/katana/networking.nix
View File

@@ -1,8 +1,12 @@
{ ... }: { ... }:
{ {
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
networking.firewall.allowedUDPPorts = [ 25565 ]; networking.firewall = {
networking.firewall.allowedTCPPorts = [ 25565 ]; checkReversePath = false;
allowedUDPPorts = [ 25565 1194 ];
allowedTCPPorts = [ 25565 443 ];
};
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true; hardware.bluetooth.powerOnBoot = true;
networking.wireguard.enable = true;
} }

7
machines/katana/virtualisation.nix
View File

@@ -1,8 +1,9 @@
{ currentSystemUser, ... }: { currentSystemUser, ... }:
{ {
virtualisation.podman.enable = true; # virtualisation.podman.enable = true;
virtualisation.podman.dockerCompat = true; # virtualisation.podman.dockerCompat = true;
virtualisation.docker.enable = true;
#
programs.virt-manager.enable = true; programs.virt-manager.enable = true;
users.groups.libvirtd.members = ["${currentSystemUser}"]; users.groups.libvirtd.members = ["${currentSystemUser}"];
virtualisation.libvirtd.enable = true; virtualisation.libvirtd.enable = true;

7
modules/nix-config/default.nix
View File

@@ -35,9 +35,14 @@
users.users.${currentSystemUser} = { users.users.${currentSystemUser} = {
isNormalUser = true; isNormalUser = true;
description = "Patrick Canal"; description = "Patrick Canal";
extraGroups = [ "networkmanager" "wheel" "docker" ]; extraGroups = [ "networkmanager" "wheel" "docker" "nordvpn" ];
shell = pkgs.fish; shell = pkgs.fish;
}; };
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
nixpkgs.config.packageOverrides = pkgs: {
nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/main.tar.gz") {
inherit pkgs;
};
};
} }

15
modules/nordvpn.nix Normal file
View File

@@ -0,0 +1,15 @@
{ pkgs, nur, ... } @ inputs:
{
imports = [
inputs.nur.modules.nixos.default
inputs.nur.legacyPackages.x86_64-linux.repos.wingej0.modules.nordvpn
];
nixpkgs.overlays = [
(final: prev: {
nordvpn = pkgs.nur.repos.wingej0.nordvpn;
})
];
services.nordvpn.enable = true;
}

9
modules/packages.nix
View File

@@ -1,5 +1,9 @@
{ pkgs, gamingSystem, workSystem, currentSystemDe, ... }@ inputs: { pkgs, nur, gamingSystem, workSystem, currentSystemDe, ... }@ inputs:
{ {
imports = [
./nordvpn.nix
];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# CLI utils # CLI utils
appimage-run appimage-run
@@ -59,6 +63,7 @@
++ (if gamingSystem then [ ++ (if gamingSystem then [
archipelago archipelago
cura-appimage cura-appimage
discord
dolphin-emu dolphin-emu
ftb-app ftb-app
heroic heroic
@@ -68,7 +73,6 @@
openrgb openrgb
prismlauncher prismlauncher
protonplus protonplus
vesktop
xenia-canary xenia-canary
] else []) ] else [])
++ (if workSystem then [ ++ (if workSystem then [
@@ -106,5 +110,4 @@
programs.nh = { programs.nh = {
enable = true; enable = true;
}; };
} }