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" "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": { "poonam": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
@ -321,6 +336,7 @@
"hardware": "hardware", "hardware": "hardware",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nur": "nur",
"poonam": "poonam", "poonam": "poonam",
"rust-overlay": "rust-overlay", "rust-overlay": "rust-overlay",
"tidalcycles": "tidalcycles", "tidalcycles": "tidalcycles",

View file

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

View file

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

View file

@ -1,4 +1,4 @@
{ self, lib, pkgs, config, ... }: { lib, pkgs, config, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
binutils binutils
@ -240,8 +240,6 @@
mn = '' mn = ''
manix "" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | sk --preview="manix '{}'" | xargs manix 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 # sudo
s = "sudo -E "; s = "sudo -E ";

View file

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

View file

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

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

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
@ -27,7 +27,7 @@
# DAWs # DAWs
# ardour # ardour
# reaper # reaper
renoise # renoise
]; ];
hardware.pulseaudio.enable = lib.mkForce false; hardware.pulseaudio.enable = lib.mkForce false;

View file

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

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