pegasust
/
dotfiles
1
0
Fork 0
Code Issues 6 Pull Requests Projects Releases Wiki Activity

wip: fix some more boneheads; stuck at starshpi not accepting nested list

std
Hung 2023-06-18 00:52:08 -07:00
parent 820736fc8c
commit 3f1f1c8f6f
8 changed files with 42 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
flake.lock
View File

@ -96,7 +96,7 @@
"crane_3": { "crane_3": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_7", "flake-compat": "flake-compat_7",
"flake-utils": "flake-utils_10", "flake-utils": "flake-utils_9",
"nixpkgs": [ "nixpkgs": [
"std", "std",
"paisano-mdbook-preprocessor", "paisano-mdbook-preprocessor",
@ -167,7 +167,7 @@
"std", "std",
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_6" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1686680692, "lastModified": 1686680692,
@ -474,21 +474,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_10": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": { "flake-utils_2": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
@ -589,15 +574,12 @@
} }
}, },
"flake-utils_8": { "flake-utils_8": {
"inputs": {
"systems": "systems_5"
},
"locked": { "locked": {
"lastModified": 1685518550, "lastModified": 1659877975,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -608,11 +590,11 @@
}, },
"flake-utils_9": { "flake-utils_9": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1667395993,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1109,11 +1091,11 @@
}, },
"nixpkgs-latest": { "nixpkgs-latest": {
"locked": { "locked": {
"lastModified": 1687069429, "lastModified": 1687069865,
"narHash": "sha256-AEBWBsIxyE5YJrY4ih/KDgCMSufVD3Dec9ruVuXbuFo=", "narHash": "sha256-+JcVIxijVccnSnbGl8INEKkRo3GzHZ7iBm4EZ2MC1O8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "192011a33fdfda7b9a1bc42fba5c964fd5452d54", "rev": "5630d719e9e90f66f9eaa4a2d00b303dbee9f4c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1607,27 +1589,6 @@
"type": "github" "type": "github"
} }
}, },
"poetry2nix_2": {
"inputs": {
"flake-utils": "flake-utils_8",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1686970505,
"narHash": "sha256-s3gtsusfeIoMYy0BTXXfoDq1IeDj8rPl4JMcR97H9XU=",
"owner": "nix-community",
"repo": "poetry2nix",
"rev": "95d3cbc56d21917abace0cc1de10997469eb80b4",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "poetry2nix",
"type": "github"
}
},
"pre-commit-hooks-nix": { "pre-commit-hooks-nix": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
@ -1665,7 +1626,6 @@
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_10", "nixpkgs": "nixpkgs_10",
"nixpkgs-latest": "nixpkgs-latest", "nixpkgs-latest": "nixpkgs-latest",
"poetry2nix": "poetry2nix_2",
"std": "std_2" "std": "std_2"
} }
}, },
@ -1863,7 +1823,7 @@
"blank": "blank_2", "blank": "blank_2",
"devshell": "devshell_2", "devshell": "devshell_2",
"dmerge": "dmerge_2", "dmerge": "dmerge_2",
"flake-utils": "flake-utils_9", "flake-utils": "flake-utils_8",
"haumea": "haumea_2", "haumea": "haumea_2",
"incl": "incl_2", "incl": "incl_2",
"makes": [ "makes": [
@ -1971,21 +1931,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,

13
flake.nix
View File

@ -10,10 +10,6 @@
nixpkgs-latest.url = "github:nixos/nixpkgs"; nixpkgs-latest.url = "github:nixos/nixpkgs";
deploy-rs.url = "github:serokell/deploy-rs"; deploy-rs.url = "github:serokell/deploy-rs";
std.url = "github:divnix/std"; std.url = "github:divnix/std";
poetry2nix = {
url = "github:nix-community/poetry2nix";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -48,12 +44,15 @@
# modules = ./nix/modules; # modules = ./nix/modules;
cellBlocks = let cellBlocks = let
inherit (std.blockTypes) devshells functions; inherit (std.blockTypes) devshells functions anything installables;
in [ in [
(devshells "devshells") (devshells "devshells")
(devshells "userShells") (devshells "userShells")
(functions "home-profiles") (functions "home-profiles")
(functions "home-modules") (functions "home-modules")
(anything "home-configs")
(installables "packages")
(anything "lib")
]; ];
} }
{ {
@ -61,9 +60,11 @@
# nixosConfigurations = std.pick [ [ "dotfiles" "nixos" ] ]; # nixosConfigurations = std.pick [ [ "dotfiles" "nixos" ] ];
# homeConfigurations = std.pick [ [ "dotfiles" "home" ] ]; # homeConfigurations = std.pick [ [ "dotfiles" "home" ] ];
homeModules = std.pick self [["repo" "home-modules"]]; homeModules = std.pick self [["repo" "home-modules"]];
packages = std.harvest self [["repo" "packages"]];
legacyPackages = std.harvest self [["repo" "home-configs"]];
lib = std.pick self [["repo" "lib"]];
# TODO: Debug only # TODO: Debug only
homeProfiles = std.pick self [["repo" "home-profiles"]]; homeProfiles = std.pick self [["repo" "home-profiles"]];
packages = std.harvest self [["repo" "home-configs"] ["repo" "packages"]];
}; };
} }

4
nix/cells/dotfiles/packages/default.nix
View File

