Luj/snowfield
1
0
Fork 0
mirror of https://github.com/JulienMalka/snowfield.git synced 2025-04-02 10:10:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of github.com:JulienMalka/nix-config

Browse source
This commit is contained in:
Julien Malka 2023-06-02 07:29:17 +02:00
commit 781e6f6f51
Signed by: Luj
GPG key ID: 6FC74C847011FD83
4 changed files with 135 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

171
flake.lock generated
View file

@ -15,11 +15,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1683433501, "lastModified": 1685309025,
"narHash": "sha256-9L+OZeU3bcNZ55mhMINBxnqskbaEU0mhiZIMhkEtNl0=", "narHash": "sha256-pZxMM3AMP/ojwhrFD0A2ML4NOgehlBLGHseInnO5evc=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "attic", "repo": "attic",
"rev": "5f85e35a25085b75e1cbb6cc7291726fa4fab2ed", "rev": "b1fb790b5f2afaaa1b2f7f18979b8318abe604bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -130,16 +130,32 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1685518550,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401", "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -215,11 +231,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1684610121, "lastModified": 1685632091,
"narHash": "sha256-mp1wfJ4VkMgK/yex4jeBhd2yd6CqFXYAIv6e1lnDGjI=", "narHash": "sha256-RAfDARolNWT4ZF8IH6WwVd2s0jMuaA9zUPeb+I8/L1A=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "5627b70981730cf1839ae4477f9fd086d4fc7a6c", "rev": "9cf72a30fc040f0bd2fb4651ec7f8e82df962278",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -236,11 +252,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1681065697, "lastModified": 1684265364,
"narHash": "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=", "narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "4d29e48433270a2af06b8bc711ca1fe5109746cd", "rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -254,11 +270,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1684265311, "lastModified": 1685378141,
"narHash": "sha256-zFOShOYS7zMcyCT9bFQlWB/ZtTelAFKKGUq4XBRQLE0=", "narHash": "sha256-/ehJbAtSJS86NlqHVOeR2ViBKlImKH4guFVPacTmCr8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprpaper", "repo": "hyprpaper",
"rev": "b82254e957cfa60124240e8d94e7368cbf6d392d", "rev": "cd86c196f3500f20539754d347c8378349ca0974",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -291,6 +307,22 @@
"type": "github" "type": "github"
} }
}, },
"lowdown-src": {
"flake": false,
"locked": {
"lastModified": 1633514407,
"narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
"owner": "kristapsdz",
"repo": "lowdown",
"rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
"type": "github"
},
"original": {
"owner": "kristapsdz",
"repo": "lowdown",
"type": "github"
}
},
"nil": { "nil": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@ -302,11 +334,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1684534870, "lastModified": 1685532165,
"narHash": "sha256-QrOkY6Ei/7FZg50Ht8iC9ryqrQyBzjtnSQoftL8ZNNc=", "narHash": "sha256-xHH9WbE9uya2B+j5w82HzpZVeErBt03/jtmWVRox0EU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "nil", "repo": "nil",
"rev": "17ed1578f3a225f2760d4da3adb440eb8677f2d3", "rev": "dcd38b96c91a2d07552f824a6480e00dc7b4948a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -315,9 +347,31 @@
"type": "github" "type": "github"
} }
}, },
"nix-rfc-92": {
"inputs": {
"flake-compat": "flake-compat_3",
"lowdown-src": "lowdown-src",
"nixpkgs": "nixpkgs_3",
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
"lastModified": 1684431887,
"narHash": "sha256-8OseET429kYImX6QRoJXxGd1B/6/Ju7IRQQ7MlsZeCE=",
"owner": "obsidiansystems",
"repo": "nix",
"rev": "4f650501586104017d73cbfe41763c0fdf6d9e30",
"type": "github"
},
"original": {
"owner": "obsidiansystems",
"ref": "dynamic-drvs",
"repo": "nix",
"type": "github"
}
},
"nixos-apple-silicon": { "nixos-apple-silicon": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_4",
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_3"
}, },
"locked": { "locked": {
@ -336,11 +390,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1683014792, "lastModified": 1685383865,
"narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=", "narHash": "sha256-3uQytfnotO6QJv3r04ajSXbEFMII0dUtw0uqYlZ4dbk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42", "rev": "5e871d8aa6f57cc8e0dc087d1c5013f6e212b4ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -350,6 +404,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-regression": {
"locked": {
"lastModified": 1643052045,
"narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1683014792, "lastModified": 1683014792,
@ -367,6 +437,22 @@
} }
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": {
"lastModified": 1670461440,
"narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.11-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1683286087, "lastModified": 1683286087,
"narHash": "sha256-xseOd7W7xwF5GOF2RW8qhjmVGrKoBz+caBlreaNzoeI=", "narHash": "sha256-xseOd7W7xwF5GOF2RW8qhjmVGrKoBz+caBlreaNzoeI=",
@ -382,13 +468,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1684398685, "lastModified": 1685468986,
"narHash": "sha256-TRE62m91iZ5ArVMgA+uj22Yda8JoQuuhc9uwZ+NoX+0=", "narHash": "sha256-YSj3K71KjRZgeL0hS3sYLYHI0g8aIVIf9lcsRMCIW2A=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "628d4bb6e9f4f0c30cfd9b23d3c1cdcec9d3cb5c", "rev": "9af373a61647257d16ae6062cddaa9094d24920c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -410,8 +496,9 @@
"hyprpaper": "hyprpaper", "hyprpaper": "hyprpaper",
"linkal": "linkal", "linkal": "linkal",
"nil": "nil", "nil": "nil",
"nix-rfc-92": "nix-rfc-92",
"nixos-apple-silicon": "nixos-apple-silicon", "nixos-apple-silicon": "nixos-apple-silicon",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_5",
"simple-nixos-mailserver": "simple-nixos-mailserver", "simple-nixos-mailserver": "simple-nixos-mailserver",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"unstable": "unstable" "unstable": "unstable"
@ -456,11 +543,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682907601, "lastModified": 1685413459,
"narHash": "sha256-FfUAYvRJ+6s9WWjXNPdRzuuvAeu2VHIXIbUkPJr4t14=", "narHash": "sha256-+ELexqS2yN0wj1WnmWdF24OfjRBIgTN6Ltcpjvp2dEo=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "5eaff055dd57128c53ae373dc96af944f5849daa", "rev": "9b3284e2412f76bd68ff46f8cf1c7af44d7ffac0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -523,11 +610,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1684571352, "lastModified": 1685434555,
"narHash": "sha256-342PCrDSZ70qVX5hwz1M0cYNBdEcIBVzxyjrU/Um3RU=", "narHash": "sha256-aZl0yeaYX3T2L3W3yXOd3S9OfpS+8YUOT2b1KwrSf6E=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "df8b52249e78a0ac33680c9e0b7a029ec22cd8f5", "rev": "876846cde9762ae563f018c17993354875e2538e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -553,11 +640,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1684570954, "lastModified": 1685564631,
"narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=", "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3005f20ce0aaa58169cdee57c8aa12e5f1b6e1b3", "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -586,11 +673,11 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1682436395, "lastModified": 1685491729,
"narHash": "sha256-GGEjkQO9m7YLYIXIXM76HWdhjg4Ye+oafOtyaFAYKI4=", "narHash": "sha256-YfpP8tKpcr0Lxlr3PdoMaY3GD/uJRl6E5pp5KQCEuzg=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "6830bfc17fd94709e2cdd4da0af989f102a26e59", "rev": "3f0487d310974f6ff889ca80e4fb4005553814ed",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -612,11 +699,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682439384, "lastModified": 1685385764,
"narHash": "sha256-zHDa8LCZs05TZHQSIZ3ucwyMPglBGHcqTBzfkLjYXTM=", "narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "c0e233955568fbea4e859336f6d3d14d51294d7c", "rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View file

@ -75,6 +75,8 @@
inputs.nixpkgs.follows = "unstable"; inputs.nixpkgs.follows = "unstable";
}; };
nix-rfc-92.url = "github:obsidiansystems/nix/dynamic-drvs";
}; };
outputs = { self, nixpkgs, deploy-rs, ... }@inputs: outputs = { self, nixpkgs, deploy-rs, ... }@inputs:
@ -177,6 +179,8 @@
}) })
machines_plats); machines_plats);
lol = import ./lol.nix nixpkgs_plats.x86_64-linux nixosConfigurations.lisa.config.system.build.toplevel.drvPath;
hydraJobs = { hydraJobs = {
machines.tower = self.nixosConfigurations.tower.config.system.build.toplevel; machines.tower = self.nixosConfigurations.tower.config.system.build.toplevel;

1
home-manager-modules/ssh-client/default.nix
View file

@ -53,6 +53,7 @@ with lib;
curry = { curry = {
hostname = "vms.julienmalka.me"; hostname = "vms.julienmalka.me";
user = "julien"; user = "julien";
port = 60;
}; };
mails = { mails = {
hostname = "192.168.1.78"; hostname = "192.168.1.78";

1
lib/default.nix
View file

@ -58,6 +58,7 @@ in
attic = inputs.attic.packages.${system}.default; attic = inputs.attic.packages.${system}.default;
nil = inputs.nil.packages.${system}.default; nil = inputs.nil.packages.${system}.default;
keycloak-keywind = prev.pkgs.callPackage ../packages/keycloak-keywind { }; keycloak-keywind = prev.pkgs.callPackage ../packages/keycloak-keywind { };
nix-rfc-92 = inputs.nix-rfc-92.packages.${system}.default;
}) })
]; ];
} }