xqtc/nixos-config
1
0
Fork 0
mirror of https://git.gay/xqtc/nixos-config synced 2024-11-22 19:40:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

switch from lix flake input to lix from nixpkgs; nix flake update

Browse source
This commit is contained in:
xqtc 2024-07-21 18:10:32 +02:00
parent 591c349c85
commit 317a6526bf
4 changed files with 45 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/default.nix
View file

@ -26,6 +26,8 @@
networking.firewall.allowedTCPPorts = [8384 22000]; networking.firewall.allowedTCPPorts = [8384 22000];
networking.firewall.allowedUDPPorts = [22000 21027]; networking.firewall.allowedUDPPorts = [22000 21027];
nix.package = pkgs.lix;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
sops sops
tldr tldr
@ -38,6 +40,8 @@
package = pkgs.nix-ld-rs; package = pkgs.nix-ld-rs;
}; };
services.tailscale.enable = true;
nix.settings = { nix.settings = {
trusted-users = ["xqtc"]; trusted-users = ["xqtc"];
substituters = [ substituters = [

68
flake.lock
View file

@ -7,11 +7,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1720977090, "lastModified": 1721441154,
"narHash": "sha256-O9S9kbZTAAeZz+R7cDY5FQsqsLD3SloD8eEg6BFx0G0=", "narHash": "sha256-LHZtBq31ViF1lkZ8Hnp2Y0ypUMIhVzgp2ZCVCOmO0Do=",
"owner": "tpwrules", "owner": "tpwrules",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"rev": "6015c1e2f91896e0b7a983c2824c665af32f568a", "rev": "d3fed6f02e05aee529c95efd402ebb259463f1a6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -105,11 +105,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1721188984, "lastModified": 1721463311,
"narHash": "sha256-muLvm4TcNtZtbC71vWpJT84do8xxcX2JDbwZ/GBCbIM=", "narHash": "sha256-zmvqafJogm5DJ8+2v/kE9Oj8AGzK7IBOdMSIPZyKuNk=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "fe4e311097bb57450231e603d7a99f96d147e456", "rev": "863eb5594f8c375d1ddaa2cea84a819c5197dd76",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -360,11 +360,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721135958, "lastModified": 1721534365,
"narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", "narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", "rev": "635563f245309ef5320f80c7ebcb89b2398d2949",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -512,11 +512,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1720737798, "lastModified": 1721413321,
"narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", "narHash": "sha256-0GdiQScDceUrVGbxYpV819LHesK3szHOhJ09e6sgES4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", "rev": "ab165a8a6cd12781d76fe9cbccb9e975d0fb634f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -528,27 +528,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1720542800, "lastModified": 1721379653,
"narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "feb2849fdeb70028c70d73b848214b00d324a497", "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "feb2849fdeb70028c70d73b848214b00d324a497",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-2405": { "nixpkgs-2405": {
"locked": { "locked": {
"lastModified": 1720954236, "lastModified": 1721409541,
"narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", "narHash": "sha256-b6PLr0Ty7JPDBtJtjnYzlBf02bbH9alWMAgispMkTwk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", "rev": "0c53b6b8c2a3e46c68e04417e247bba660689c9d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -560,11 +560,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1721210484, "lastModified": 1721571961,
"narHash": "sha256-QppHmSS4JGlKHuZku1M8rvkUcosi8GRSrWa/hFAzF80=", "narHash": "sha256-jfF4gpRUpTBY2OxDB0FRySsgNGOiuDckEtu7YDQom3Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e5e12391d9dd8a351562938b6cf3fa215a34a2ac", "rev": "4cc8b29327bed3d52b40041f810f49734298af46",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -576,11 +576,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1720915306, "lastModified": 1721524707,
"narHash": "sha256-6vuViC56+KSr+945bCV8akHK+7J5k6n/epYg/W3I5eQ=", "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "74348da2f3a312ee25cea09b98cdba4cb9fa5d5d", "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -640,11 +640,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1720957393, "lastModified": 1721379653,
"narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -715,11 +715,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1721042250, "lastModified": 1721571110,
"narHash": "sha256-CEOGzI9WFGezwJ3lok0F//1UEq5crzE2kZDLQK2EtfE=", "narHash": "sha256-W4KLBlN3g5fABz1Hv/O9Vwq0mFwY3XYuAyGLege1tVM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "b9ed90003273f0a75151b32948e16b44891f403c", "rev": "8eb5763bbbb414c432ced741c5fe8052154d0816",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -817,11 +817,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1720926522, "lastModified": 1721531171,
"narHash": "sha256-eTpnrT6yu1vp8C0B5fxHXhgKxHoYMoYTEikQx///jxY=", "narHash": "sha256-AsvPw7T0tBLb53xZGcUC3YPqlIpdxoSx56u8vPCr6gU=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "0703ba03fd9c1665f8ab68cc3487302475164617", "rev": "909e8cfb60d83321d85c8d17209d733658a21c95",
"type": "github" "type": "github"
}, },
"original": { "original": {

9
flake.nix
View file

@ -64,23 +64,22 @@
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./hosts/x86_64-linux/asmodeus ./hosts/x86_64-linux/asmodeus
lix-module.nixosModules.default
]; ];
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;};
}; };
"seraphim" = lib.nixosSystem { "seraphim" = lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [./hosts/x86_64-linux/seraphim lix-module.nixosModules.default]; modules = [./hosts/x86_64-linux/seraphim ];
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;};
}; };
"lilith" = lib.nixosSystem { "lilith" = lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [./hosts/x86_64-linux/lilith lix-module.nixosModules.default]; modules = [./hosts/x86_64-linux/lilith ];
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;};
}; };
"lambda" = lib.nixosSystem { "lambda" = lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [./hosts/x86_64-linux/lambda lix-module.nixosModules.default]; modules = [./hosts/x86_64-linux/lambda ];
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;};
}; };
"beleth" = lib.nixosSystem { "beleth" = lib.nixosSystem {
@ -90,7 +89,7 @@
}; };
"alastor" = lib.nixosSystem { "alastor" = lib.nixosSystem {
system = "aarch64-linux"; system = "aarch64-linux";
modules = [./hosts/aarch64-linux/alastor {nixpkgs.overlays = [inputs.nixos-aarch64-widevine.overlays.default];} lix-module.nixosModules.default]; modules = [./hosts/aarch64-linux/alastor {nixpkgs.overlays = [inputs.nixos-aarch64-widevine.overlays.default];} ];
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;};
}; };
}; };

6
home/modules/nixvim.nix
View file

@ -429,17 +429,17 @@
{ {
mode = "n"; mode = "n";
key = "<leader>P"; key = "<leader>P";
action = ''"+p''; action = ''"+P'';
} }
{ {
mode = ["n" "v"]; mode = ["n" "v"];
key = "<leader>y"; key = "<leader>y";
action = ''[["+y]]''; action = ''"+y'';
} }
{ {
mode = ["n"]; mode = ["n"];
key = "<leader>Y"; key = "<leader>Y";
action = ''[["+Y]]''; action = ''"+Y'';
} }
{ {
mode = ["n"]; mode = ["n"];