From 3f1f1c8f6f289e9fcae49909004fbe13e1e01890 Mon Sep 17 00:00:00 2001 From: Hung Date: Sun, 18 Jun 2023 00:52:08 -0700 Subject: [PATCH] wip: fix some more boneheads; stuck at starshpi not accepting nested list --- flake.lock | 79 ++++-------------------- flake.nix | 13 ++-- nix/cells/dotfiles/packages/default.nix | 4 +- nix/cells/repo/home-configs/default.nix | 14 +++-- nix/cells/repo/home-modules/default.nix | 7 +-- nix/cells/repo/home-profiles/default.nix | 17 +++-- nix/cells/repo/home-profiles/neovim.nix | 2 +- nix/cells/repo/home-profiles/shells.nix | 2 +- 8 files changed, 42 insertions(+), 96 deletions(-) diff --git a/flake.lock b/flake.lock index 676ed68..cb85208 100644 --- a/flake.lock +++ b/flake.lock @@ -96,7 +96,7 @@ "crane_3": { "inputs": { "flake-compat": "flake-compat_7", - "flake-utils": "flake-utils_10", + "flake-utils": "flake-utils_9", "nixpkgs": [ "std", "paisano-mdbook-preprocessor", @@ -167,7 +167,7 @@ "std", "nixpkgs" ], - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1686680692, @@ -474,21 +474,6 @@ "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": { "locked": { "lastModified": 1667395993, @@ -589,15 +574,12 @@ } }, "flake-utils_8": { - "inputs": { - "systems": "systems_5" - }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -608,11 +590,11 @@ }, "flake-utils_9": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -1109,11 +1091,11 @@ }, "nixpkgs-latest": { "locked": { - "lastModified": 1687069429, - "narHash": "sha256-AEBWBsIxyE5YJrY4ih/KDgCMSufVD3Dec9ruVuXbuFo=", + "lastModified": 1687069865, + "narHash": "sha256-+JcVIxijVccnSnbGl8INEKkRo3GzHZ7iBm4EZ2MC1O8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "192011a33fdfda7b9a1bc42fba5c964fd5452d54", + "rev": "5630d719e9e90f66f9eaa4a2d00b303dbee9f4c3", "type": "github" }, "original": { @@ -1607,27 +1589,6 @@ "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": { "inputs": { "flake-compat": "flake-compat_3", @@ -1665,7 +1626,6 @@ "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs_10", "nixpkgs-latest": "nixpkgs-latest", - "poetry2nix": "poetry2nix_2", "std": "std_2" } }, @@ -1863,7 +1823,7 @@ "blank": "blank_2", "devshell": "devshell_2", "dmerge": "dmerge_2", - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_8", "haumea": "haumea_2", "incl": "incl_2", "makes": [ @@ -1971,21 +1931,6 @@ "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": { "locked": { "lastModified": 1667395993, diff --git a/flake.nix b/flake.nix index 0e06186..58b6fa1 100644 --- a/flake.nix +++ b/flake.nix @@ -10,10 +10,6 @@ nixpkgs-latest.url = "github:nixos/nixpkgs"; deploy-rs.url = "github:serokell/deploy-rs"; std.url = "github:divnix/std"; - poetry2nix = { - url = "github:nix-community/poetry2nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -48,12 +44,15 @@ # modules = ./nix/modules; cellBlocks = let - inherit (std.blockTypes) devshells functions; + inherit (std.blockTypes) devshells functions anything installables; in [ (devshells "devshells") (devshells "userShells") (functions "home-profiles") (functions "home-modules") + (anything "home-configs") + (installables "packages") + (anything "lib") ]; } { @@ -61,9 +60,11 @@ # nixosConfigurations = std.pick [ [ "dotfiles" "nixos" ] ]; # homeConfigurations = std.pick [ [ "dotfiles" "home" ] ]; 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 homeProfiles = std.pick self [["repo" "home-profiles"]]; - packages = std.harvest self [["repo" "home-configs"] ["repo" "packages"]]; }; } diff --git a/nix/cells/dotfiles/packages/default.nix b/nix/cells/dotfiles/packages/default.nix index 8b6a4e8..22d70e4 100644 --- a/nix/cells/dotfiles/packages/default.nix +++ b/nix/cells/dotfiles/packages/default.nix @@ -2,7 +2,9 @@ inputs, cell, }: let - inherit (inputs.poetry2nix) mkPoetryApplication defaultPoetryOverrides; + inherit (inputs.nixpkgs) system; + inherit (inputs.nix-boost.pkgs."${system}".mypkgs) poetry2nix; + inherit (poetry2nix) mkPoetryApplication defaultPoetryOverrides; in { kpcli-py = mkPoetryApplication { projectDir = inputs.kpcli-py; diff --git a/nix/cells/repo/home-configs/default.nix b/nix/cells/repo/home-configs/default.nix index 0aeec55..b2964a5 100644 --- a/nix/cells/repo/home-configs/default.nix +++ b/nix/cells/repo/home-configs/default.nix @@ -23,10 +23,10 @@ home-profiles.nix-index ]; in { - htran = home-config { + homeConfigurations.htran = home-config { supported_systems = ["aarch64-darwin" "x86_64-darwin"]; tested_systems = ["aarch64-darwin"]; - hm = home-manager.lib.homeConfigurations { + hm = home-manager.lib.homeManagerConfiguration { inherit pkgs; modules = base-modules ++ [ home-profiles.nerd_font_module @@ -34,11 +34,13 @@ in { home-profiles.dev-packages home-profiles.zk home-modules.darwin-spotlight + + ({ + home.username = "htran"; + home.homeDirectory = "/Users/htran"; + home.stateVersion = "23.11"; + }) ]; - # TODO: might need config prefix. remove this todo after QA - home.username = "htran"; - home.homeDirectory = "/Users/htran"; - home.stateVersion = "23.11"; }; }; } diff --git a/nix/cells/repo/home-modules/default.nix b/nix/cells/repo/home-modules/default.nix index 34e5d8a..d5f18c7 100644 --- a/nix/cells/repo/home-modules/default.nix +++ b/nix/cells/repo/home-modules/default.nix @@ -91,7 +91,7 @@ in }; }; - alacritty = { config, lib }: + alacritty = { config, lib, ... }: let inherit (inputs.cells.repo.lib) fromYAML; cfg = config."${namespace}".alacritty; @@ -133,13 +133,12 @@ in enable = cfg.enable; settings = let - ; actualConfig = if cfg.config-path != null then fromYAML (builtins.readFile cfg.config-path) else { }; in lib.recursiveUpdate actualConfig { - font.normal.family = lib.mkIf (font.family != null) font.family; - font.size = lib.mkIf (font.size != null) font.size; + font.normal.family = lib.mkIf (cfg.font.family != null) cfg.font.family; + font.size = lib.mkIf (cfg.font.size != null) cfg.font.size; }; }; }; diff --git a/nix/cells/repo/home-profiles/default.nix b/nix/cells/repo/home-profiles/default.nix index 7bb29de..d26c2c2 100644 --- a/nix/cells/repo/home-profiles/default.nix +++ b/nix/cells/repo/home-profiles/default.nix @@ -15,10 +15,6 @@ in { pkgs, ... }: { - imports = [ - import - inputs.cells."${namespace}" - ]; fonts.fontconfig.enable = true; home.packages = [ (pkgs.nerdfonts.override {fonts = ["Hack"];}) @@ -74,12 +70,11 @@ in { cfg = config."${namespace}".alacritty; in { imports = [ - import - "${inputs.cells.repo.home-modules.alacritty}" + inputs.cells.repo.home-modules.alacritty ]; - configs."${namespace}".alacritty = { + config."${namespace}".alacritty = { 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.family = "Hack Nerd Font Mono"; }; @@ -144,8 +139,10 @@ in { git-htran = { imports = [inputs.cells.repo.home-profiles.git]; - config.git."${namespace}".name = "htran"; - config.git."${namespace}".email = "htran@egihosting.com"; + config."${namespace}".git = { + name = "htran"; + email = "htran@egihosting.com"; + }; }; git-pegasust = { diff --git a/nix/cells/repo/home-profiles/neovim.nix b/nix/cells/repo/home-profiles/neovim.nix index dae5545..eb49566 100644 --- a/nix/cells/repo/home-profiles/neovim.nix +++ b/nix/cells/repo/home-profiles/neovim.nix @@ -18,7 +18,7 @@ # see: :/--suffix.*PATH # there should be mentions of additional packages my_neovim = pkgs.neovim-unwrapped; - inherit (inputs) system; + inherit (inputs.nixpkgs) system; nvim_pkgs = [ # pkgs.gccStdenv diff --git a/nix/cells/repo/home-profiles/shells.nix b/nix/cells/repo/home-profiles/shells.nix index 9e89729..ac8fd1a 100644 --- a/nix/cells/repo/home-profiles/shells.nix +++ b/nix/cells/repo/home-profiles/shells.nix @@ -52,7 +52,7 @@ in { programs.tmux = { enable = true; 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 '' set -g status-right '#{cpu_bg_color} CPU: #{cpu_icon} #{cpu_percentage} | %a %h-%d %H:%M '