nix: general cleanups etc. and flake bump
Anirudh Oppiliappan x@icyphox.sh
Fri, 27 Sep 2024 08:22:40 +0300
6 files changed,
126 insertions(+),
211 deletions(-)
M
darwin/home.nix
→
darwin/home.nix
@@ -23,6 +23,7 @@ };
}; home.packages = with pkgs; [ + prompt tmux git fzy
M
flake.lock
→
flake.lock
@@ -16,59 +16,40 @@ "repo": "advisory-db",
"type": "github" } }, - "chaotic": { + "crane": { "inputs": { - "compare-to": "compare-to", - "fenix": "fenix", - "flake-schemas": "flake-schemas", - "home-manager": "home-manager", - "jovian": "jovian", - "nixpkgs": "nixpkgs", - "systems": "systems", - "yafas": "yafas" + "nixpkgs": [ + "nix-your-shell", + "nixpkgs" + ] }, "locked": { - "lastModified": 1724534339, - "narHash": "sha256-IA/Y0WSx4s1X6O6FkY06IEnafR8fUe3jSFA0Zopiwbs=", - "owner": "chaotic-cx", - "repo": "nyx", - "rev": "c99c254d336cacb8c7a622cac675ea6c7768dc73", + "lastModified": 1710886643, + "narHash": "sha256-saTZuv9YeZ9COHPuj8oedGdUwJZcbQ3vyRqe7NVJMsQ=", + "owner": "ipetkov", + "repo": "crane", + "rev": "5bace74e9a65165c918205cf67ad3977fe79c584", "type": "github" }, "original": { - "owner": "chaotic-cx", - "ref": "nyxpkgs-unstable", - "repo": "nyx", + "owner": "ipetkov", + "repo": "crane", "type": "github" } }, - "compare-to": { - "locked": { - "lastModified": 1695341185, - "narHash": "sha256-htO6DSbWyCgaDkxi7foPjXwJFPzGjVt3RRUbPSpNtZY=", - "rev": "98b8e330823a3570d328720f87a1153f8a7f2224", - "revCount": 2, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nix-empty-flake/0.1.2%2Brev-98b8e330823a3570d328720f87a1153f8a7f2224/018aba35-d228-7fa9-b205-7616c89ef4e0/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz" - } - }, - "crane": { + "crane_2": { "inputs": { "nixpkgs": [ - "nix-your-shell", + "zed", "nixpkgs" ] }, "locked": { - "lastModified": 1710886643, - "narHash": "sha256-saTZuv9YeZ9COHPuj8oedGdUwJZcbQ3vyRqe7NVJMsQ=", + "lastModified": 1724537630, + "narHash": "sha256-gpqINM71zp3kw5XYwUXa84ZtPnCmLLnByuFoYesT1bY=", "owner": "ipetkov", "repo": "crane", - "rev": "5bace74e9a65165c918205cf67ad3977fe79c584", + "rev": "3e08f4b1fc9aaede5dd511d8f5f4ef27501e49b0", "type": "github" }, "original": {@@ -101,17 +82,17 @@ },
"fenix": { "inputs": { "nixpkgs": [ - "chaotic", + "zed", "nixpkgs" ], "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1724394478, - "narHash": "sha256-JSiv2uwI4UJo/4pxt4255BfzWCiEberJmBC6pCxnzas=", + "lastModified": 1724740262, + "narHash": "sha256-cpFasbzOTlwLi4fNas6hDznVUdCJn/lMLxi7MAMG6hg=", "owner": "nix-community", "repo": "fenix", - "rev": "2e7bcdc4ef73aa56abd2f970e5a8b9c0cc87e614", + "rev": "703efdd9b5c6a7d5824afa348a24fbbf8ff226be", "type": "github" }, "original": {@@ -122,6 +103,21 @@ }
}, "flake-compat": { "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",@@ -155,46 +151,11 @@ "original": {
"owner": "hercules-ci", "repo": "flake-parts", "type": "github" - } - }, - "flake-schemas": { - "locked": { - "lastModified": 1693491534, - "narHash": "sha256-ifw8Td8kD08J8DxFbYjeIx5naHcDLz7s2IFP3X42I/U=", - "rev": "c702cbb663d6d70bbb716584a2ee3aeb35017279", - "revCount": 21, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.1/018a4c59-80e1-708a-bb4d-854930c20f72/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.1.tar.gz" } }, "home-manager": { "inputs": { "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1724412708, - "narHash": "sha256-tLr1k+UZLVumyqXRU8E5lBtLjsvHSy8e2NiamfkjpYg=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "b18f3ebc4029c22d437e3424014c8597a8b459a0", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ "nixpkgs" ] },@@ -212,51 +173,6 @@ "repo": "home-manager",
"type": "github" } }, - "jovian": { - "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1724304322, - "narHash": "sha256-/nrlMDubg9oG2VNANRBxsas5RbcJtB6IIDPZC3yHLW8=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "924a18ea8df89a39166dd202f3e73cd022825768", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "chaotic", - "jovian", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1690328911, - "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", - "owner": "zhaofengli", - "repo": "nix-github-actions", - "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "matrix-name", - "repo": "nix-github-actions", - "type": "github" - } - }, "nix-snapshotter": { "inputs": { "flake-compat": "flake-compat",@@ -286,7 +202,7 @@ "crane": "crane",
"nixpkgs": [ "nixpkgs" ], - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1717612968,@@ -319,11 +235,11 @@ }
}, "nixpkgs": { "locked": { - "lastModified": 1724224976, - "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", + "lastModified": 1727122398, + "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", + "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", "type": "github" }, "original": {@@ -349,22 +265,6 @@ "repo": "nixpkgs",
"type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1724224976, - "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "prompt": { "inputs": { "nixpkgs": [@@ -387,25 +287,25 @@ }
}, "root": { "inputs": { - "chaotic": "chaotic", "darwin": "darwin", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "nix-snapshotter": "nix-snapshotter", "nix-your-shell": "nix-your-shell", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-master": "nixpkgs-master", - "prompt": "prompt" + "prompt": "prompt", + "zed": "zed" } }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1724345276, - "narHash": "sha256-MKvjkqVL/RJ3QXOA8tSUoK7HHXVGSB2AL+vKxU4Cf+c=", + "lastModified": 1724666781, + "narHash": "sha256-nOQDgjTDlWe0/+Ptf3o2p6UrznQFHnXBHRV1ZAsSpe8=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "9b724459b5900c2424f5069023d6596a8617284b", + "rev": "095926ea6f008477a15a2ec6b0b8797e2e5be0e5", "type": "github" }, "original": {@@ -417,21 +317,6 @@ }
}, "systems": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_2": { - "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems",@@ -445,28 +330,26 @@ "repo": "default",
"type": "github" } }, - "yafas": { + "zed": { "inputs": { - "flake-schemas": [ - "chaotic", - "flake-schemas" - ], - "systems": [ - "chaotic", - "systems" + "crane": "crane_2", + "fenix": "fenix", + "flake-compat": "flake-compat_2", + "nixpkgs": [ + "nixpkgs" ] }, "locked": { - "lastModified": 1695926485, - "narHash": "sha256-wNFFnItckgSs8XeYhhv8vlJs2WF09fSQaWgw4xkDqHQ=", - "owner": "UbiqueLambda", - "repo": "yafas", - "rev": "7772afd6686458ca0ddbc599a52cf5d337367653", + "lastModified": 1725887647, + "narHash": "sha256-7kp8kW2Y0bBns10ndTtemUPMfjK6VSsrvxVe+3wC51c=", + "owner": "zed-industries", + "repo": "zed", + "rev": "dd257b8412c3c8005c710185dc8fc2eed3cc67ba", "type": "github" }, "original": { - "owner": "UbiqueLambda", - "repo": "yafas", + "owner": "zed-industries", + "repo": "zed", "type": "github" } }
M
flake.nix
→
flake.nix
@@ -12,8 +12,6 @@ url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; }; - chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; - darwin = { url = "github:lnl7/nix-darwin/master"; inputs.nixpkgs.follows = "nixpkgs";@@ -33,6 +31,11 @@ nix-your-shell = {
url = "github:MercuryTechnologies/nix-your-shell"; inputs.nixpkgs.follows = "nixpkgs"; }; + + zed = { + url = "github:zed-industries/zed"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs =@@ -40,25 +43,25 @@ { self
, nixpkgs , nixpkgs-master , nixos-hardware - , nix-snapshotter , nix-your-shell - , chaotic , home-manager , prompt - , darwin + , # zed, + darwin , ... - } @ inputs: + }@inputs: let - supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; + supportedSystems = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-linux" + "aarch64-darwin" + ]; forAllSystems = nixpkgs.lib.genAttrs supportedSystems; in { - overlays = { - prompt = prompt.overlay; - }; - darwinConfigurations = { kvothe = darwin.lib.darwinSystem { system = "aarch64-darwin";@@ -66,7 +69,10 @@ modules = [
{ imports = [ ./hosts/kvothe/configuration.nix ]; _module.args.self = self; - nixpkgs.overlays = [ nix-your-shell.overlays.default ]; + nixpkgs.overlays = [ + nix-your-shell.overlays.default + prompt.overlay + ]; } home-manager.darwinModules.home-manager {@@ -90,7 +96,10 @@ modules = [
{ imports = [ ./hosts/wyndle/configuration.nix ]; _module.args.self = self; - nixpkgs.overlays = [ nix-your-shell.overlays.default chaotic.overlays.default ]; + nixpkgs.overlays = [ + nix-your-shell.overlays.default + prompt.overlay + ]; } home-manager.nixosModules.home-manager {@@ -111,11 +120,18 @@ nixosConfigurations = {
sini = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ - ({ config = { nix.registry.nixpkgs.flake = nixpkgs; }; }) - ({ config, pkgs, ... }: { - services.pixelfed.package = nixpkgs-master.legacyPackages."x86_64-linux".pixelfed; - services.pixelfed.phpPackage = nixpkgs-master.legacyPackages."x86_64-linux".php82; + ({ + config = { + nix.registry.nixpkgs.flake = nixpkgs; + }; }) + ( + { config, pkgs, ... }: + { + services.pixelfed.package = nixpkgs-master.legacyPackages."x86_64-linux".pixelfed; + services.pixelfed.phpPackage = nixpkgs-master.legacyPackages."x86_64-linux".php82; + } + ) # ({ pkgs, ... }: { # imports = [ nix-snapshotter.nixosModules.default ]; # nixpkgs.overlays = [ nix-snapshotter.overlays.default ];@@ -132,7 +148,11 @@ nixosConfigurations = {
denna = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ - ({ config = { nix.registry.nixpkgs.flake = nixpkgs; }; }) + ({ + config = { + nix.registry.nixpkgs.flake = nixpkgs; + }; + }) { imports = [ ./hosts/denna/configuration.nix ]; _module.args.self = self;@@ -145,7 +165,11 @@ nixosConfigurations = {
iso = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ - ({ config = { nix.registry.nixpkgs.flake = nixpkgs; }; }) + ({ + config = { + nix.registry.nixpkgs.flake = nixpkgs; + }; + }) { imports = [ ./hosts/iso/configuration.nix ]; _module.args.self = self;@@ -154,7 +178,8 @@ ];
}; }; - devShells = forAllSystems (system: + devShells = forAllSystems ( + system: let nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; }); pkgs = nixpkgsFor.${system};@@ -166,6 +191,7 @@ nixd
nixfmt-rfc-style ]; }; - }); + } + ); }; }
M
home.nix
→
home.nix
@@ -3,6 +3,7 @@ , pkgs
, self , host , lib +, inputs , ... }:@@ -65,7 +66,9 @@ pkgs.gnomeExtensions.dash-to-dock
pkgs.gnomeExtensions.search-light pkgs.gnomeExtensions.hide-top-bar - pkgs.zed-editor_git + pkgs.prompt + pkgs.zed-editor + # inputs.zed.packages.${pkgs.system}.zed-editor ] ++ (import ./bin { inherit pkgs host; });@@ -75,8 +78,20 @@ experimental-features = [ "scale-monitor-framebuffer" ];
}; "org/gnome/desktop/input-sources" = { show-all-sources = true; - sources = [ (mkTuple [ "xkb" "us+workman" ]) (mkTuple [ "xkb" "us" ]) ]; - xkb-options = [ "terminate:ctrl_alt_bksp" "compose:ralt" ]; + sources = [ + (mkTuple [ + "xkb" + "us+workman" + ]) + (mkTuple [ + "xkb" + "us" + ]) + ]; + xkb-options = [ + "terminate:ctrl_alt_bksp" + "compose:ralt" + ]; }; "org/gnome/mutter" = { overlay-key = [ "" ];@@ -102,5 +117,3 @@ };
}; } - -
M
hosts/kvothe/configuration.nix
→
hosts/kvothe/configuration.nix
@@ -13,10 +13,6 @@ home = "/Users/icy";
}; services.nix-daemon.enable = true; - nixpkgs.overlays = with self.overlays; [ - prompt - ]; - security.pam.enableSudoTouchIdAuth = true; system.activationScripts.applications.text = pkgs.lib.mkForce (
M
hosts/wyndle/configuration.nix
→
hosts/wyndle/configuration.nix
@@ -50,10 +50,6 @@ };
firefox.enablePlasmaBrowserIntegration = true; }; - nixpkgs.overlays = with self.overlays; [ - prompt - ]; - environment = { sessionVariables = rec { NIXOS_OZONE_WL = "1";