diff --git a/flake.lock b/flake.lock index 20a055f..57d3c20 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1764714051, - "narHash": "sha256-AjcMlM3UoavFoLzr0YrcvsIxALShjyvwe+o7ikibpCM=", + "lastModified": 1767024902, + "narHash": "sha256-sMdk6QkMDhIOnvULXKUM8WW8iyi551SWw2i6KQHbrrU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a43bedcceced5c21ad36578ed823e6099af78214", + "rev": "b8a0c5ba5a9fbd2c660be7dd98bdde0ff3798556", "type": "github" }, "original": { @@ -36,15 +36,15 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -89,6 +89,27 @@ "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": { "inputs": { "systems": "systems_2" @@ -136,11 +157,11 @@ ] }, "locked": { - "lastModified": 1766171975, - "narHash": "sha256-47Ee0bTidhF/3/sHuYnWRuxcCrrm0mBNDxBkOTd3wWQ=", + "lastModified": 1767515539, + "narHash": "sha256-4fHDswBZac5vE8WA9qczUgPo3TvJVF9uOvcXhPpnqJ0=", "owner": "nix-community", "repo": "home-manager", - "rev": "bb35f07cc95a73aacbaf1f7f46bb8a3f40f265b5", + "rev": "12cc14271b250b2b46bf681352da91a8d2efec26", "type": "github" }, "original": { @@ -198,11 +219,11 @@ ] }, "locked": { - "lastModified": 1766171975, - "narHash": "sha256-47Ee0bTidhF/3/sHuYnWRuxcCrrm0mBNDxBkOTd3wWQ=", + "lastModified": 1767515539, + "narHash": "sha256-4fHDswBZac5vE8WA9qczUgPo3TvJVF9uOvcXhPpnqJ0=", "owner": "nix-community", "repo": "home-manager", - "rev": "bb35f07cc95a73aacbaf1f7f46bb8a3f40f265b5", + "rev": "12cc14271b250b2b46bf681352da91a8d2efec26", "type": "github" }, "original": { @@ -256,11 +277,11 @@ ] }, "locked": { - "lastModified": 1763733840, - "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=", + "lastModified": 1766946335, + "narHash": "sha256-MRD+Jr2bY11MzNDfenENhiK6pvN+nHygxdHoHbZ1HtE=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a", + "rev": "4af02a3925b454deb1c36603843da528b67ded6c", "type": "github" }, "original": { @@ -286,11 +307,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1766160862, - "narHash": "sha256-rEOiUTknr+/t9p6C9o2UH2sK98h3HqeiYj7UydqiZn4=", + "lastModified": 1767474766, + "narHash": "sha256-Vkl6ta0Jaim6MvbNKfhb5GR/FtW3NyMRXyioBH1rcC0=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "315806f59816aacdbf7c66aaeaa0e49d3a33a66d", + "rev": "583c4074a5d4229f841d9e470ab427339773b592", "type": "github" }, "original": { @@ -332,11 +353,11 @@ ] }, "locked": { - "lastModified": 1764812575, - "narHash": "sha256-1bK1yGgaR82vajUrt6z+BSljQvFn91D74WJ/vJsydtE=", + "lastModified": 1767023960, + "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "fd321368a40c782cfa299991e5584ca338e36ebe", + "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660", "type": "github" }, "original": { @@ -357,11 +378,11 @@ ] }, "locked": { - "lastModified": 1759610243, - "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=", + "lastModified": 1765214753, + "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622", + "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab", "type": "github" }, "original": { @@ -463,11 +484,11 @@ ] }, "locked": { - "lastModified": 1764962281, - "narHash": "sha256-rGbEMhTTyTzw4iyz45lch5kXseqnqcEpmrHdy+zHsfo=", + "lastModified": 1766253372, + "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "fe686486ac867a1a24f99c753bb40ffed338e4b0", + "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9", "type": "github" }, "original": { @@ -517,11 +538,11 @@ ] }, "locked": { - "lastModified": 1764872015, - "narHash": "sha256-INI9AVrQG5nJZFvGPSiUZ9FEUZJLfGdsqjF1QSak7Gc=", + "lastModified": 1767473322, + "narHash": "sha256-RGOeG+wQHeJ6BKcsSB8r0ZU77g9mDvoQzoTKj2dFHwA=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "7997451dcaab7b9d9d442f18985d514ec5891608", + "rev": "d5e7d6b49fe780353c1cf9a1cf39fa8970bd9d11", "type": "github" }, "original": { @@ -555,11 +576,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { @@ -618,11 +639,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1766125104, - "narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=", + "lastModified": 1767364772, + "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7d853e518814cca2a657b72eeba67ae20ebf7059", + "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", "type": "github" }, "original": { @@ -634,11 +655,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1766125104, - "narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=", + "lastModified": 1767364772, + "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7d853e518814cca2a657b72eeba67ae20ebf7059", + "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", "type": "github" }, "original": { @@ -706,6 +727,27 @@ "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": { "inputs": { "flake-compat": "flake-compat", @@ -716,11 +758,11 @@ ] }, "locked": { - "lastModified": 1765016596, - "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", + "lastModified": 1767281941, + "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", + "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", "type": "github" }, "original": { @@ -741,7 +783,8 @@ "nixpkgs-stable-darwin": "nixpkgs-stable-darwin", "nixpkgs-stable-nixos": "nixpkgs-stable-nixos", "nixpkgs-unstable": "nixpkgs-unstable", - "nixvim": "nixvim" + "nixvim": "nixvim", + "nur": "nur" } }, "systems": { diff --git a/flake.nix b/flake.nix index 2d72ea7..9b78cff 100644 --- a/flake.nix +++ b/flake.nix @@ -31,12 +31,17 @@ url = "git+https://github.com/SteamClientHomebrew/Millennium?ref=legacy"; 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 overlays = [ millennium.overlays.default + nur.overlays.default ]; personalEmail = "patrickcanal3@gmail.com"; mkSystem = import ./lib/mksystem.nix { @@ -44,6 +49,7 @@ overlays nixvim millennium + nur inputs; }; in diff --git a/lib/mksystem.nix b/lib/mksystem.nix index 6d2d764..3c1a652 100644 --- a/lib/mksystem.nix +++ b/lib/mksystem.nix @@ -3,6 +3,7 @@ overlays, nixvim, millennium, + nur, inputs, }: name: @@ -72,6 +73,7 @@ let isDarwin = isDarwin; nixvim = nixvim; millennium = millennium; + nur = nur; inputs = inputs; }; in @@ -86,6 +88,8 @@ systemFunc { systemPackages nix-homebrew nix-homebrew-config + nur.modules.nixos.default + nur.legacyPackages."${system}".repos.iopq.modules.xraya home-manager.home-manager { home-manager.backupFileExtension = "backup"; diff --git a/machines/katana/boot.nix b/machines/katana/boot.nix index 3ad2680..3d718f9 100644 --- a/machines/katana/boot.nix +++ b/machines/katana/boot.nix @@ -4,5 +4,5 @@ boot.loader.efi.canTouchEfiVariables = true; 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.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = pkgs.linuxPackages_zen; # pkgs.linuxPackages_latest; } diff --git a/machines/katana/networking.nix b/machines/katana/networking.nix index e336fae..a776157 100644 --- a/machines/katana/networking.nix +++ b/machines/katana/networking.nix @@ -1,8 +1,12 @@ { ... }: { networking.networkmanager.enable = true; - networking.firewall.allowedUDPPorts = [ 25565 ]; - networking.firewall.allowedTCPPorts = [ 25565 ]; + networking.firewall = { + checkReversePath = false; + allowedUDPPorts = [ 25565 1194 ]; + allowedTCPPorts = [ 25565 443 ]; + }; hardware.bluetooth.enable = true; hardware.bluetooth.powerOnBoot = true; + networking.wireguard.enable = true; } diff --git a/machines/katana/virtualisation.nix b/machines/katana/virtualisation.nix index 892aa0f..7bb0401 100644 --- a/machines/katana/virtualisation.nix +++ b/machines/katana/virtualisation.nix @@ -1,8 +1,9 @@ { currentSystemUser, ... }: { - virtualisation.podman.enable = true; - virtualisation.podman.dockerCompat = true; - + # virtualisation.podman.enable = true; + # virtualisation.podman.dockerCompat = true; + virtualisation.docker.enable = true; + # programs.virt-manager.enable = true; users.groups.libvirtd.members = ["${currentSystemUser}"]; virtualisation.libvirtd.enable = true; diff --git a/modules/nix-config/default.nix b/modules/nix-config/default.nix index 4e09d84..631de86 100644 --- a/modules/nix-config/default.nix +++ b/modules/nix-config/default.nix @@ -35,9 +35,14 @@ users.users.${currentSystemUser} = { isNormalUser = true; description = "Patrick Canal"; - extraGroups = [ "networkmanager" "wheel" "docker" ]; + extraGroups = [ "networkmanager" "wheel" "docker" "nordvpn" ]; shell = pkgs.fish; }; 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; + }; + }; } diff --git a/modules/nordvpn.nix b/modules/nordvpn.nix new file mode 100644 index 0000000..9c82ed7 --- /dev/null +++ b/modules/nordvpn.nix @@ -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; + +} diff --git a/modules/packages.nix b/modules/packages.nix index a5b7472..d67178c 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -1,5 +1,9 @@ -{ pkgs, gamingSystem, workSystem, currentSystemDe, ... }@ inputs: +{ pkgs, nur, gamingSystem, workSystem, currentSystemDe, ... }@ inputs: { + imports = [ + ./nordvpn.nix + ]; + environment.systemPackages = with pkgs; [ # CLI utils appimage-run @@ -59,6 +63,7 @@ ++ (if gamingSystem then [ archipelago cura-appimage + discord dolphin-emu ftb-app heroic @@ -68,7 +73,6 @@ openrgb prismlauncher protonplus - vesktop xenia-canary ] else []) ++ (if workSystem then [ @@ -106,5 +110,4 @@ programs.nh = { enable = true; }; - }