able to get a dry run to compile

This commit is contained in:
Anish Lakhwara 2022-12-07 00:52:15 +10:00
parent 3cd723bcd6
commit da8e3f16a2
11 changed files with 47 additions and 32 deletions

View file

@ -291,6 +291,21 @@
"type": "github"
}
},
"nur": {
"locked": {
"lastModified": 1670315682,
"narHash": "sha256-/v0RgZZIjvsFuJbJLUlzRbzSlYFXq3olgJTuJBNtcoY=",
"owner": "nix-community",
"repo": "NUR",
"rev": "af814db16c89385c65e758608296440555f61ccc",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
"poonam": {
"inputs": {
"nixpkgs": "nixpkgs_2",
@ -321,6 +336,7 @@
"hardware": "hardware",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
"nur": "nur",
"poonam": "poonam",
"rust-overlay": "rust-overlay",
"tidalcycles": "tidalcycles",

View file

@ -30,8 +30,7 @@
inputs.nixpkgs.follows = "nixpkgs";
inputs.rust-overlay.follows = "rust-overlay";
};
# eww follows rust nightly
# eww.inputs.nixpkgs.follows = "unstable";
nur.url = "github:nix-community/NUR";
grasp.url = "git+ssh://gitea@git.sealight.xyz/aynish/grasp.git?ref=main";
grasp.inputs.nixpkgs.follows = "nixpkgs";
tidalcycles.url = "github:mitchmindtree/tidalcycles.nix";
@ -54,13 +53,13 @@
, agenix
, basant
, grasp
, nur
, tidalcycles
, rust-overlay
, eww
, ...
}@inputs:
let
inherit (self) outputs;
forAllSystems = nixpkgs.lib.genAttrs [
"aarch64-linux"
"i686-linux"
@ -76,6 +75,7 @@
deploy.overlay
tidalcycles.overlays.default
agenix.overlay
nur.overlay
# unstable.overlay
# self.overlays
];
@ -107,21 +107,19 @@
# NixOS configuration entrypoint
nixosConfigurations = {
curve = nixpkgs.lib.nixosSystem rec {
specialArgs = { inherit self inputs outputs; };
specialArgs = { inherit inputs self; };
system = "x86_64-linux";
pkgs = nixpkgsFor.${system};
modules = [
./hosts/curve
home-manager.nixosModules.home-manager
self.nixosModules.wallabag
self.nixosModules.gonic
agenix.nixosModules.age
self.nixosModules.backup
self.nixosModules.wireguard
agenix.nixosModules.age
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
# home-manager.users.anish = import ./home/gui;
home-manager.users.anish = import ./home/gui;
}
];
};
@ -180,19 +178,20 @@
homeConfigurations = {
"anish@work" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
extraSpecialArgs = { inherit inputs outputs; };
extraSpecialArgs = { inherit inputs; };
modules = [
./home/core.nix
];
};
};
deploy.nodes = {
box.profiles.system = {
curve.profiles.system = {
user = "root";
path = deploy.lib.x86_64-linux.activate.nixos self.nixosConfigurations.box;
path = deploy.lib.x86_64-linux.activate.nixos self.nixosConfigurations.curve;
};
};
checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy.lib;
# checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy.lib;
};
}

View file

@ -1,6 +1,6 @@
{ pkgs, ... }:
{ self, pkgs, ... }:
{
import = [
imports = [
../profiles/nvim
../profiles/cli
../profiles/direnv

View file

@ -1,6 +1,6 @@
{ pkgs, ... }:
{
import = [
imports = [
../core
../profiles/firefox
../profiles/desktop

View file

@ -1,4 +1,4 @@
{ self, lib, pkgs, config, ... }:
{ lib, pkgs, config, ... }:
{
home.packages = with pkgs; [
binutils
@ -240,8 +240,6 @@
mn = ''
manix "" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | sk --preview="manix '{}'" | xargs manix
'';
# fix nixos-option
nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat";
# sudo
s = "sudo -E ";

View file

@ -7,6 +7,7 @@
# - Import css for sidebery from sidebery.css
# - Configure wallabagger, shaarli, grasp
programs.browserpass.enable = true;
programs.browserpass.browsers = [ "firefox" ];
#env.XDG_DEXSTOP_DIR = "$HOME/";

View file

@ -1,4 +1,4 @@
{ self, pkgs, ... }:
{ self, inputs, pkgs, ... }:
{
imports = [
./configuration.nix
@ -16,6 +16,8 @@
../profiles/mossnet-hosts
];
# home-manager.users.anish = import ../../home/gui;
# Speed up boot by removing dependency on network
systemd = {
targets.network-online.wantedBy = pkgs.lib.mkForce [ ]; # Normally ["multi-user.target"]
@ -45,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 = {

View file

@ -53,12 +53,12 @@ in
environment.systemPackages = with pkgs; [
signal-desktop # bridge to sealight?
scrot
ripcord
# ripcord
feh
sxiv
xkblayout-state
sublime-music
vcv-rack
# vcv-rack
zathura
calibre
nheko

View file

@ -16,8 +16,8 @@
orca-c
supercollider
dirt
sunvox
vcv-rack
# sunvox
# vcv-rack
lmms
bespokesynth
lsp-plugins
@ -27,7 +27,7 @@
# DAWs
# ardour
# reaper
renoise
# renoise
];
hardware.pulseaudio.enable = lib.mkForce false;

View file

@ -7,7 +7,6 @@
# You can change versions, add patches, set compilation flags, anything really.
# https://nixos.wiki/wiki/Overlays
modifications = final: prev: {
plymouth-themes = prev.callPackage ./plymouth.nix { };
# example = prev.example.overrideAttrs (oldAttrs: rec {
# ...
# });

View file

@ -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 agenix deploy-rs ];
nativeBuildInputs = with pkgs; [ nix home-manager git ];
};
}