chore: Update flake.{lock, nix}
This commit is contained in:
Mr Hedgehog
parent
85c12cd20d
commit
4d46e7cc0b
2 changed files with 112 additions and 87 deletions
165
flake.lock
165
flake.lock
|
|
@ -7,11 +7,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1646105662,
|
||||
"narHash": "sha256-jdXCZbGZL0SWWi29GnAOFHUh/QvvP0IyaVLv1ZTDkBI=",
|
||||
"lastModified": 1646845404,
|
||||
"narHash": "sha256-JENXFCI2HVqi0whBzt7MAW9PX3ziEaYqBhMux+4g+VM=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "297cd58b418249240b9f1f155d52b1b17f292884",
|
||||
"rev": "764c975e74bce2f89a5106b68ec48e2b586f893c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -28,11 +28,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1646260544,
|
||||
"narHash": "sha256-lAJG+lWVuQeIRH4YvqIL2fIbQ611cQbn6O+AA8DYxmI=",
|
||||
"lastModified": 1646937818,
|
||||
"narHash": "sha256-vkFKYnSmhPPXtc3AH7iRtqRRqxhj0o5WySqPT+klDWU=",
|
||||
"owner": "kamadorueda",
|
||||
"repo": "alejandra",
|
||||
"rev": "2842bdc2392ea12196684314bc0b7eccd2c39277",
|
||||
"rev": "e00f984b95e696a0878cd231e937f852eb79532c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -43,11 +43,11 @@
|
|||
},
|
||||
"cachix": {
|
||||
"locked": {
|
||||
"lastModified": 1642244250,
|
||||
"narHash": "sha256-vWpUEqQdVP4srj+/YLJRTN9vjpTs4je0cdWKXPbDItc=",
|
||||
"lastModified": 1645296114,
|
||||
"narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0fd9ee1aa36ce865ad273f4f07fdc093adeb5c00",
|
||||
"rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -83,11 +83,11 @@
|
|||
"rotate-text": "rotate-text"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1645751511,
|
||||
"narHash": "sha256-i3cMaHdaxwfeJEKVgk3Sxx/IRfjwNcThaCMcq4uv9jg=",
|
||||
"lastModified": 1646961407,
|
||||
"narHash": "sha256-xt7ikT6iMMDQVS9q4KjfOIDNssk4RhsWqNt5Ioxatko=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-doom-emacs",
|
||||
"rev": "ef434602f6f2a8b469d1b01f9edff4f5b6d7f555",
|
||||
"rev": "5b51499d0c776ad4a713a5ef0eb2c605443b5a01",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -116,11 +116,11 @@
|
|||
"doom-snippets": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1645652740,
|
||||
"narHash": "sha256-ci5QsTkzmfSd7Pfoe+RActuSOmMY2TvJL7f2giCwNEI=",
|
||||
"lastModified": 1646222996,
|
||||
"narHash": "sha256-YhOnoNSpmcKNJg+aS/829zqXStMkKWXWf1pulHEBcpQ=",
|
||||
"owner": "hlissner",
|
||||
"repo": "doom-snippets",
|
||||
"rev": "02aca23fef94fc7a58836fd1812d62e731249fa3",
|
||||
"rev": "f61c23ece1ad47c0522059ac45085fd283ce4452",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -148,11 +148,11 @@
|
|||
"emacs-overlay": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1645728626,
|
||||
"narHash": "sha256-6I6sTQSNXvNUXi62osoAD8Tp5tAG1MOVyF8+xA+CGCw=",
|
||||
"lastModified": 1646933422,
|
||||
"narHash": "sha256-yDU9F/LhFVLeyCyXycwnb93bA5lEcCXlj4sldQe92Yw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "44558b819af602d041de53c3463cb3012c31cd05",
|
||||
"rev": "c875f360337cd71890c6b682cf277cc06218dbfa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -344,11 +344,11 @@
|
|||
},
|
||||
"flake-utils_2": {
|
||||
"locked": {
|
||||
"lastModified": 1629481132,
|
||||
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
|
||||
"lastModified": 1644229661,
|
||||
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "997f7efcb746a9c140ce1f13c72263189225f482",
|
||||
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -448,11 +448,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1645970334,
|
||||
"narHash": "sha256-6nn4YF9bPtkxkB7bM6yJO3m//p3sGilxNQFjm1epLEM=",
|
||||
"lastModified": 1647210221,
|
||||
"narHash": "sha256-mUWwEq+ReRQjIqj28ClqmBDyKV4fr6C5ufqlXLzZFsk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "ea85f4b1fdf3f25cf97dc49f4a9ec4eafda2ea25",
|
||||
"rev": "8eb7c009f09f1f7b1ec151e5d537104acf42213a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -480,6 +480,38 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"my-kanshi": {
|
||||
"locked": {
|
||||
"lastModified": 1647349837,
|
||||
"narHash": "sha256-6DYLBMEnOlaUGC9gRgz4napkS2O6198Btv0FBFKlN+I=",
|
||||
"owner": "ModdedGamers",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ef7a283d015a64876f75cb94ca09a587b973551c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ModdedGamers",
|
||||
"ref": "kanshi-srht-fix",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"my-nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1647179622,
|
||||
"narHash": "sha256-uPU040Baa0krMhC5stm4XMxs897O3xNrENfaH2pat+s=",
|
||||
"owner": "ModdedGamers",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1225719c2bfe8a54b1e5bd0132dfe863987978fe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ModdedGamers",
|
||||
"ref": "python-gasp-init",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"neovim": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
|
|
@ -489,11 +521,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1646295251,
|
||||
"narHash": "sha256-AOghS2iBkz3NjCtg8zZxzBPeQF8jxNM+faOD26/Sn5A=",
|
||||
"lastModified": 1647332154,
|
||||
"narHash": "sha256-fCZWPR53MfOHhVC4VEjYeIWPzJbCo/lLOubNoswfTS0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "neovim-nightly-overlay",
|
||||
"rev": "a49336adf9e8dc6c9532d868ac1f3dcb851f3af3",
|
||||
"rev": "0817ca26e18dbf5eb8dc61a7e68f9d7f6b3fbe68",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -512,11 +544,11 @@
|
|||
},
|
||||
"locked": {
|
||||
"dir": "contrib",
|
||||
"lastModified": 1646286769,
|
||||
"narHash": "sha256-lPDxng2HlGZNVVXThcG+rWEZzco1jvljtmDXmX0Fqqo=",
|
||||
"lastModified": 1647310800,
|
||||
"narHash": "sha256-DvKvdwXp1K8dtxk+IIGK/HxurmMRhkuTdfj44rDRsdw=",
|
||||
"owner": "neovim",
|
||||
"repo": "neovim",
|
||||
"rev": "f9db491a643619844b88628c8afb9a30576eb1e5",
|
||||
"rev": "bef7552f7088ff411bd68fc236cfd7b269ad157e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -575,11 +607,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1645855197,
|
||||
"narHash": "sha256-0FvBpX/9n69vg+XgcMow0RIRYbTHav1uCbL9Xt9HvcA=",
|
||||
"lastModified": 1646825982,
|
||||
"narHash": "sha256-uWvS4UFkdE4Iqk1pXhxkZqPsqI+Z2V9VRmLxGUFejbY=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "c3c66f6db4ac74a59eb83d83e40c10046ebc0b8c",
|
||||
"rev": "816a935bf5aa5f77cb1f03ebfe20ab13b112d0f1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -590,11 +622,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1646271573,
|
||||
"narHash": "sha256-X0W5eTiYzfgzEKkhYBLaGqA1aodKyledNDcqNx/r+e8=",
|
||||
"lastModified": 1647321545,
|
||||
"narHash": "sha256-alnh5Pc73jdXAiN17G9AfhYEf2aURsTMXa/DXLiA3MI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "7a3e6d6604ad99c77e7a98943734bdeea564bff2",
|
||||
"rev": "be872a7453a176df625c12190b8a6c10f6b21647",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -647,11 +679,11 @@
|
|||
"nixpkgs-review": "nixpkgs-review"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1644511060,
|
||||
"narHash": "sha256-cPFp/Kjx6YgEFLrbcXu2yZxUMFnr7cCSJbd8RX8ghD4=",
|
||||
"lastModified": 1647221297,
|
||||
"narHash": "sha256-22DWfsXLTVn5rNbZVTp5+k9rhJW83jBPOlC93ZAoLDg=",
|
||||
"owner": "ryantm",
|
||||
"repo": "nixpkgs-update",
|
||||
"rev": "6d46b9ee1476589f418bf1fc07a2a28edbe35122",
|
||||
"rev": "d5c9b9d9d66b9b3e58e449fd7bd624b7c3fcc86b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -705,11 +737,11 @@
|
|||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1646271573,
|
||||
"narHash": "sha256-X0W5eTiYzfgzEKkhYBLaGqA1aodKyledNDcqNx/r+e8=",
|
||||
"lastModified": 1647350163,
|
||||
"narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "7a3e6d6604ad99c77e7a98943734bdeea564bff2",
|
||||
"rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -737,11 +769,11 @@
|
|||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1646302897,
|
||||
"narHash": "sha256-Qujvt5z6xKWU0la1/8YL/+mvgcRjoRVZ3qpZtvrTIRc=",
|
||||
"lastModified": 1647319391,
|
||||
"narHash": "sha256-aP33NF1dw0keAsRcT6f416NMR6sqyoMiRmFz3YgTWsM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nur",
|
||||
"rev": "d003f30af4f9c0b6ad7f2f22507fb92a566d6c6e",
|
||||
"rev": "b8be7192aa2050aadfd06cd14c776f0478e9a146",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -769,11 +801,11 @@
|
|||
"org": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1645557265,
|
||||
"narHash": "sha256-vBOWOOfdUbvpTkqs2Lx+OCPfUdZdzAOdGxzHBSAslmo=",
|
||||
"lastModified": 1646280299,
|
||||
"narHash": "sha256-ZNkOfB8o2OHTh2t/ci8uv8aoV3I5IfAgIIOP3azD6eU=",
|
||||
"owner": "emacs-straight",
|
||||
"repo": "org-mode",
|
||||
"rev": "282a01f22159b4855071ffd54a9ae6ce681c3690",
|
||||
"rev": "91681fc03334285dc0879fcb9a27583bd7ab9782",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -833,11 +865,11 @@
|
|||
"revealjs": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1645450091,
|
||||
"narHash": "sha256-3fM1hKCbuIy8HzBv9JjjZW/RwE1CKeq++delBhbSvys=",
|
||||
"lastModified": 1646820626,
|
||||
"narHash": "sha256-J3bcoO/42FcPIqCU7ORiV7dcvJDKtEHG8N7/stEQqDg=",
|
||||
"owner": "hakimel",
|
||||
"repo": "reveal.js",
|
||||
"rev": "5e12c6aeb7a37acca7ca22c0bd29548f9ff282ea",
|
||||
"rev": "37861335a225a3cc9f67e98977aceda3c2a9eca9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -853,6 +885,8 @@
|
|||
"doom-emacs": "doom-emacs",
|
||||
"emacs": "emacs",
|
||||
"home": "home",
|
||||
"my-kanshi": "my-kanshi",
|
||||
"my-nixpkgs": "my-nixpkgs",
|
||||
"neovim": "neovim",
|
||||
"nixgl": "nixgl",
|
||||
"nixos": "nixos",
|
||||
|
|
@ -862,7 +896,6 @@
|
|||
"nur": "nur",
|
||||
"statix": "statix",
|
||||
"vim-plugins": "vim-plugins",
|
||||
"waterfox": "waterfox",
|
||||
"wayland": "wayland"
|
||||
}
|
||||
},
|
||||
|
|
@ -930,11 +963,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1645971898,
|
||||
"narHash": "sha256-lOBsLe+oqPq9K3ZZRhTxzfVUABzKF3NU92Al/Fa0LX4=",
|
||||
"lastModified": 1647181485,
|
||||
"narHash": "sha256-v9M9ZGlHS23sufpmqGmMA2Rxy1q8YloD8plBNv+Z/As=",
|
||||
"owner": "m15a",
|
||||
"repo": "nixpkgs-vim-extra-plugins",
|
||||
"rev": "42beca2847d7e5528dfa5f6c8daea86f1d6747af",
|
||||
"rev": "90b636807bafe657eedd6b3498d2b8ca95a018d1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -943,22 +976,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"waterfox": {
|
||||
"locked": {
|
||||
"lastModified": 1642466168,
|
||||
"narHash": "sha256-CjQjCAujg++QVRuhsuXxi+pqAQ0LtQ9j4m+kIimWc1c=",
|
||||
"owner": "jcdickinson",
|
||||
"repo": "nixos-nixpkgs",
|
||||
"rev": "fc6da25e6761d232fa5df032e20d032610e29be8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "jcdickinson",
|
||||
"ref": "waterfox-bin",
|
||||
"repo": "nixos-nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"wayland": {
|
||||
"inputs": {
|
||||
"cachix": "cachix",
|
||||
|
|
@ -966,11 +983,11 @@
|
|||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1646303667,
|
||||
"narHash": "sha256-Rno+GXghBJsaJHiH/BouOY1el7uj/M5fWLC4QipmfTg=",
|
||||
"lastModified": 1647331303,
|
||||
"narHash": "sha256-5FhBAuitvkAZLiFsxowKqrNZV5FaIOEEmrAmSWo3yuM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "23529cb04e339aa7ed9c66fc2a18430544e12d60",
|
||||
"rev": "d27494f618f938c94e0f89108214e1a888e52f25",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
34
flake.nix
34
flake.nix
|
|
@ -4,7 +4,8 @@
|
|||
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||
nixos.url = "github:nixos/nixpkgs?rev=7f9b6e2babf232412682c09e57ed666d8f84ac2d";
|
||||
nixos-hardware.url = "github:nixos/nixos-hardware";
|
||||
# my-nixpkgs.url = "github:ModdedGamers/nixpkgs";
|
||||
my-nixpkgs.url = "github:ModdedGamers/nixpkgs/python-gasp-init";
|
||||
my-kanshi.url = "github:ModdedGamers/nixpkgs/kanshi-srht-fix";
|
||||
agenix.url = "github:ryantm/agenix";
|
||||
agenix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
alejandra.url = "github:kamadorueda/alejandra";
|
||||
|
|
@ -26,16 +27,17 @@
|
|||
statix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
vim-plugins.url = "github:m15a/nixpkgs-vim-extra-plugins";
|
||||
vim-plugins.inputs.nixpkgs.follows = "nixpkgs";
|
||||
waterfox.url = "github:jcdickinson/nixos-nixpkgs/waterfox-bin";
|
||||
wayland.url = "github:nix-community/nixpkgs-wayland";
|
||||
wayland.inputs.nixpkgs.url = "nixpkgs";
|
||||
};
|
||||
|
||||
outputs = inputs @ {
|
||||
self,
|
||||
nixpkgs,
|
||||
nixos,
|
||||
nixos-hardware,
|
||||
# my-nixpkgs,
|
||||
my-nixpkgs,
|
||||
my-kanshi,
|
||||
agenix,
|
||||
alejandra,
|
||||
doom-emacs,
|
||||
|
|
@ -47,16 +49,9 @@
|
|||
nur,
|
||||
statix,
|
||||
vim-plugins,
|
||||
waterfox,
|
||||
wayland,
|
||||
}: let
|
||||
alejandra-overlay = final: prev: {alejandra = alejandra.defaultPackage.${prev.system};};
|
||||
waterfox-overlay = final: prev: {
|
||||
waterfox = import waterfox {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
};
|
||||
|
||||
nixos-overlay = final: prev: {
|
||||
nixos = import nixos {
|
||||
inherit system;
|
||||
|
|
@ -66,15 +61,26 @@
|
|||
];
|
||||
};
|
||||
};
|
||||
|
||||
alejandra-overlay = final: prev: {alejandra = alejandra.defaultPackage.${prev.system};};
|
||||
my-nixpkgs-overlay = final: prev: { my-nixpkgs = import my-nixpkgs { inherit system;};};
|
||||
my-kanshi-overlay = final: prev: { my-kanshi = import my-kanshi { inherit system;};};
|
||||
nixpkgs-update-overlay = final: prev: {nixpkgs-update = nixpkgs-update.defaultPackage.${prev.system};};
|
||||
my-pkgs = final: prev: {my-pkgs = self.packages."${prev.system}";};
|
||||
|
||||
system = "x86_64-linux";
|
||||
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
input-fonts.acceptLicense = true;
|
||||
};
|
||||
overlays = [
|
||||
(import ./pkgs/default.nix {inherit inputs;})
|
||||
(import ./overlays/gopass-jsonapi.nix {inherit pkgs;})
|
||||
my-kanshi-overlay
|
||||
my-nixpkgs-overlay
|
||||
my-pkgs
|
||||
alejandra-overlay
|
||||
nixos-overlay
|
||||
|
|
@ -84,10 +90,10 @@
|
|||
nur.overlay
|
||||
statix.overlay
|
||||
vim-plugins.overlay
|
||||
waterfox-overlay
|
||||
wayland.overlay
|
||||
];
|
||||
};
|
||||
|
||||
in {
|
||||
packages.${system} = {
|
||||
"sway-launcher-desktop" = pkgs.callPackage ./pkgs/sway-launcher-desktop.nix {};
|
||||
|
|
@ -97,6 +103,7 @@
|
|||
# nixosConfigurations.zaphod = import ./hosts/zaphod {
|
||||
# inherit nixpkgs pkgs inputs system;
|
||||
# };
|
||||
|
||||
homeConfigurations.mrhedgehog = home.lib.homeManagerConfiguration {
|
||||
inherit pkgs system;
|
||||
username = "mrhedgehog";
|
||||
|
|
@ -104,6 +111,7 @@
|
|||
homeDirectory = "/home/mrhedgehog";
|
||||
configuration.imports = [./home.nix doom-emacs.hmModule];
|
||||
};
|
||||
|
||||
colmena = import ./hosts/default.nix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue