updated lock file, have working devshell and build (haven't installed it)

This commit is contained in:
Anish Lakhwara 2022-12-07 01:26:43 +10:00
parent da8e3f16a2
commit 07b611690e
6 changed files with 49 additions and 48 deletions

View file

@ -45,7 +45,7 @@
"url": "ssh://gitea@git.sealight.xyz/aynish/basant" "url": "ssh://gitea@git.sealight.xyz/aynish/basant"
} }
}, },
"deploy": { "deploy-rs": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"nixpkgs": [ "nixpkgs": [
@ -247,11 +247,11 @@
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1669978198, "lastModified": 1670280307,
"narHash": "sha256-U8sZFwIIDFm9w/Kx58sYrIsWpuQUKmkcQmdBkuQ+gkE=", "narHash": "sha256-3x+0whP1nCz5adQMIsBA3L9fI/ABOpRUJdbw0AmxBnU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "71fa4cdf9cd89a3e0d452439b6a2f7f01d6292e9", "rev": "2af0d07678fc15612345e0dd55337550dcf6465f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -262,11 +262,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1669834992, "lastModified": 1670193339,
"narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=", "narHash": "sha256-oHTAhX4p6+uxcabq0rKL4EyKWPbDLGKec88ocPIU/2Y=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502", "rev": "e169cf5b3b1e6cc4a25ff15087c2621605f83409",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -312,11 +312,11 @@
"vimwiki-cli": "vimwiki-cli" "vimwiki-cli": "vimwiki-cli"
}, },
"locked": { "locked": {
"lastModified": 1664889303, "lastModified": 1670292234,
"narHash": "sha256-VnG00AnxKCJDhQfQ7j8zan7RJxVZmzVLDxB5JeW7jPk=", "narHash": "sha256-rKXu1mkj/iNlZv2fb5MRHkYV6XR8BfHAXGgmMnxA7T8=",
"ref": "main", "ref": "main",
"rev": "57b20d1d682d04df76b3b293fe9ab21745afeb8f", "rev": "130146bcb642d18994de42bdc20e4f9617cfc1a3",
"revCount": 401, "revCount": 444,
"type": "git", "type": "git",
"url": "ssh://gitea@git.sealight.xyz/aynish/kitaab" "url": "ssh://gitea@git.sealight.xyz/aynish/kitaab"
}, },
@ -330,7 +330,7 @@
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"basant": "basant", "basant": "basant",
"deploy": "deploy", "deploy-rs": "deploy-rs",
"eww": "eww", "eww": "eww",
"grasp": "grasp", "grasp": "grasp",
"hardware": "hardware", "hardware": "hardware",
@ -351,11 +351,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1670207212, "lastModified": 1670293639,
"narHash": "sha256-uuKbbv0L+QoXiqO7METP9BihY0F7hJqGdKn7xDVfyFw=", "narHash": "sha256-RkPLwza77YkFgxKHGzfYAYVKiD9SeIvsOA7+ihiySwI=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "18823e511bc85ed27bfabe33cccecb389f9aa92d", "rev": "9767af967a0becaa3bb79eeda838dbf81295eb62",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -426,11 +426,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1670064435, "lastModified": 1670152712,
"narHash": "sha256-+ELoY30UN+Pl3Yn7RWRPabykwebsVK/kYE9JsIsUMxQ=", "narHash": "sha256-LJttwIvJqsZIj8u1LxVRv82vwUtkzVqQVi7Wb8gxPS4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "61a8a98e6d557e6dd7ed0cdb54c3a3e3bbc5e25c", "rev": "14ddeaebcbe9a25748221d1d7ecdf98e20e2325e",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -14,8 +14,8 @@
# Tools # Tools
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "nixpkgs"; agenix.inputs.nixpkgs.follows = "nixpkgs";
deploy.url = "github:serokell/deploy-rs"; deploy-rs.url = "github:serokell/deploy-rs";
deploy.inputs.nixpkgs.follows = "nixpkgs"; deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
# Packages # Packages
poonam.url = "git+ssh://gitea@git.sealight.xyz/aynish/kitaab?ref=main"; poonam.url = "git+ssh://gitea@git.sealight.xyz/aynish/kitaab?ref=main";
basant.url = "git+ssh://gitea@git.sealight.xyz/aynish/basant?ref=main"; basant.url = "git+ssh://gitea@git.sealight.xyz/aynish/basant?ref=main";
@ -49,7 +49,7 @@
, nixpkgs , nixpkgs
, unstable , unstable
, home-manager , home-manager
, deploy , deploy-rs
, agenix , agenix
, basant , basant
, grasp , grasp
@ -67,17 +67,25 @@
"aarch64-darwin" "aarch64-darwin"
"x86_64-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 { nixpkgsFor = forAllSystems (system: import nixpkgs {
inherit system; inherit system;
allowUnfree = true; config.allowUnfreePredicate = pkg: builtins.elem (nixpkgs.lib.getName pkg) [
"ripcord"
"VCV-Rack"
"SunVox"
"renoise"
];
overlays = [ overlays = [
rust-overlay.overlays.default rust-overlay.overlays.default
deploy.overlay
tidalcycles.overlays.default tidalcycles.overlays.default
agenix.overlay agenix.overlay
nur.overlay nur.overlay
# unstable.overlay unstableOverlay
# self.overlays self.overlays.additions
]; ];
}); });
in in
@ -188,10 +196,10 @@
deploy.nodes = { deploy.nodes = {
curve.profiles.system = { curve.profiles.system = {
user = "root"; 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;
}; };
} }

