diff --git a/flake.nix b/flake.nix
index aa24ac9..1cd7c19 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,7 +26,7 @@
floatc = {
url = "git+https://git.stribrny.org/max_ag/floating-calculator?rev=2abbacf66e99db523d624037f3e449aa40e8f366";
- inputs.nixpkgs.follows = "nixpkgs";
+ inputs.nixpkgs.follows = "nixpkgs";
};
niri-flake = {
diff --git a/home/modules/create-project/project-blueprints/animation/flake.nix b/home/modules/create-project/project-blueprints/animation/flake.nix
deleted file mode 100644
index c4f1a69..0000000
--- a/home/modules/create-project/project-blueprints/animation/flake.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- description = "My motion canvas development shell";
- inputs = {
- nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
- };
- outputs = {nixpkgs, ...}: let
- system = "x86_64-linux";
- pkgs = import nixpkgs {
- inherit system;
- };
- in {
- devShells."${system}" = {
- default = pkgs.mkShell {
- buildInputs = with pkgs; [
- nodejs_20
- nodePackages.npm
- ffmpeg
- ];
- };
- };
- };
-}
diff --git a/home/modules/create-project/project-blueprints/animation/init.sh b/home/modules/create-project/project-blueprints/animation/init.sh
deleted file mode 100644
index 4e1f0c6..0000000
--- a/home/modules/create-project/project-blueprints/animation/init.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-NAME=$1
-
-sed -i "s/project_name/$NAME/g" package.json
-nix develop . --command bash -c "npm install"
diff --git a/home/modules/create-project/project-blueprints/animation/package.json b/home/modules/create-project/project-blueprints/animation/package.json
deleted file mode 100644
index 9f61f93..0000000
--- a/home/modules/create-project/project-blueprints/animation/package.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "name": "project_name",
- "private": true,
- "version": "0.0.0",
- "scripts": {
- "start": "vite",
- "serve": "vite",
- "build": "tsc && vite build"
- },
- "dependencies": {
- "@motion-canvas/core": "^3.17.2",
- "@motion-canvas/2d": "^3.17.2",
- "@motion-canvas/ffmpeg": "^1.1.0"
- },
- "devDependencies": {
- "@motion-canvas/ui": "^3.17.2",
- "@motion-canvas/vite-plugin": "^3.17.2",
- "typescript": "^5.2.2",
- "vite": "^4.0.0"
- }
-}
\ No newline at end of file
diff --git a/home/modules/create-project/project-blueprints/animation/src/motion-canvas.d.ts b/home/modules/create-project/project-blueprints/animation/src/motion-canvas.d.ts
deleted file mode 100644
index 067c6a4..0000000
--- a/home/modules/create-project/project-blueprints/animation/src/motion-canvas.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-///
diff --git a/home/modules/create-project/project-blueprints/animation/src/project.ts b/home/modules/create-project/project-blueprints/animation/src/project.ts
deleted file mode 100644
index ecfbbeb..0000000
--- a/home/modules/create-project/project-blueprints/animation/src/project.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import {makeProject} from '@motion-canvas/core';
-
-import example from './scenes/example?scene';
-
-export default makeProject({
- scenes: [example],
-});
diff --git a/home/modules/create-project/project-blueprints/animation/src/scenes/example.tsx b/home/modules/create-project/project-blueprints/animation/src/scenes/example.tsx
deleted file mode 100644
index 525cd51..0000000
--- a/home/modules/create-project/project-blueprints/animation/src/scenes/example.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import {Circle, makeScene2D} from '@motion-canvas/2d';
-import {createRef} from '@motion-canvas/core';
-
-export default makeScene2D(function* (view) {
- // Create your animations here
-
- const circle = createRef();
-
- view.add();
-
- yield* circle().scale(2, 2).to(1, 2);
-});
diff --git a/home/modules/create-project/project-blueprints/animation/tsconfig.json b/home/modules/create-project/project-blueprints/animation/tsconfig.json
deleted file mode 100644
index e7d5347..0000000
--- a/home/modules/create-project/project-blueprints/animation/tsconfig.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "extends": "@motion-canvas/2d/tsconfig.project.json",
- "include": ["src"]
-}
diff --git a/home/modules/create-project/project-blueprints/animation/vite.config.ts b/home/modules/create-project/project-blueprints/animation/vite.config.ts
deleted file mode 100644
index 42d9d68..0000000
--- a/home/modules/create-project/project-blueprints/animation/vite.config.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import {defineConfig} from 'vite';
-import motionCanvas from '@motion-canvas/vite-plugin';
-import ffmpeg from '@motion-canvas/ffmpeg';
-
-export default defineConfig({
- plugins: [
- motionCanvas(),
- ffmpeg(),
- ],
-});
diff --git a/home/modules/create-project/project-blueprints/c-sharp/flake.nix b/home/modules/create-project/project-blueprints/c-sharp/flake.nix
index b4a2e0e..997475c 100644
--- a/home/modules/create-project/project-blueprints/c-sharp/flake.nix
+++ b/home/modules/create-project/project-blueprints/c-sharp/flake.nix
@@ -13,6 +13,7 @@
default = pkgs.mkShell {
buildInputs = with pkgs; [
dotnetCorePackages.sdk_10_0-bin
+ omnisharp-roslyn
];
};
};
diff --git a/home/modules/create-project/project-blueprints/python/flake.nix b/home/modules/create-project/project-blueprints/python/flake.nix
index 4da5bab..5b9ac02 100644
--- a/home/modules/create-project/project-blueprints/python/flake.nix
+++ b/home/modules/create-project/project-blueprints/python/flake.nix
@@ -25,7 +25,10 @@
devShells."${system}" = {
default = pkgs.mkShell {
- packages = [pythonEnv];
+ packages = [
+ pythonEnv
+ pkgs.pyright
+ ];
};
};
};
diff --git a/home/modules/create-project/project-blueprints/rust/flake.nix b/home/modules/create-project/project-blueprints/rust/flake.nix
index f2e1153..be18e35 100644
--- a/home/modules/create-project/project-blueprints/rust/flake.nix
+++ b/home/modules/create-project/project-blueprints/rust/flake.nix
@@ -13,7 +13,11 @@
pkgs = import nixpkgs {
inherit system overlays;
};
- rustToolchain = pkgs.rust-bin.stable.latest.default;
+
+ rustToolchain = pkgs.rust-bin.stable.latest.default.override {
+ extensions = ["rust-analyzer" "rust-src"];
+ };
+
rustPlatform = pkgs.makeRustPlatform {
cargo = rustToolchain;
rustc = rustToolchain;
diff --git a/home/modules/shell/shell.nix b/home/modules/shell/shell.nix
index c04bf91..ea25d0d 100644
--- a/home/modules/shell/shell.nix
+++ b/home/modules/shell/shell.nix
@@ -19,32 +19,17 @@
MANPAGER = "bat -l man";
};
- programs = {
- bash.enable = true;
- fzf.enable = true;
- eza.enable = true;
+ programs.nushell = {
+ enable = true;
+ extraConfig = builtins.readFile ./config.nu;
- direnv = {
- enable = true;
- silent = true;
- nix-direnv .enable = true;
- };
+ settings.show_banner = false;
- nushell = {
- enable = true;
-
- extraConfig = builtins.readFile ./config.nu;
-
- settings = {
- show_banner = false;
- };
-
- shellAliases = {
- cat = "bat -p -P";
- nix-shell = "nix-shell --run nu";
- garbage = " sudo nix-collect-garbage --delete-old";
- c = "clear";
- };
+ shellAliases = {
+ cat = "bat -p -P";
+ nix-shell = "nix-shell --run nu";
+ garbage = " sudo nix-collect-garbage --delete-old";
+ c = "clear";
};
};
@@ -60,11 +45,26 @@
};
};
+ programs.starship = {
+ enable = true;
+ enableNushellIntergration = true;
+ enableTransience = true;
+ };
+
gtk.enable = true;
qt.enable = true;
programs = {
btop.enable = true;
+ bash.enable = true;
+ fzf.enable = true;
+ eza.enable = true;
+
+ direnv = {
+ enable = true;
+ silent = true;
+ nix-direnv .enable = true;
+ };
git = {
enable = true;