diff --git a/flake.lock b/flake.lock index 9a2b0d0..4a20dba 100644 --- a/flake.lock +++ b/flake.lock @@ -105,9 +105,7 @@ "inputs": { "flake-compat": "flake-compat_2", "naersk": "naersk", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_2", "utils": "utils" }, "locked": { @@ -198,11 +196,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1662186434, - "narHash": "sha256-N867s0Z20q9LNirVftWoKAmkEARmmHXZHyRTEmekf94=", + "lastModified": 1674282107, + "narHash": "sha256-0wBK+1IMJdAkckR715ssMPFUhCAqRpRcppGwraiWREU=", "owner": "nix-community", "repo": "fenix", - "rev": "e228867146581fa5e4be25dafc0dd68fdd22f0ad", + "rev": "18fc1446c44e05165437c5900b95670166a09270", "type": "github" }, "original": { @@ -447,7 +445,7 @@ "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "wlroots": "wlroots", "xdph": "xdph" }, @@ -488,9 +486,7 @@ }, "hyprpaper": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1673799209, @@ -591,11 +587,11 @@ ] }, "locked": { - "lastModified": 1662220400, - "narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=", + "lastModified": 1671096816, + "narHash": "sha256-ezQCsNgmpUHdZANDCILm3RvtO1xH8uujk/+EqNvzIOg=", "owner": "nix-community", "repo": "naersk", - "rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3", + "rev": "d998160d6a076cfe8f9741e56aeec7e267e3e114", "type": "github" }, "original": { @@ -607,7 +603,7 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1633098935, @@ -656,9 +652,7 @@ "nixos-generators": { "inputs": { "nixlib": "nixlib", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1674666581, @@ -739,70 +733,21 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_10": { "locked": { - "lastModified": 1673540789, - "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", - "owner": "NixOS", + "lastModified": 1667318090, + "narHash": "sha256-AvxgT+t1BWZs8IfdseHl8+7wvWWm9pvysupMT9wXdH0=", + "owner": "serokell", "repo": "nixpkgs", - "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_22-11": { - "locked": { - "lastModified": 1674781052, - "narHash": "sha256-nseKFXRvmZ+BDAeWQtsiad+5MnvI/M2Ak9iAWzooWBw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "cc4bb87f5457ba06af9ae57ee4328a49ce674b1b", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1674890375, - "narHash": "sha256-KTFQ7AkKVLJPoGg1cRAekFDyvDPT8A6jGPAu1liFD74=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4fe4a0e8abadd05d9e81923c13531ab1476d6fd3", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1632864508, - "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "rev": "4bce79cf151aad3c0bed46a32bdb4b165f00cb7e", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-21.05-small", "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_11": { "locked": { "lastModified": 1670507980, "narHash": "sha256-riNZa0xzM1it3pzxciwALeMs+0CsBMWIW2FqulzK8vM=", @@ -818,20 +763,159 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1663235518, + "narHash": "sha256-q8zLK6rK/CLXEguaPgm9yQJcY0VQtOBhAT9EV2UFK/A=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2277e4c9010b0f27585eb0bed0a86d7cbc079354", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_22-11": { + "locked": { + "lastModified": 1674868155, + "narHash": "sha256-eFNm2h6fNbgD7ZpO4MHikCB5pSnCJ7DTmwPisjetmwc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ce20e9ebe1903ea2ba1ab006ec63093020c761cb", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1673540789, + "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1658826464, + "narHash": "sha256-94ZTF0uIX/iZdiD4RJ5f933ak/OM4XLl7hF+gCa4Iuk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ce49cb7792a7ffd65ef352dda1110a4e4a204eac", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1637186689, + "narHash": "sha256-NU7BhgnwA/3ibmCeSzFK6xGi+Bari9mPfn+4cBmyEjw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7fad01d9d5a3f82081c00fb57918d64145dc904c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1674890375, + "narHash": "sha256-KTFQ7AkKVLJPoGg1cRAekFDyvDPT8A6jGPAu1liFD74=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "4fe4a0e8abadd05d9e81923c13531ab1476d6fd3", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1673606088, + "narHash": "sha256-wdYD41UwNwPhTdMaG0AIe7fE1bAdyHe6bB4HLUqUvck=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "37b97ae3dd714de9a17923d004a2c5b5543dfa6d", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1672580127, + "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0874168639713f547c05947c76124f78441ea46c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-22.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1632864508, + "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-21.05-small", + "type": "indirect" + } + }, "nixvim": { "inputs": { "beautysh": "beautysh", "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1674764325, - "narHash": "sha256-3YEOnDIfcHkoQn4ozY9EI4MVt/94SmwElLy8cDlvWbg=", + "lastModified": 1674917700, + "narHash": "sha256-4NSCMIeOZbXJ47h2gv5gKsk8iPx90jwU7UDxSy6gi+0=", "owner": "pta2002", "repo": "nixvim", - "rev": "8a0056617afbdef0a5dee89505e1e20c2798295f", + "rev": "8ef6945e7550f81352564a70796554e7997be5c1", "type": "github" }, "original": { @@ -930,21 +1014,18 @@ "inputs": { "fenix": "fenix", "naersk": "naersk_2", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1665591116, - "narHash": "sha256-AehqoWu7dmQqsd7TwP1B6deis41v1bJH98suLVNB2qs=", + "lastModified": 1674753546, + "narHash": "sha256-rqkvIQ71xZ2Am2Vhhxl0TCbl/k8nxfmSC5cDieHLfbI=", "owner": "DeterminateSystems", "repo": "riff", - "rev": "81d12433859a012b68e15aeb8f2224c7790b8002", + "rev": "a35e66326f2ffb3ce8a6d0b8180b87ce7260a9be", "type": "github" }, "original": { "owner": "DeterminateSystems", - "ref": "cole/ds-285-use-rustup-based-rustc-and-cargo", "repo": "riff", "type": "github" } @@ -959,7 +1040,7 @@ "mailserver": "mailserver", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_6", "nixpkgs_22-11": "nixpkgs_22-11", "nixvim": "nixvim", "nur": "nur", @@ -971,11 +1052,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1662066014, - "narHash": "sha256-DE4FsE2sxd9nFtG+8+lnv/IBbtf+6rAlKjIdfpWN488=", + "lastModified": 1674253028, + "narHash": "sha256-OzdEJpxIZw50DuZ1aBJlZnJ/GxHfKhexhn4Eu53YnEo=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "93c52e41ec0d297c7512adf5936d8c464c820618", + "rev": "9a6294d7038e7eab00beafdf64ec4aa50a4c66a2", "type": "github" }, "original": { @@ -1083,9 +1164,7 @@ "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_3", "nix": "nix", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1674127129, @@ -1104,7 +1183,7 @@ "webcord": { "inputs": { "dream2nix": "dream2nix", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_11", "webcord": "webcord_2" }, "locked": { diff --git a/flake.nix b/flake.nix index 3298804..50a8b20 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "0x76's infrastructure"; - # Based on: + # Based on: # * https://github.com/serokell/pegasus-infra/blob/master/flake.nix # * https://git.voidcorp.nl/j00lz/nixos-configs/src/branch/main/flake.nix @@ -17,32 +17,25 @@ colmena.url = "github:zhaofengli/colmena"; vault-secrets.url = "github:serokell/vault-secrets"; - vault-secrets.inputs.nixpkgs.follows = "nixpkgs"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; hyprland.url = "github:hyprwm/Hyprland"; hyprpaper.url = "github:hyprwm/hyprpaper"; - hyprpaper.inputs.nixpkgs.follows = "nixpkgs"; - riff.url = - "github:DeterminateSystems/riff/cole/ds-285-use-rustup-based-rustc-and-cargo"; - riff.inputs.nixpkgs.follows = "nixpkgs"; + riff.url = "github:DeterminateSystems/riff"; webcord.url = "github:fufexan/webcord-flake"; comma.url = "github:nix-community/comma"; - comma.inputs.nixpkgs.follows = "nixpkgs"; mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; mailserver.inputs.nixpkgs.follows = "nixpkgs"; nixvim.url = "github:pta2002/nixvim"; - nixvim.inputs.nixpkgs.follows = "nixpkgs"; nixos-generators.url = "github:nix-community/nixos-generators"; - nixos-generators.inputs.nixpkgs.follows = "nixpkgs"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; }; diff --git a/nixos/hosts/thalassa/aoife/configuration.nix b/nixos/hosts/thalassa/aoife/configuration.nix index ea22c85..07425f6 100644 --- a/nixos/hosts/thalassa/aoife/configuration.nix +++ b/nixos/hosts/thalassa/aoife/configuration.nix @@ -14,7 +14,7 @@ # Bootloader. boot = { kernelPackages = pkgs.linuxPackages_latest; - # kernelPackages = pkgs.linuxKernel.packages.linux_zen; + # kernelPackages = pkgs.linuxKernel.packages.linux_zen; loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; @@ -115,6 +115,7 @@ programs.ccache.enable = true; programs.ccache.packageNames = [ "evolution-data-server" + "mongodb" ]; nix.settings.extra-sandbox-paths = [ (toString config.programs.ccache.cacheDir) ];