From 1ee3257c9376e07ce117adc4c28611482cf3e959 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Dec 2024 04:25:36 +0300 Subject: [PATCH] some rewrite to the flake --- flake.lock | 393 +++++++++++++++++++++++++++++++++++++++++++++++++++-- flake.nix | 35 ++--- 2 files changed, 397 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index deb877b..42e31f7 100644 --- a/flake.lock +++ b/flake.lock @@ -1,18 +1,60 @@ { "nodes": { - "dotfiles": { - "flake": false, + "devshell": { + "inputs": { + "nixpkgs": [ + "osbm-nvim", + "nixvim", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1733843196, - "narHash": "sha256-mLb4YQLoQ55pqTDMS3Ku2AeIlaJcVTVIETPeSKbkYRk=", - "owner": "osbm", - "repo": "dotfiles", - "rev": "70a84ef9b697f449b52d18d634f5e2a0ad0b9951", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "owner": "numtide", + "repo": "devshell", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { - "owner": "osbm", - "repo": "dotfiles", + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "flake-compat": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "osbm-nvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", "type": "github" } }, @@ -20,6 +62,24 @@ "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -34,6 +94,62 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "osbm-nvim", + "nixvim", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "osbm-nvim", + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "osbm-nvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "osbm-nvim", + "nixvim", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -54,6 +170,103 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "osbm-nvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "ixx": { + "inputs": { + "flake-utils": [ + "osbm-nvim", + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "osbm-nvim", + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "osbm-nvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, + "nix-formatter-pack": { + "inputs": { + "nixpkgs": [ + "osbm-nvim", + "nixpkgs" + ], + "nmd": "nmd", + "nmt": "nmt" + }, + "locked": { + "lastModified": 1729445390, + "narHash": "sha256-TxJ7RZLlBkKWZos1ai3eWIH0fBq1G6SVE+q3dW+0qRU=", + "owner": "Gerschtli", + "repo": "nix-formatter-pack", + "rev": "9f4bcf647cad2edafda7e1143071e0daf37cbc41", + "type": "github" + }, + "original": { + "owner": "Gerschtli", + "repo": "nix-formatter-pack", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1733808091, @@ -86,12 +299,133 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixvim": { + "inputs": { + "devshell": "devshell", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "git-hooks": "git-hooks", + "home-manager": "home-manager_2", + "nix-darwin": "nix-darwin", + "nixpkgs": [ + "osbm-nvim", + "nixpkgs" + ], + "nuschtosSearch": "nuschtosSearch", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1734103614, + "narHash": "sha256-H5JN0fajkKZLir/GN6QHmLsR3cW+/EIOR+W/VmwHKfI=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "c181014422fa9261db06fc9b5ecbf67f42c30ec3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixvim", + "type": "github" + } + }, + "nmd": { + "flake": false, + "locked": { + "lastModified": 1666190571, + "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=", + "owner": "rycee", + "repo": "nmd", + "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmd", + "type": "gitlab" + } + }, + "nmt": { + "flake": false, + "locked": { + "lastModified": 1648075362, + "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=", + "owner": "rycee", + "repo": "nmt", + "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmt", + "type": "gitlab" + } + }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils", + "ixx": "ixx", + "nixpkgs": [ + "osbm-nvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733411491, + "narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=", + "owner": "NuschtOS", + "repo": "search", + "rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, + "osbm-nvim": { + "inputs": { + "nix-formatter-pack": "nix-formatter-pack", + "nixpkgs": "nixpkgs_2", + "nixvim": "nixvim" + }, + "locked": { + "lastModified": 1734135886, + "narHash": "sha256-/dU6ym759CJnVdur/jHYLH/h1l2wlgDNzzKxsIZYo9Y=", + "owner": "osbm", + "repo": "osbm-nvim", + "rev": "bea0d00a8594fc1650f70bb3c7d8c784559865c2", + "type": "github" + }, + "original": { + "owner": "osbm", + "repo": "osbm-nvim", + "type": "github" + } + }, "root": { "inputs": { - "dotfiles": "dotfiles", "home-manager": "home-manager", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", + "osbm-nvim": "osbm-nvim", "sops-nix": "sops-nix", "vscode-server": "vscode-server" } @@ -131,9 +465,46 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "osbm-nvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733440889, + "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 79200f2..7fec4ce 100644 --- a/flake.nix +++ b/flake.nix @@ -25,10 +25,7 @@ home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - dotfiles = { - url = "github:osbm/dotfiles"; - flake = false; - }; + osbm-nvim.url = "github:osbm/osbm-nvim"; }; outputs = { @@ -37,40 +34,38 @@ nixpkgs-unstable, vscode-server, sops-nix, + osbm-nvim, ... }: { - nixosConfigurations = { - # revision = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; + nixosConfigurations = let + system = "x86_64-linux"; + pkgs-unstable = import nixpkgs-unstable { + inherit system; + config.allowUnfree = true; + }; + system-label = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; + in + { tartarus = nixpkgs.lib.nixosSystem rec { - system = "x86_64-linux"; + inherit system; modules = [ ./hosts/tartarus/configuration.nix vscode-server.nixosModules.default sops-nix.nixosModules.sops - # stylix.nixosModules.stylix ]; specialArgs = { - pkgs-unstable = import nixpkgs-unstable { - inherit system; - config.allowUnfree = true; - }; - system-label = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; + inherit pkgs-unstable system-label; }; }; ymir = nixpkgs.lib.nixosSystem rec { - system = "x86_64-linux"; + inherit system; modules = [ ./hosts/ymir/configuration.nix vscode-server.nixosModules.default sops-nix.nixosModules.sops - # stylix.nixosModules.stylix ]; specialArgs = { - pkgs-unstable = import nixpkgs-unstable { - inherit system; - config.allowUnfree = true; - }; - system-label = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; + inherit pkgs-unstable system-label; }; }; };