feat: working flake build

smsegal · May 8, 2023 · c5a2a53 · c5a2a53
1 parent 5768ae0
commit c5a2a53
Show file tree

Hide file tree

Showing 9 changed files with 93 additions and 75 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1 @@
+blah blah
diff --git a/cnc/config.json b/cnc/config.json
diff --git a/cnc/main.py b/cnc/main.py
@@ -1,21 +1,21 @@
-from email.policy import default
 import subprocess
 from pathlib import Path
 from time import sleep
 from typing import NewType, Optional, Type, TypeVar
 
 import click
 import yaml
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel
 from rich.console import Console
 from typing_extensions import Self
-from xdg_base_dirs import xdg_config_home
 
 console = Console()
 
-CONFIG_DIR = xdg_config_home() / "cnc"
+CONFIG_DIR = Path.home() / ".config/cnc"
 CONFIG_FILE = CONFIG_DIR / "config.yml"
 
+CONFIG_DIR.mkdir(parents=True, exist_ok=True)
+
 
 HostKey = NewType("HostKey", str)
 

diff --git a/devenv.nix.bak b/devenv.nix.bak
diff --git a/devenv.yaml.bak b/devenv.yaml.bak
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,17 +3,29 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
     devenv.url = "github:cachix/devenv";
     flake-utils.url = "github:numtide/flake-utils";
+    poetry2nix.url = "github:nix-community/poetry2nix";
   };
 
-  outputs = { self, nixpkgs, devenv, flake-utils, ... } @ inputs:
+  outputs = { self, nixpkgs, devenv, flake-utils, poetry2nix, ... } @ inputs:
     flake-utils.lib.eachDefaultSystem (system:
-      let pkgs = nixpkgs.legacyPackages.${system}; in
+      let
+        inherit (poetry2nix.legacyPackages.${system}) mkPoetryApplication;
+        pkgs = nixpkgs.legacyPackages.${system};
+        python310 = pkgs.python310Full;
+      in
       {
-        devShell.x86_64-linux = devenv.lib.mkShell {
+        packages = {
+          cnc = mkPoetryApplication {
+            projectDir = ./.;
+            python = python310;
+            preferWheel = true;
+          };
+          default = self.packages.${system}.cnc;
+        };
+        devShells.default = devenv.lib.mkShell {
           inherit inputs pkgs;
           modules = [
             ({ pkgs, ... }: {
-
               packages = [
                 pkgs.git
                 pkgs.nodePackages.pyright
@@ -23,8 +35,8 @@
               languages.python = {
                 enable = true;
                 poetry.enable = true;
+                package = python310;
               };
-
             })
           ];
         };

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -8,7 +8,6 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.10"
 rich = "^13.3.5"
-xdg-base-dirs = "^6.0.0"
 pydantic = "^1.10.7"
 pyyaml = "^6.0"
 click = "^8.1.3"