Commit 604564c0fce6
Changed files (2)
flake.lock
@@ -49,8 +49,12 @@
"emacs-overlay": {
"inputs": {
"flake-utils": "flake-utils_4",
- "nixpkgs": "nixpkgs_2",
- "nixpkgs-stable": "nixpkgs-stable_3"
+ "nixpkgs": [
+ "nixpkgs"
+ ],
+ "nixpkgs-stable": [
+ "nixpkgs-23_05"
+ ]
},
"locked": {
"lastModified": 1698031717,
@@ -525,7 +529,7 @@
"nix-eval-jobs": {
"inputs": {
"flake-parts": "flake-parts_2",
- "nixpkgs": "nixpkgs_4",
+ "nixpkgs": "nixpkgs_3",
"treefmt-nix": "treefmt-nix"
},
"locked": {
@@ -675,22 +679,6 @@
}
},
"nixpkgs-stable_3": {
- "locked": {
- "lastModified": 1697851979,
- "narHash": "sha256-lJ8k4qkkwdvi+t/Xc6Fn74kUuobpu9ynPGxNZR6OwoA=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "5550a85a087c04ddcace7f892b0bdc9d8bb080c8",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-23.05",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs-stable_4": {
"locked": {
"lastModified": 1697929210,
"narHash": "sha256-RkQZif6QhswEwv7484mrKfIU8XmIWm+ED6llbr4IyxM=",
@@ -746,22 +734,6 @@
}
},
"nixpkgs_3": {
- "locked": {
- "lastModified": 1697723726,
- "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_4": {
"locked": {
"lastModified": 1697677194,
"narHash": "sha256-lN2eJCsOzjhxrvTQsNcW7r0E9hMJ7ABrKDQWpmYFRkM=",
@@ -840,7 +812,7 @@
"impermanence": "impermanence",
"nixos-hardware": "nixos-hardware",
"nixos-wsl": "nixos-wsl",
- "nixpkgs": "nixpkgs_3",
+ "nixpkgs": "nixpkgs_2",
"nixpkgs-23_05": "nixpkgs-23_05",
"nixpkgs-wayland": "nixpkgs-wayland",
"sops-nix": "sops-nix"
@@ -851,7 +823,7 @@
"nixpkgs": [
"nixpkgs"
],
- "nixpkgs-stable": "nixpkgs-stable_4"
+ "nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
"lastModified": 1697943852,
flake.nix
@@ -1,59 +1,6 @@
{
description = "System Config";
- inputs = {
- # Flake for compatibility with non-flake commands
- flake-compat = { type = "github"; owner = "edolstra"; repo = "flake-compat"; flake = false; };
-
- devenv = {
- url = "github:cachix/devenv/latest";
- inputs.nixpkgs.follows = "nixpkgs";
- };
- hyprland = {
- url = "github:hyprwm/Hyprland";
- inputs.nixpkgs.follows = "nixpkgs";
- };
-
-
- # nixpkgs
- nixpkgs = { type = "github"; owner = "NixOS"; repo = "nixpkgs"; ref = "nixos-unstable"; };
- nixpkgs-23_05 = { type = "github"; owner = "NixOS"; repo = "nixpkgs"; ref = "nixos-23.05"; };
- # Home Manager
- home-manager = { type = "github"; owner = "nix-community"; repo = "home-manager"; inputs.nixpkgs.follows = "nixpkgs"; };
- home-manager-23_05 = { type = "github"; owner = "nix-community"; repo = "home-manager"; ref = "release-23.05"; inputs.nixpkgs.follows = "nixpkgs-23_05"; };
-
- impermanence = { type = "github"; owner = "nix-community"; repo = "impermanence"; };
-
- nixpkgs-wayland = { type = "github"; owner = "nix-community"; repo = "nixpkgs-wayland"; inputs.nixpkgs.follows = "nixpkgs"; };
-
- emacs-overlay.url = "github:nix-community/emacs-overlay";
-
- sops-nix = {
- type = "github";
- owner = "Mic92";
- repo = "sops-nix";
- inputs.nixpkgs.follows = "nixpkgs";
- };
- envfs = {
- type = "github";
- owner = "Mic92";
- repo = "envfs";
- inputs.nixpkgs.follows = "nixpkgs";
- };
-
- # WSL
- nixos-wsl = { type = "github"; owner = "nix-community"; repo = "NixOS-WSL"; inputs.nixpkgs.follows = "nixpkgs"; };
- nixos-hardware = { type = "github"; owner = "NixOS"; "repo" = "nixos-hardware"; };
-
- # Red Hat
- chapeau-rouge = {
- type = "github";
- owner = "vdemeester";
- repo = "chapeau-rouge";
- inputs.nixpkgs.follows = "nixpkgs";
- };
- };
-
outputs = { self, ... } @ inputs:
let
wayland = { pkgs, config, ... }: {
@@ -189,4 +136,60 @@
overlays = import ./nix/overlays;
};
+ inputs = {
+ # Flake for compatibility with non-flake commands
+ flake-compat = { type = "github"; owner = "edolstra"; repo = "flake-compat"; flake = false; };
+
+ devenv = {
+ url = "github:cachix/devenv/latest";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
+ hyprland = {
+ url = "github:hyprwm/Hyprland";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
+
+
+ # nixpkgs
+ nixpkgs = { type = "github"; owner = "NixOS"; repo = "nixpkgs"; ref = "nixos-unstable"; };
+ nixpkgs-23_05 = { type = "github"; owner = "NixOS"; repo = "nixpkgs"; ref = "nixos-23.05"; };
+ # Home Manager
+ home-manager = { type = "github"; owner = "nix-community"; repo = "home-manager"; inputs.nixpkgs.follows = "nixpkgs"; };
+ home-manager-23_05 = { type = "github"; owner = "nix-community"; repo = "home-manager"; ref = "release-23.05"; inputs.nixpkgs.follows = "nixpkgs-23_05"; };
+
+ impermanence = { type = "github"; owner = "nix-community"; repo = "impermanence"; };
+
+ nixpkgs-wayland = { type = "github"; owner = "nix-community"; repo = "nixpkgs-wayland"; inputs.nixpkgs.follows = "nixpkgs"; };
+
+ emacs-overlay = {
+ url = "github:nix-community/emacs-overlay";
+ inputs.nixpkgs.follows = "nixpkgs";
+ inputs.nixpkgs-stable.follows = "nixpkgs-23_05";
+ };
+
+ sops-nix = {
+ type = "github";
+ owner = "Mic92";
+ repo = "sops-nix";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
+ envfs = {
+ type = "github";
+ owner = "Mic92";
+ repo = "envfs";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
+
+ # WSL
+ nixos-wsl = { type = "github"; owner = "nix-community"; repo = "NixOS-WSL"; inputs.nixpkgs.follows = "nixpkgs"; };
+ nixos-hardware = { type = "github"; owner = "NixOS"; "repo" = "nixos-hardware"; };
+
+ # Red Hat
+ chapeau-rouge = {
+ type = "github";
+ owner = "vdemeester";
+ repo = "chapeau-rouge";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
+ };
}