View file

@ -47,11 +47,11 @@
boot.supportedFilesystems = [ "ntfs" ]; boot.supportedFilesystems = [ "ntfs" ];
# https://github.com/NixOS/nixpkgs/issues/26722 # https://github.com/NixOS/nixpkgs/issues/26722
# boot.initrd.systemd.enable = true; # boot.initrd.systemd.enable = true;
# boot.plymouth = { boot.plymouth = {
# enable = true; enable = true;
# themePackages = [ pkgs.plymouth-themes ]; themePackages = [ pkgs.plymouth-themes ];
# theme = "motion"; theme = "motion";
# }; };
# lazy enable of ports necessary for KDE connect which is installed via cli home profile (for some reason?) # lazy enable of ports necessary for KDE connect which is installed via cli home profile (for some reason?)
networking.firewall = { networking.firewall = {

View file

@ -43,25 +43,19 @@ in
]; ];
}; };
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"ripcord"
"VCV-Rack"
"SunVox"
"renoise"
];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
signal-desktop # bridge to sealight? unstable.signal-desktop # bridge to sealight?
unstable.sublime-music
unstable.nheko
unstable.tootle
scrot scrot
# ripcord ripcord
feh feh
sxiv sxiv
xkblayout-state xkblayout-state
sublime-music vcv-rack
# vcv-rack
zathura zathura
calibre calibre
nheko
fractal fractal
mpv mpv
newsflash newsflash
@ -83,7 +77,6 @@ in
papirus-icon-theme papirus-icon-theme
calendar-cli calendar-cli
wyrd wyrd
tootle
tex tex
]; ];

View file

@ -16,8 +16,8 @@
orca-c orca-c
supercollider supercollider
dirt dirt
# sunvox sunvox
# vcv-rack vcv-rack
lmms lmms
bespokesynth bespokesynth
lsp-plugins lsp-plugins

View file

@ -5,6 +5,6 @@
default = pkgs.mkShell { default = pkgs.mkShell {
# Enable experimental features without having to specify the argument # Enable experimental features without having to specify the argument
NIX_CONFIG = "experimental-features = nix-command flakes"; NIX_CONFIG = "experimental-features = nix-command flakes";
nativeBuildInputs = with pkgs; [ nix home-manager git ]; nativeBuildInputs = with pkgs; [ nix home-manager git agenix deploy-rs ];
}; };
} }