@ -2,7 +2,9 @@
inputs, inputs,
cell, cell,
}: let }: let
inherit (inputs.poetry2nix) mkPoetryApplication defaultPoetryOverrides; inherit (inputs.nixpkgs) system;
inherit (inputs.nix-boost.pkgs."${system}".mypkgs) poetry2nix;
inherit (poetry2nix) mkPoetryApplication defaultPoetryOverrides;
in { in {
kpcli-py = mkPoetryApplication { kpcli-py = mkPoetryApplication {
projectDir = inputs.kpcli-py; projectDir = inputs.kpcli-py;

10
nix/cells/repo/home-configs/default.nix
View File

@ -23,10 +23,10 @@
home-profiles.nix-index home-profiles.nix-index
]; ];
in { in {
htran = home-config { homeConfigurations.htran = home-config {
supported_systems = ["aarch64-darwin" "x86_64-darwin"]; supported_systems = ["aarch64-darwin" "x86_64-darwin"];
tested_systems = ["aarch64-darwin"]; tested_systems = ["aarch64-darwin"];
hm = home-manager.lib.homeConfigurations { hm = home-manager.lib.homeManagerConfiguration {
inherit pkgs; inherit pkgs;
modules = base-modules ++ [ modules = base-modules ++ [
home-profiles.nerd_font_module home-profiles.nerd_font_module
@ -34,11 +34,13 @@ in {
home-profiles.dev-packages home-profiles.dev-packages
home-profiles.zk home-profiles.zk
home-modules.darwin-spotlight home-modules.darwin-spotlight
];
# TODO: might need config prefix. remove this todo after QA ({
home.username = "htran"; home.username = "htran";
home.homeDirectory = "/Users/htran"; home.homeDirectory = "/Users/htran";
home.stateVersion = "23.11"; home.stateVersion = "23.11";
})
];
}; };
}; };
} }

7
nix/cells/repo/home-modules/default.nix
View File

@ -91,7 +91,7 @@ in
}; };
}; };
alacritty = { config, lib }: alacritty = { config, lib, ... }:
let let
inherit (inputs.cells.repo.lib) fromYAML; inherit (inputs.cells.repo.lib) fromYAML;
cfg = config."${namespace}".alacritty; cfg = config."${namespace}".alacritty;
@ -133,13 +133,12 @@ in
enable = cfg.enable; enable = cfg.enable;
settings = settings =
let let
;
actualConfig = actualConfig =
if cfg.config-path != null then fromYAML (builtins.readFile cfg.config-path) else { }; if cfg.config-path != null then fromYAML (builtins.readFile cfg.config-path) else { };
in in
lib.recursiveUpdate actualConfig { lib.recursiveUpdate actualConfig {
font.normal.family = lib.mkIf (font.family != null) font.family; font.normal.family = lib.mkIf (cfg.font.family != null) cfg.font.family;
font.size = lib.mkIf (font.size != null) font.size; font.size = lib.mkIf (cfg.font.size != null) cfg.font.size;
}; };
}; };
}; };

17
nix/cells/repo/home-profiles/default.nix
View File

@ -15,10 +15,6 @@ in {
pkgs, pkgs,
... ...
}: { }: {
imports = [
import
inputs.cells."${namespace}"
];
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
home.packages = [ home.packages = [
(pkgs.nerdfonts.override {fonts = ["Hack"];}) (pkgs.nerdfonts.override {fonts = ["Hack"];})
@ -74,12 +70,11 @@ in {
cfg = config."${namespace}".alacritty; cfg = config."${namespace}".alacritty;
in { in {
imports = [ imports = [
import inputs.cells.repo.home-modules.alacritty
"${inputs.cells.repo.home-modules.alacritty}"
]; ];
configs."${namespace}".alacritty = { config."${namespace}".alacritty = {
enable = true; enable = true;
config-path = "${inputs.self}//native-configs/alacritty/alacritty.yml"; config-path = "${inputs.self}//native_configs/alacritty/alacritty.yml";
font.size = 11.0; font.size = 11.0;
font.family = "Hack Nerd Font Mono"; font.family = "Hack Nerd Font Mono";
}; };
@ -144,8 +139,10 @@ in {
git-htran = { git-htran = {
imports = [inputs.cells.repo.home-profiles.git]; imports = [inputs.cells.repo.home-profiles.git];
config.git."${namespace}".name = "htran"; config."${namespace}".git = {
config.git."${namespace}".email = "htran@egihosting.com"; name = "htran";
email = "htran@egihosting.com";
};
}; };
git-pegasust = { git-pegasust = {

2
nix/cells/repo/home-profiles/neovim.nix
View File

@ -18,7 +18,7 @@
# see: :/--suffix.*PATH # see: :/--suffix.*PATH
# there should be mentions of additional packages # there should be mentions of additional packages
my_neovim = pkgs.neovim-unwrapped; my_neovim = pkgs.neovim-unwrapped;
inherit (inputs) system; inherit (inputs.nixpkgs) system;
nvim_pkgs = nvim_pkgs =
[ [
# pkgs.gccStdenv # pkgs.gccStdenv

2
nix/cells/repo/home-profiles/shells.nix
View File

@ -52,7 +52,7 @@ in {
programs.tmux = { programs.tmux = {
enable = true; enable = true;
plugins = let inherit (pkgs.tmuxPlugins) cpu net-speed; in [cpu net-speed]; plugins = let inherit (pkgs.tmuxPlugins) cpu net-speed; in [cpu net-speed];
extraConfig = builtins.readFile "${innputs.self}/native_configs/tmux/tmux.conf"; extraConfig = builtins.readFile "${inputs.self}/native_configs/tmux/tmux.conf";
}; };
xdg.configFile."tmux/tmux.conf".text = lib.mkOrder 600 '' xdg.configFile."tmux/tmux.conf".text = lib.mkOrder 600 ''
set -g status-right '#{cpu_bg_color} CPU: #{cpu_icon} #{cpu_percentage} | %a %h-%d %H:%M ' set -g status-right '#{cpu_bg_color} CPU: #{cpu_icon} #{cpu_percentage} | %a %h-%d %H:%M '