From 07b611690ee31f14a63f2de904185fc5880a2818 Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Wed, 7 Dec 2022 01:26:43 +1000 Subject: [PATCH] updated lock file, have working devshell and build (haven't installed it) --- flake.lock | 36 +++++++++++++++--------------- flake.nix | 26 +++++++++++++-------- hosts/curve/default.nix | 10 ++++----- hosts/profiles/desktop/default.nix | 19 +++++----------- hosts/profiles/music/default.nix | 4 ++-- shell.nix | 2 +- 6 files changed, 49 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index ad110739..39dfd930 100644 --- a/flake.lock +++ b/flake.lock @@ -45,7 +45,7 @@ "url": "ssh://gitea@git.sealight.xyz/aynish/basant" } }, - "deploy": { + "deploy-rs": { "inputs": { "flake-compat": "flake-compat", "nixpkgs": [ @@ -247,11 +247,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1669978198, - "narHash": "sha256-U8sZFwIIDFm9w/Kx58sYrIsWpuQUKmkcQmdBkuQ+gkE=", + "lastModified": 1670280307, + "narHash": "sha256-3x+0whP1nCz5adQMIsBA3L9fI/ABOpRUJdbw0AmxBnU=", "owner": "nix-community", "repo": "home-manager", - "rev": "71fa4cdf9cd89a3e0d452439b6a2f7f01d6292e9", + "rev": "2af0d07678fc15612345e0dd55337550dcf6465f", "type": "github" }, "original": { @@ -262,11 +262,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1669834992, - "narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=", + "lastModified": 1670193339, + "narHash": "sha256-oHTAhX4p6+uxcabq0rKL4EyKWPbDLGKec88ocPIU/2Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502", + "rev": "e169cf5b3b1e6cc4a25ff15087c2621605f83409", "type": "github" }, "original": { @@ -312,11 +312,11 @@ "vimwiki-cli": "vimwiki-cli" }, "locked": { - "lastModified": 1664889303, - "narHash": "sha256-VnG00AnxKCJDhQfQ7j8zan7RJxVZmzVLDxB5JeW7jPk=", + "lastModified": 1670292234, + "narHash": "sha256-rKXu1mkj/iNlZv2fb5MRHkYV6XR8BfHAXGgmMnxA7T8=", "ref": "main", - "rev": "57b20d1d682d04df76b3b293fe9ab21745afeb8f", - "revCount": 401, + "rev": "130146bcb642d18994de42bdc20e4f9617cfc1a3", + "revCount": 444, "type": "git", "url": "ssh://gitea@git.sealight.xyz/aynish/kitaab" }, @@ -330,7 +330,7 @@ "inputs": { "agenix": "agenix", "basant": "basant", - "deploy": "deploy", + "deploy-rs": "deploy-rs", "eww": "eww", "grasp": "grasp", "hardware": "hardware", @@ -351,11 +351,11 @@ ] }, "locked": { - "lastModified": 1670207212, - "narHash": "sha256-uuKbbv0L+QoXiqO7METP9BihY0F7hJqGdKn7xDVfyFw=", + "lastModified": 1670293639, + "narHash": "sha256-RkPLwza77YkFgxKHGzfYAYVKiD9SeIvsOA7+ihiySwI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "18823e511bc85ed27bfabe33cccecb389f9aa92d", + "rev": "9767af967a0becaa3bb79eeda838dbf81295eb62", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "unstable": { "locked": { - "lastModified": 1670064435, - "narHash": "sha256-+ELoY30UN+Pl3Yn7RWRPabykwebsVK/kYE9JsIsUMxQ=", + "lastModified": 1670152712, + "narHash": "sha256-LJttwIvJqsZIj8u1LxVRv82vwUtkzVqQVi7Wb8gxPS4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "61a8a98e6d557e6dd7ed0cdb54c3a3e3bbc5e25c", + "rev": "14ddeaebcbe9a25748221d1d7ecdf98e20e2325e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a4d72c10..9fdbd447 100644 --- a/flake.nix +++ b/flake.nix @@ -14,8 +14,8 @@ # Tools agenix.url = "github:ryantm/agenix"; agenix.inputs.nixpkgs.follows = "nixpkgs"; - deploy.url = "github:serokell/deploy-rs"; - deploy.inputs.nixpkgs.follows = "nixpkgs"; + deploy-rs.url = "github:serokell/deploy-rs"; + deploy-rs.inputs.nixpkgs.follows = "nixpkgs"; # Packages poonam.url = "git+ssh://gitea@git.sealight.xyz/aynish/kitaab?ref=main"; basant.url = "git+ssh://gitea@git.sealight.xyz/aynish/basant?ref=main"; @@ -49,7 +49,7 @@ , nixpkgs , unstable , home-manager - , deploy + , deploy-rs , agenix , basant , grasp @@ -67,17 +67,25 @@ "aarch64-darwin" "x86_64-darwin" ]; + unstableOverlay = final: prev: { + unstable = unstable.legacyPackages.${prev.system}; + deploy = deploy-rs.packages.${prev.system}.deploy-rs; + }; nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; - allowUnfree = true; + config.allowUnfreePredicate = pkg: builtins.elem (nixpkgs.lib.getName pkg) [ + "ripcord" + "VCV-Rack" + "SunVox" + "renoise" + ]; overlays = [ rust-overlay.overlays.default - deploy.overlay tidalcycles.overlays.default agenix.overlay nur.overlay - # unstable.overlay - # self.overlays + unstableOverlay + self.overlays.additions ]; }); in @@ -188,10 +196,10 @@ deploy.nodes = { curve.profiles.system = { user = "root"; - path = deploy.lib.x86_64-linux.activate.nixos self.nixosConfigurations.curve; + path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.curve; }; }; - # checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy.lib; + # checks = builtins.mapAttrs (system: deploy-rsLib: deployLib.deployChecks self.deploy) deploy.lib; }; } diff --git a/hosts/curve/default.nix b/hosts/curve/default.nix index 583b59da..971dfd03 100644 --- a/hosts/curve/default.nix +++ b/hosts/curve/default.nix @@ -47,11 +47,11 @@ boot.supportedFilesystems = [ "ntfs" ]; # https://github.com/NixOS/nixpkgs/issues/26722 # boot.initrd.systemd.enable = true; - # boot.plymouth = { - # enable = true; - # themePackages = [ pkgs.plymouth-themes ]; - # theme = "motion"; - # }; + boot.plymouth = { + enable = true; + themePackages = [ pkgs.plymouth-themes ]; + theme = "motion"; + }; # lazy enable of ports necessary for KDE connect which is installed via cli home profile (for some reason?) networking.firewall = { diff --git a/hosts/profiles/desktop/default.nix b/hosts/profiles/desktop/default.nix index c31f5770..d62a94d9 100644 --- a/hosts/profiles/desktop/default.nix +++ b/hosts/profiles/desktop/default.nix @@ -43,25 +43,19 @@ in ]; }; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "ripcord" - "VCV-Rack" - "SunVox" - "renoise" - ]; - environment.systemPackages = with pkgs; [ - signal-desktop # bridge to sealight? + unstable.signal-desktop # bridge to sealight? + unstable.sublime-music + unstable.nheko + unstable.tootle scrot - # ripcord + ripcord feh sxiv xkblayout-state - sublime-music - # vcv-rack + vcv-rack zathura calibre - nheko fractal mpv newsflash @@ -83,7 +77,6 @@ in papirus-icon-theme calendar-cli wyrd - tootle tex ]; diff --git a/hosts/profiles/music/default.nix b/hosts/profiles/music/default.nix index c3eeea9a..b66e12c5 100644 --- a/hosts/profiles/music/default.nix +++ b/hosts/profiles/music/default.nix @@ -16,8 +16,8 @@ orca-c supercollider dirt - # sunvox - # vcv-rack + sunvox + vcv-rack lmms bespokesynth lsp-plugins diff --git a/shell.nix b/shell.nix index aabba15a..8d0d78de 100644 --- a/shell.nix +++ b/shell.nix @@ -5,6 +5,6 @@ default = pkgs.mkShell { # Enable experimental features without having to specify the argument NIX_CONFIG = "experimental-features = nix-command flakes"; - nativeBuildInputs = with pkgs; [ nix home-manager git ]; + nativeBuildInputs = with pkgs; [ nix home-manager git agenix deploy-rs ]; }; }