chore: format
This commit is contained in:
parent
c913d70934
commit
3dbe42d360
30 changed files with 372 additions and 412 deletions
27
default.nix
27
default.nix
|
@ -3,27 +3,20 @@ let
|
||||||
|
|
||||||
default = (import ./lib/compat).defaultNix;
|
default = (import ./lib/compat).defaultNix;
|
||||||
|
|
||||||
ciSystems = [
|
ciSystems = [ "x86_64-linux" ];
|
||||||
"x86_64-linux"
|
|
||||||
];
|
|
||||||
|
|
||||||
filterSystems = lib.filterAttrs
|
filterSystems = lib.filterAttrs (system: _: lib.elem system ciSystems);
|
||||||
(system: _: lib.elem system ciSystems);
|
|
||||||
|
|
||||||
recurseIntoAttrsRecursive = lib.mapAttrs (_: v:
|
recurseIntoAttrsRecursive = lib.mapAttrs (_: v:
|
||||||
if lib.isAttrs v
|
if lib.isAttrs v then
|
||||||
then recurseIntoAttrsRecursive (lib.recurseIntoAttrs v)
|
recurseIntoAttrsRecursive (lib.recurseIntoAttrs v)
|
||||||
else v
|
else
|
||||||
);
|
v);
|
||||||
|
|
||||||
systemOutputs = lib.filterAttrs
|
systemOutputs = lib.filterAttrs (name: set:
|
||||||
(name: set: lib.isAttrs set
|
lib.isAttrs set
|
||||||
&& lib.any
|
&& lib.any (system: set ? ${system} && name != "legacyPackages") ciSystems)
|
||||||
(system: set ? ${system} && name != "legacyPackages")
|
|
||||||
ciSystems
|
|
||||||
)
|
|
||||||
default.outputs;
|
default.outputs;
|
||||||
|
|
||||||
ciDrvs = lib.mapAttrs (_: system: filterSystems system) systemOutputs;
|
ciDrvs = lib.mapAttrs (_: system: filterSystems system) systemOutputs;
|
||||||
in
|
in (recurseIntoAttrsRecursive ciDrvs) // { shell = import ./shell.nix; }
|
||||||
(recurseIntoAttrsRecursive ciDrvs) // { shell = import ./shell.nix; }
|
|
||||||
|
|
55
flake.nix
55
flake.nix
|
@ -2,11 +2,12 @@
|
||||||
description = "A highly structured configuration database.";
|
description = "A highly structured configuration database.";
|
||||||
|
|
||||||
nixConfig.extra-experimental-features = "nix-command flakes";
|
nixConfig.extra-experimental-features = "nix-command flakes";
|
||||||
nixConfig.extra-substituters = "https://nrdxp.cachix.org https://nix-community.cachix.org";
|
nixConfig.extra-substituters =
|
||||||
nixConfig.extra-trusted-public-keys = "nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=";
|
"https://nrdxp.cachix.org https://nix-community.cachix.org";
|
||||||
|
nixConfig.extra-trusted-public-keys =
|
||||||
|
"nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=";
|
||||||
|
|
||||||
inputs =
|
inputs = {
|
||||||
{
|
|
||||||
nixos.url = "github:nixos/nixpkgs/release-21.11";
|
nixos.url = "github:nixos/nixpkgs/release-21.11";
|
||||||
latest.url = "github:nixos/nixpkgs/nixos-unstable";
|
latest.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||||
|
@ -59,25 +60,9 @@
|
||||||
wayland.inputs.nixpkgs.follows = "nixpkgs";
|
wayland.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs = { self, nixos, nixos-hardware, agenix, bud, deploy, digga, emacs
|
||||||
{ self
|
, fenix, home, neovim, nur, nvfetcher, wayland, ... }@inputs:
|
||||||
, nixos
|
digga.lib.mkFlake {
|
||||||
, nixos-hardware
|
|
||||||
, agenix
|
|
||||||
, bud
|
|
||||||
, deploy
|
|
||||||
, digga
|
|
||||||
, emacs
|
|
||||||
, fenix
|
|
||||||
, home
|
|
||||||
, neovim
|
|
||||||
, nur
|
|
||||||
, nvfetcher
|
|
||||||
, wayland
|
|
||||||
, ...
|
|
||||||
} @ inputs:
|
|
||||||
digga.lib.mkFlake
|
|
||||||
{
|
|
||||||
inherit self inputs;
|
inherit self inputs;
|
||||||
|
|
||||||
channelsConfig = { allowUnfree = true; };
|
channelsConfig = { allowUnfree = true; };
|
||||||
|
@ -85,17 +70,13 @@
|
||||||
channels = {
|
channels = {
|
||||||
nixos = {
|
nixos = {
|
||||||
imports = [ (digga.lib.importOverlays ./overlays) ];
|
imports = [ (digga.lib.importOverlays ./overlays) ];
|
||||||
overlays = [
|
overlays = [ ./pkgs/default.nix ];
|
||||||
./pkgs/default.nix
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
latest = { };
|
latest = { };
|
||||||
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
imports = [ (digga.lib.importOverlays ./overlays) ];
|
imports = [ (digga.lib.importOverlays ./overlays) ];
|
||||||
overlays = [
|
overlays = [ ./pkgs/default.nix ];
|
||||||
./pkgs/default.nix
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -104,9 +85,7 @@
|
||||||
sharedOverlays = [
|
sharedOverlays = [
|
||||||
(final: prev: {
|
(final: prev: {
|
||||||
__dontExport = true;
|
__dontExport = true;
|
||||||
lib = prev.lib.extend (lfinal: lprev: {
|
lib = prev.lib.extend (lfinal: lprev: { our = self.lib; });
|
||||||
our = self.lib;
|
|
||||||
});
|
|
||||||
})
|
})
|
||||||
agenix.overlay
|
agenix.overlay
|
||||||
emacs.overlay
|
emacs.overlay
|
||||||
|
@ -134,7 +113,7 @@
|
||||||
|
|
||||||
imports = [ (digga.lib.importHosts ./hosts) ];
|
imports = [ (digga.lib.importHosts ./hosts) ];
|
||||||
hosts = {
|
hosts = {
|
||||||
/* set host specific properties here */
|
# set host specific properties here
|
||||||
NixOS = { };
|
NixOS = { };
|
||||||
};
|
};
|
||||||
importables = rec {
|
importables = rec {
|
||||||
|
@ -163,7 +142,8 @@
|
||||||
|
|
||||||
devshell = ./shell;
|
devshell = ./shell;
|
||||||
|
|
||||||
homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
|
homeConfigurations =
|
||||||
|
digga.lib.mkHomeConfigurations self.nixosConfigurations;
|
||||||
|
|
||||||
deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { };
|
deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { };
|
||||||
|
|
||||||
|
@ -171,10 +151,7 @@
|
||||||
templates.bud.path = ./.;
|
templates.bud.path = ./.;
|
||||||
templates.bud.description = "bud template";
|
templates.bud.description = "bud template";
|
||||||
|
|
||||||
}
|
} // {
|
||||||
//
|
|
||||||
{
|
|
||||||
budModules = { devos = import ./shell/bud; };
|
budModules = { devos = import ./shell/bud; };
|
||||||
}
|
};
|
||||||
;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
{ suites, ... }:
|
{ suites, ... }: {
|
||||||
{
|
|
||||||
### root password is empty by default ###
|
### root password is empty by default ###
|
||||||
imports = suites.base;
|
imports = suites.base;
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
{ profiles, ... }:
|
{ profiles, ... }: {
|
||||||
{
|
|
||||||
# build with: `bud build bootstrap bootstrapIso`
|
# build with: `bud build bootstrap bootstrapIso`
|
||||||
# reachable on the local link via ssh root@fe80::47%eno1
|
# reachable on the local link via ssh root@fe80::47%eno1
|
||||||
# where 'eno1' is replaced by your own machine's network
|
# where 'eno1' is replaced by your own machine's network
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
{ suites, ... }:
|
{ suites, ... }: {
|
||||||
{
|
imports = [ ] ++ suites.base;
|
||||||
imports = [
|
|
||||||
] ++ suites.base;
|
|
||||||
|
|
||||||
bud.enable = true;
|
bud.enable = true;
|
||||||
bud.localFlakeClone = "/home/mrhedgehog/nix";
|
bud.localFlakeClone = "/home/mrhedgehog/nix";
|
||||||
|
@ -23,9 +21,7 @@
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "zaphod";
|
hostName = "zaphod";
|
||||||
enableIPv6 = true;
|
enableIPv6 = true;
|
||||||
networkmanager = {
|
networkmanager = { enable = true; };
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
|
@ -38,9 +34,5 @@
|
||||||
device = "/dev/disk/by-label/nixos";
|
device = "/dev/disk/by-label/nixos";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
swapDevices = [
|
swapDevices = [{ device = "/dev/disk/by-label/swap"; }];
|
||||||
{
|
|
||||||
device = "/dev/disk/by-label/swap";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,14 +1,7 @@
|
||||||
let
|
let
|
||||||
rev = "e7e5d481a0e15dcd459396e55327749989e04ce0";
|
rev = "e7e5d481a0e15dcd459396e55327749989e04ce0";
|
||||||
flake = (import
|
flake = (import (fetchTarball {
|
||||||
(
|
|
||||||
fetchTarball {
|
|
||||||
url = "https://github.com/edolstra/flake-compat/archive/${rev}.tar.gz";
|
url = "https://github.com/edolstra/flake-compat/archive/${rev}.tar.gz";
|
||||||
sha256 = "0zd3x46fswh5n6faq4x2kkpy6p3c6j593xbdlbsl40ppkclwc80x";
|
sha256 = "0zd3x46fswh5n6faq4x2kkpy6p3c6j593xbdlbsl40ppkclwc80x";
|
||||||
}
|
}) { src = ../../.; });
|
||||||
)
|
in flake
|
||||||
{
|
|
||||||
src = ../../.;
|
|
||||||
});
|
|
||||||
in
|
|
||||||
flake
|
|
||||||
|
|
|
@ -6,5 +6,4 @@ let
|
||||||
configs = default.nixosConfigurations;
|
configs = default.nixosConfigurations;
|
||||||
default = (import ../.).defaultNix;
|
default = (import ../.).defaultNix;
|
||||||
hostname = lib.fileContents /etc/hostname;
|
hostname = lib.fileContents /etc/hostname;
|
||||||
in
|
in host
|
||||||
host
|
|
||||||
|
|
|
@ -1,2 +1 @@
|
||||||
{ lib }:
|
{ lib }: lib.makeExtensible (self: { })
|
||||||
lib.makeExtensible (self: { })
|
|
||||||
|
|
|
@ -1,11 +1,9 @@
|
||||||
{ config, ... }: {
|
{ config, ... }: {
|
||||||
home-manager.sharedModules = [
|
home-manager.sharedModules = [{
|
||||||
{
|
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
inherit (config.environment.sessionVariables) NIX_PATH;
|
inherit (config.environment.sessionVariables) NIX_PATH;
|
||||||
};
|
};
|
||||||
xdg.configFile."nix/registry.json".text =
|
xdg.configFile."nix/registry.json".text =
|
||||||
config.environment.etc."nix/registry.json".text;
|
config.environment.etc."nix/registry.json".text;
|
||||||
}
|
}];
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
final: prev: {
|
final: prev: {
|
||||||
manix = prev.manix.overrideAttrs (o: rec{
|
manix = prev.manix.overrideAttrs
|
||||||
inherit (prev.sources.manix) pname version src;
|
(o: rec { inherit (prev.sources.manix) pname version src; });
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,15 +3,6 @@ channels: final: prev: {
|
||||||
__dontExport = true; # overrides clutter up actual creations
|
__dontExport = true; # overrides clutter up actual creations
|
||||||
|
|
||||||
inherit (channels.latest)
|
inherit (channels.latest)
|
||||||
cachix
|
cachix dhall discord element-desktop rage nixpkgs-fmt qutebrowser
|
||||||
dhall
|
signal-desktop starship deploy-rs;
|
||||||
discord
|
|
||||||
element-desktop
|
|
||||||
rage
|
|
||||||
nixpkgs-fmt
|
|
||||||
qutebrowser
|
|
||||||
signal-desktop
|
|
||||||
starship
|
|
||||||
deploy-rs
|
|
||||||
;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
# This file was generated by nvfetcher, please do not modify it manually.
|
# This file was generated by nvfetcher, please do not modify it manually.
|
||||||
{ fetchgit, fetchurl }:
|
{ fetchgit, fetchurl }: {
|
||||||
{
|
|
||||||
manix = {
|
manix = {
|
||||||
pname = "manix";
|
pname = "manix";
|
||||||
version = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4";
|
version = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4";
|
||||||
|
|
|
@ -2,10 +2,11 @@
|
||||||
let
|
let
|
||||||
folder = ./.;
|
folder = ./.;
|
||||||
toImport = name: value: folder + ("/" + name);
|
toImport = name: value: folder + ("/" + name);
|
||||||
filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key && key != "default.nix";
|
filterCaches = key: value:
|
||||||
imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
|
value == "regular" && lib.hasSuffix ".nix" key && key != "default.nix";
|
||||||
in
|
imports = lib.mapAttrsToList toImport
|
||||||
{
|
(lib.filterAttrs filterCaches (builtins.readDir folder));
|
||||||
|
in {
|
||||||
inherit imports;
|
inherit imports;
|
||||||
nix.binaryCaches = [ "https://cache.nixos.org/" ];
|
nix.binaryCaches = [ "https://cache.nixos.org/" ];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
{
|
{
|
||||||
nix = {
|
nix = {
|
||||||
binaryCaches = [ "https://nix-community.cachix.org" ];
|
binaryCaches = [ "https://nix-community.cachix.org" ];
|
||||||
binaryCachePublicKeys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ];
|
binaryCachePublicKeys = [
|
||||||
|
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||||
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
{
|
{
|
||||||
nix = {
|
nix = {
|
||||||
binaryCaches = [ "https://nixpkgs-wayland.cachix.org" ];
|
binaryCaches = [ "https://nixpkgs-wayland.cachix.org" ];
|
||||||
binaryCachePublicKeys = [ "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" ];
|
binaryCachePublicKeys = [
|
||||||
|
"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
|
||||||
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{
|
{
|
||||||
nix = {
|
nix = {
|
||||||
binaryCaches = [ "https://nrdxp.cachix.org" ];
|
binaryCaches = [ "https://nrdxp.cachix.org" ];
|
||||||
binaryCachePublicKeys = [ "nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4=" ];
|
binaryCachePublicKeys =
|
||||||
|
[ "nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4=" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{
|
{
|
||||||
nix = {
|
nix = {
|
||||||
binaryCaches = [ "https://statix.cachix.org" ];
|
binaryCaches = [ "https://statix.cachix.org" ];
|
||||||
binaryCachePublicKeys = [ "statix.cachix.org-1:Z9E/g1YjCjU117QOOt07OjhljCoRZddiAm4VVESvais=" ];
|
binaryCachePublicKeys =
|
||||||
|
[ "statix.cachix.org-1:Z9E/g1YjCjU117QOOt07OjhljCoRZddiAm4VVESvais=" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{ self, config, lib, pkgs, ... }:
|
{ self, config, lib, pkgs, ... }:
|
||||||
let inherit (lib) fileContents;
|
let inherit (lib) fileContents;
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
imports = [ ../cachix ];
|
imports = [ ../cachix ];
|
||||||
|
|
||||||
nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
|
nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
|
||||||
|
@ -33,10 +32,8 @@ in
|
||||||
whois
|
whois
|
||||||
];
|
];
|
||||||
|
|
||||||
shellAliases =
|
shellAliases = let ifSudo = lib.mkIf config.security.sudo.enable;
|
||||||
let ifSudo = lib.mkIf config.security.sudo.enable;
|
in {
|
||||||
in
|
|
||||||
{
|
|
||||||
# quick cd
|
# quick cd
|
||||||
".." = "cd ..";
|
".." = "cd ..";
|
||||||
"..." = "cd ../..";
|
"..." = "cd ../..";
|
||||||
|
|
|
@ -3,7 +3,4 @@ let
|
||||||
system = "";
|
system = "";
|
||||||
user = "";
|
user = "";
|
||||||
allKeys = [ system user ];
|
allKeys = [ system user ];
|
||||||
in
|
in { "secret.age".publicKeys = allKeys; }
|
||||||
{
|
|
||||||
"secret.age".publicKeys = allKeys;
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,10 +1,5 @@
|
||||||
{ self, inputs, ... }:
|
{ self, inputs, ... }: {
|
||||||
{
|
modules = with inputs; [ bud.devshellModules.bud ];
|
||||||
modules = with inputs; [
|
exportedModules = [ ./devos.nix ];
|
||||||
bud.devshellModules.bud
|
|
||||||
];
|
|
||||||
exportedModules = [
|
|
||||||
./devos.nix
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -8,8 +8,7 @@ let
|
||||||
docs = pkgWithCategory "docs";
|
docs = pkgWithCategory "docs";
|
||||||
devos = pkgWithCategory "devos";
|
devos = pkgWithCategory "devos";
|
||||||
|
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
_file = toString ./.;
|
_file = toString ./.;
|
||||||
|
|
||||||
imports = [ "${extraModulesPath}/git/hooks.nix" ];
|
imports = [ "${extraModulesPath}/git/hooks.nix" ];
|
||||||
|
@ -30,14 +29,16 @@ in
|
||||||
unset _PATH
|
unset _PATH
|
||||||
'');
|
'');
|
||||||
|
|
||||||
commands = with pkgs; [
|
commands = with pkgs;
|
||||||
|
[
|
||||||
(devos nixUnstable)
|
(devos nixUnstable)
|
||||||
(devos agenix)
|
(devos agenix)
|
||||||
{
|
{
|
||||||
category = "devos";
|
category = "devos";
|
||||||
name = pkgs.nvfetcher-bin.pname;
|
name = pkgs.nvfetcher-bin.pname;
|
||||||
help = pkgs.nvfetcher-bin.meta.description;
|
help = pkgs.nvfetcher-bin.meta.description;
|
||||||
command = "cd $PRJ_ROOT/pkgs; ${pkgs.nvfetcher-bin}/bin/nvfetcher -c ./sources.toml $@";
|
command =
|
||||||
|
"cd $PRJ_ROOT/pkgs; ${pkgs.nvfetcher-bin}/bin/nvfetcher -c ./sources.toml $@";
|
||||||
}
|
}
|
||||||
(linter nixpkgs-fmt)
|
(linter nixpkgs-fmt)
|
||||||
(linter editorconfig-checker)
|
(linter editorconfig-checker)
|
||||||
|
@ -46,9 +47,7 @@ in
|
||||||
(devos inputs.deploy.packages.${pkgs.system}.deploy-rs)
|
(devos inputs.deploy.packages.${pkgs.system}.deploy-rs)
|
||||||
]
|
]
|
||||||
|
|
||||||
++ lib.optional
|
++ lib.optional (system != "i686-linux") (devos cachix)
|
||||||
(system != "i686-linux")
|
|
||||||
(devos cachix)
|
|
||||||
|
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,19 +1,16 @@
|
||||||
{ hmUsers, pkgs, ... }:
|
{ hmUsers, pkgs, ... }: {
|
||||||
{
|
|
||||||
home-manager.users = { inherit (hmUsers) mrhedgehog; };
|
home-manager.users = { inherit (hmUsers) mrhedgehog; };
|
||||||
|
|
||||||
users.users.mrhedgehog = {
|
users.users.mrhedgehog = {
|
||||||
description = "Mr Hedgehog";
|
description = "Mr Hedgehog";
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = [ "wheel" "networkmanager" ];
|
extraGroups = [ "wheel" "networkmanager" ];
|
||||||
hashedPassword = "$6$6EtuZhVOJdfI9DYP$1Qnd7R8qdN.E5yE2kDQCNg2zgJ5cIjNBKsIW/qJgb8wcKlUpIoVg/fEKvBkAgCiLyojVG2kzfu4J9LR8rA8a2/";
|
hashedPassword =
|
||||||
|
"$6$6EtuZhVOJdfI9DYP$1Qnd7R8qdN.E5yE2kDQCNg2zgJ5cIjNBKsIW/qJgb8wcKlUpIoVg/fEKvBkAgCiLyojVG2kzfu4J9LR8rA8a2/";
|
||||||
shell = pkgs.fish;
|
shell = pkgs.fish;
|
||||||
openssh = {
|
openssh = {
|
||||||
authorizedKeys = {
|
authorizedKeys = {
|
||||||
keyFiles = [
|
keyFiles = [ ../../ssh/yubikey.pub ../../ssh/backup.pub ];
|
||||||
../../ssh/yubikey.pub
|
|
||||||
../../ssh/backup.pub
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -1 +1,6 @@
|
||||||
{ programs.direnv = { enable = true; nix-direnv = { enable = true; }; }; }
|
{
|
||||||
|
programs.direnv = {
|
||||||
|
enable = true;
|
||||||
|
nix-direnv = { enable = true; };
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
|
@ -11,8 +11,7 @@
|
||||||
"hmr" =
|
"hmr" =
|
||||||
"${pkgs.home-manager}/bin/home-manager build --flake ~/nix && ${pkgs.home-manager}/bin/home-manager switch --flake ~/nix";
|
"${pkgs.home-manager}/bin/home-manager build --flake ~/nix && ${pkgs.home-manager}/bin/home-manager switch --flake ~/nix";
|
||||||
};
|
};
|
||||||
shellInit =
|
shellInit = ''
|
||||||
''
|
|
||||||
set -x GPG_TTY (tty)
|
set -x GPG_TTY (tty)
|
||||||
set -x SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket)
|
set -x SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket)
|
||||||
gpgconf --launch gpg-agent
|
gpgconf --launch gpg-agent
|
||||||
|
|
|
@ -36,8 +36,10 @@
|
||||||
# logging
|
# logging
|
||||||
lg =
|
lg =
|
||||||
"log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
|
"log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
|
||||||
plog = "log --graph --pretty='format:%C(red)%d%C(reset) %C(yellow)%h%C(reset) %ar %C(green)%aN%C(reset) %s'";
|
plog =
|
||||||
tlog = "log --stat --since='1 Day Ago' --graph --pretty=oneline --abbrev-commit --date=relative";
|
"log --graph --pretty='format:%C(red)%d%C(reset) %C(yellow)%h%C(reset) %ar %C(green)%aN%C(reset) %s'";
|
||||||
|
tlog =
|
||||||
|
"log --stat --since='1 Day Ago' --graph --pretty=oneline --abbrev-commit --date=relative";
|
||||||
rank = "shortlog -sn --no-merges";
|
rank = "shortlog -sn --no-merges";
|
||||||
# delete merged branches
|
# delete merged branches
|
||||||
bdm = "!git branch --merged | grep -v '*' | xargs -n 1 git branch -d";
|
bdm = "!git branch --merged | grep -v '*' | xargs -n 1 git branch -d";
|
||||||
|
|
|
@ -1,12 +1,16 @@
|
||||||
{
|
{
|
||||||
programs.gpg = {
|
programs.gpg = {
|
||||||
enable = true;
|
enable = true;
|
||||||
publicKeys = [{ source = ./key.pub; trust = 5; }];
|
publicKeys = [{
|
||||||
|
source = ./key.pub;
|
||||||
|
trust = 5;
|
||||||
|
}];
|
||||||
settings = {
|
settings = {
|
||||||
personal-cipher-preferences = "AES256 AES192 AES";
|
personal-cipher-preferences = "AES256 AES192 AES";
|
||||||
personal-digest-preferences = "SHA512 SHA384 SHA256";
|
personal-digest-preferences = "SHA512 SHA384 SHA256";
|
||||||
personal-compress-preferences = "ZLIB BZIP2 ZIP Uncompressed";
|
personal-compress-preferences = "ZLIB BZIP2 ZIP Uncompressed";
|
||||||
default-preference-list = "SHA512 SHA384 SHA256 AES256 AES192 AES ZLIB BZIP2 ZIP Uncompressed";
|
default-preference-list =
|
||||||
|
"SHA512 SHA384 SHA256 AES256 AES192 AES ZLIB BZIP2 ZIP Uncompressed";
|
||||||
cert-digest-algo = "SHA512";
|
cert-digest-algo = "SHA512";
|
||||||
s2k-digest-algo = "SHA512";
|
s2k-digest-algo = "SHA512";
|
||||||
s2k-cipher-algo = "AES256";
|
s2k-cipher-algo = "AES256";
|
||||||
|
@ -28,6 +32,10 @@
|
||||||
trusted-key = "0x7D5107866B1C6752";
|
trusted-key = "0x7D5107866B1C6752";
|
||||||
keyserver = "hkps://keys.openpgp.org";
|
keyserver = "hkps://keys.openpgp.org";
|
||||||
};
|
};
|
||||||
scdaemonSettings = { card-timeout = "5"; pcsc-shared = true; shared-access = true; };
|
scdaemonSettings = {
|
||||||
|
card-timeout = "5";
|
||||||
|
pcsc-shared = true;
|
||||||
|
shared-access = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,19 +1,11 @@
|
||||||
{ config
|
{ config, lib, pkgs, ... }:
|
||||||
, lib
|
let nvimconf = import ./config/nvim.nix;
|
||||||
, pkgs
|
in {
|
||||||
, ...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
nvimconf = import ./config/nvim.nix;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
home = {
|
home = {
|
||||||
homeDirectory = "/home/mrhedgehog/";
|
homeDirectory = "/home/mrhedgehog/";
|
||||||
stateVersion = "22.05";
|
stateVersion = "22.05";
|
||||||
username = "mrhedgehog";
|
username = "mrhedgehog";
|
||||||
packages =
|
packages = with pkgs; [
|
||||||
with pkgs;
|
|
||||||
[
|
|
||||||
atomicparsley
|
atomicparsley
|
||||||
# buku
|
# buku
|
||||||
cargo-audit
|
cargo-audit
|
||||||
|
@ -55,13 +47,21 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
programs = {
|
programs = {
|
||||||
home-manager = { enable = true; path = "./home-manager"; };
|
home-manager = {
|
||||||
|
enable = true;
|
||||||
|
path = "./home-manager";
|
||||||
|
};
|
||||||
atuin = {
|
atuin = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableBashIntegration = true;
|
enableBashIntegration = true;
|
||||||
enableZshIntegration = true;
|
enableZshIntegration = true;
|
||||||
enableFishIntegration = true;
|
enableFishIntegration = true;
|
||||||
settings = { auto_sync = true; sync_address = "https://api.atuin.sh"; sync_frequency = "15m"; search_mode = "prefix"; };
|
settings = {
|
||||||
|
auto_sync = true;
|
||||||
|
sync_address = "https://api.atuin.sh";
|
||||||
|
sync_frequency = "15m";
|
||||||
|
search_mode = "prefix";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
himalaya = { enable = true; };
|
himalaya = { enable = true; };
|
||||||
neovim = nvimconf pkgs lib;
|
neovim = nvimconf pkgs lib;
|
||||||
|
|
|
@ -2,20 +2,14 @@
|
||||||
programs = {
|
programs = {
|
||||||
bat = {
|
bat = {
|
||||||
enable = true;
|
enable = true;
|
||||||
config = {
|
config = { theme = "Dracula"; };
|
||||||
theme = "Dracula";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
exa = {
|
exa = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableAliases = false;
|
enableAliases = false;
|
||||||
};
|
};
|
||||||
lazygit = {
|
lazygit = { enable = true; };
|
||||||
enable = true;
|
pandoc = { enable = true; };
|
||||||
};
|
|
||||||
pandoc = {
|
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
zoxide = {
|
zoxide = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableBashIntegration = true;
|
enableBashIntegration = true;
|
||||||
|
|
|
@ -10,6 +10,8 @@
|
||||||
extraOptions = { "PreferredAuthentications" = "publickey"; };
|
extraOptions = { "PreferredAuthentications" = "publickey"; };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
extraOptionOverrides = { "Match" = "host * exec \"gpg-connect-agent UPDATESTARTUPTTY /bye\""; };
|
extraOptionOverrides = {
|
||||||
|
"Match" = ''host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye"'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,9 +5,7 @@
|
||||||
enableBashIntegration = true;
|
enableBashIntegration = true;
|
||||||
enableZshIntegration = true;
|
enableZshIntegration = true;
|
||||||
settings = {
|
settings = {
|
||||||
format =
|
format = lib.concatStrings [
|
||||||
lib.concatStrings
|
|
||||||
[
|
|
||||||
"$directory"
|
"$directory"
|
||||||
"$rust"
|
"$rust"
|
||||||
"$python"
|
"$python"
|
||||||
|
@ -21,16 +19,38 @@
|
||||||
"$character"
|
"$character"
|
||||||
];
|
];
|
||||||
directory = { read_only = " "; };
|
directory = { read_only = " "; };
|
||||||
git_branch = { symbol = " "; format = "\\[[$symbol$branch]($style)\\]"; };
|
git_branch = {
|
||||||
|
symbol = " ";
|
||||||
|
format = "\\[[$symbol$branch]($style)\\]";
|
||||||
|
};
|
||||||
git_status = { format = "([\\[$all_status$ahead_behind\\]]($style))"; };
|
git_status = { format = "([\\[$all_status$ahead_behind\\]]($style))"; };
|
||||||
golang = { symbol = " "; format = "\\[[$symbol($version)]($style)\\]"; };
|
golang = {
|
||||||
|
symbol = " ";
|
||||||
|
format = "\\[[$symbol($version)]($style)\\]";
|
||||||
|
};
|
||||||
nodejs = { format = "\\[[$symbol($version)]($style)\\]"; };
|
nodejs = { format = "\\[[$symbol($version)]($style)\\]"; };
|
||||||
lua = { symbol = " "; format = "\\[[\${symbol}\${version}]($style)\\]"; };
|
lua = {
|
||||||
package = { symbol = " "; format = "\\[[$symbol$version]($style)\\]"; };
|
symbol = " ";
|
||||||
python = { symbol = " "; format = "\\[[\${symbol}\${pyenv_prefix}(\${version})(\\($virtualenv\\))]($style)\\]"; };
|
format = "\\[[\${symbol}\${version}]($style)\\]";
|
||||||
rust = { symbol = " "; format = "\\[[$symbol($version)]($style)\\]"; };
|
};
|
||||||
|
package = {
|
||||||
|
symbol = " ";
|
||||||
|
format = "\\[[$symbol$version]($style)\\]";
|
||||||
|
};
|
||||||
|
python = {
|
||||||
|
symbol = " ";
|
||||||
|
format =
|
||||||
|
"\\[[\${symbol}\${pyenv_prefix}(\${version})(\\($virtualenv\\))]($style)\\]";
|
||||||
|
};
|
||||||
|
rust = {
|
||||||
|
symbol = " ";
|
||||||
|
format = "\\[[$symbol($version)]($style)\\]";
|
||||||
|
};
|
||||||
shlvl = { symbol = " "; };
|
shlvl = { symbol = " "; };
|
||||||
nix_shell = { symbol = " "; format = "\\[[$symbol($version)]($style)\\]"; };
|
nix_shell = {
|
||||||
|
symbol = " ";
|
||||||
|
format = "\\[[$symbol($version)]($style)\\]";
|
||||||
|
};
|
||||||
aws.disabled = true;
|
aws.disabled = true;
|
||||||
conda.disabled = true;
|
conda.disabled = true;
|
||||||
crystal.disabled = true;
|
crystal.disabled = true;
|
||||||
|
|
Loading…
Reference in a new issue