diff --git a/flake.lock b/flake.lock index 7d3bf87..f578875 100644 --- a/flake.lock +++ b/flake.lock @@ -177,17 +177,17 @@ ] }, "locked": { - "lastModified": 1681468923, - "narHash": "sha256-+X2oO4juRVhQRs002mn8km6PODccIRiz09c2K1xtSpY=", + "lastModified": 1681586242, + "narHash": "sha256-2TPuYRCm+snJgZTH2yw4VEXUyYRugir69I1uS5uONx0=", "owner": "nix-community", "repo": "home-manager", - "rev": "17198cf5ae27af5b647c7dac58d935a7d0dbd189", + "rev": "75f4f362e1b5ebdc4076fcbdb4188b4fd736187c", "type": "github" }, "original": { "owner": "nix-community", "repo": "home-manager", - "rev": "17198cf5ae27af5b647c7dac58d935a7d0dbd189", + "rev": "75f4f362e1b5ebdc4076fcbdb4188b4fd736187c", "type": "github" } }, @@ -215,11 +215,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1684068895, - "narHash": "sha256-1oSX5LQmSl/lcpPdM+NG2TlLynFmVbubNeIoSF1Mmv0=", + "lastModified": 1684610121, + "narHash": "sha256-mp1wfJ4VkMgK/yex4jeBhd2yd6CqFXYAIv6e1lnDGjI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "7c207243e41b5b4f35d790767ad2e21eba1b7a0b", + "rev": "5627b70981730cf1839ae4477f9fd086d4fc7a6c", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1683569252, - "narHash": "sha256-BDbn3GhCbS/g3fYaIGXd+22q+SISjUxWzX/aCxx83vY=", + "lastModified": 1684265311, + "narHash": "sha256-zFOShOYS7zMcyCT9bFQlWB/ZtTelAFKKGUq4XBRQLE0=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "3596630a207a02a0035a0a178a1fdbf2a5f40a30", + "rev": "b82254e957cfa60124240e8d94e7368cbf6d392d", "type": "github" }, "original": { @@ -277,11 +277,11 @@ ] }, "locked": { - "lastModified": 1682442456, - "narHash": "sha256-H2+bOfeSpxAyDSWRmtGJNSCvbV9xlryYRVWj6yzBl/c=", + "lastModified": 1684177642, + "narHash": "sha256-WUYUKvmlVsrgFf7kDc7s/FeCF3CsEZU/5tgqbYd1sgY=", "owner": "JulienMalka", "repo": "Linkal", - "rev": "1c42e4c7b83835a8a81a85d09ced9cf8350c83d8", + "rev": "4db8e2d9f51c96ae537bfd31fb52467ffb7b86a3", "type": "github" }, "original": { @@ -291,10 +291,34 @@ "type": "github" } }, + "nil": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "unstable" + ], + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1684534870, + "narHash": "sha256-QrOkY6Ei/7FZg50Ht8iC9ryqrQyBzjtnSQoftL8ZNNc=", + "owner": "oxalica", + "repo": "nil", + "rev": "17ed1578f3a225f2760d4da3adb440eb8677f2d3", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "nil", + "type": "github" + } + }, "nixos-apple-silicon": { "inputs": { "nixpkgs": "nixpkgs_3", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay_3" }, "locked": { "lastModified": 1683434835, @@ -328,11 +352,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1674641431, - "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", + "lastModified": 1683014792, + "narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc", + "rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42", "type": "github" }, "original": { @@ -360,11 +384,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1683928319, - "narHash": "sha256-maz0DRKixJVcNRMiAMWlJniiF8IuQ+WbfmlJJ8D+jfM=", + "lastModified": 1684398685, + "narHash": "sha256-TRE62m91iZ5ArVMgA+uj22Yda8JoQuuhc9uwZ+NoX+0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9656e85a15a0fe67847ee8cdb99a20d8df499962", + "rev": "628d4bb6e9f4f0c30cfd9b23d3c1cdcec9d3cb5c", "type": "github" }, "original": { @@ -385,6 +409,7 @@ "hyprland": "hyprland", "hyprpaper": "hyprpaper", "linkal": "linkal", + "nil": "nil", "nixos-apple-silicon": "nixos-apple-silicon", "nixpkgs": "nixpkgs_4", "simple-nixos-mailserver": "simple-nixos-mailserver", @@ -420,6 +445,31 @@ } }, "rust-overlay_2": { + "inputs": { + "flake-utils": [ + "nil", + "flake-utils" + ], + "nixpkgs": [ + "nil", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1682907601, + "narHash": "sha256-FfUAYvRJ+6s9WWjXNPdRzuuvAeu2VHIXIbUkPJr4t14=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "5eaff055dd57128c53ae373dc96af944f5849daa", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { "flake": false, "locked": { "lastModified": 1675132198, @@ -473,11 +523,11 @@ ] }, "locked": { - "lastModified": 1684032930, - "narHash": "sha256-ueeSYDii2e5bkKrsSdP12JhkW9sqgYrUghLC8aDfYGQ=", + "lastModified": 1684571352, + "narHash": "sha256-342PCrDSZ70qVX5hwz1M0cYNBdEcIBVzxyjrU/Um3RU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a376127bb5277cd2c337a9458744f370aaf2e08d", + "rev": "df8b52249e78a0ac33680c9e0b7a029ec22cd8f5", "type": "github" }, "original": { @@ -503,11 +553,11 @@ }, "unstable": { "locked": { - "lastModified": 1684049129, - "narHash": "sha256-7WB9LpnPNAS8oI7hMoHeKLNhRX7k3CI9uWBRSfmOCCE=", + "lastModified": 1684570954, + "narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0470f36b02ef01d4f43c641bbf07020bcab71bf1", + "rev": "3005f20ce0aaa58169cdee57c8aa12e5f1b6e1b3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4430a84..6011467 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ }; home-manager-unstable = { - url = "github:nix-community/home-manager/17198cf5ae27af5b647c7dac58d935a7d0dbd189"; + url = "github:nix-community/home-manager/75f4f362e1b5ebdc4076fcbdb4188b4fd736187c"; inputs.nixpkgs.follows = "unstable"; }; @@ -69,6 +69,12 @@ inputs.flake-utils.follows = "flake-utils"; }; + nil = { + url = "github:oxalica/nil"; + inputs.flake-utils.follows = "flake-utils"; + inputs.nixpkgs.follows = "unstable"; + }; + }; outputs = { self, nixpkgs, deploy-rs, ... }@inputs: @@ -120,6 +126,7 @@ sshOpts = [ "-p" "45" ]; fastConnection = true; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.lisa; + magicRollback = false; }; }; @@ -133,6 +140,17 @@ }; }; + deploy.nodes.core-security = { + hostname = "192.168.1.49"; + profiles.system = { + sshUser = "root"; + sshOpts = [ "-p" "45" ]; + fastConnection = true; + path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.core-security; + }; + }; + + deploy.nodes.tower = { hostname = "tower.julienmalka.me"; diff --git a/home-manager-modules/neovim/default.nix b/home-manager-modules/neovim/default.nix index 760768b..a0d3745 100644 --- a/home-manager-modules/neovim/default.nix +++ b/home-manager-modules/neovim/default.nix @@ -126,7 +126,7 @@ with lib; rust-vim ]; - extraPackages = with pkgs; [ rust-analyzer pkgs.unstable.nil pyright nixpkgs-fmt ormolu ccls gopls ]; + extraPackages = with pkgs; [ rust-analyzer pkgs.nil pyright nixpkgs-fmt ormolu ccls gopls ]; extraConfig = '' luafile ${./settings.lua} diff --git a/lib/default.nix b/lib/default.nix index 6642d88..2175d7c 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -56,6 +56,7 @@ in mosh = prev.unstable.mosh; hyprpaper = inputs.hyprpaper.packages.${system}.default; attic = inputs.attic.packages.${system}.default; + nil = inputs.nil.packages.${system}.default; }) ]; }