move everything but emacs into flake

7 files changed, 50 insertions, 3 deletions

diff --git a/nixos/.config/nvim b/nixos/.config/nvim
deleted file mode 120000
index a0abd03..0000000
--- a/nixos/.config/nvim
+++ /dev/null
@@ -1 +0,0 @@
-../../common/.config/nvim
\ No newline at end of file
diff --git a/nixos/.flake/home/clang-format.org b/nixos/.flake/home/clang-format.org
new file mode 100644
index 0000000..64a2a64
--- /dev/null
+++ b/nixos/.flake/home/clang-format.org
@@ -0,0 +1,15 @@
+#+title: Clang Format Default Options
+
+#+begin_src nix :tangle ~/.flake/home/clang-format.nix :mkdirp yes
+  { config, pkgs, ... }:
+
+  {
+    home.file.".clang-format".text = ''
+      BasedOnStyle: LLVM
+      IndentWidth: 4
+      BreakBeforeBraces: Linux
+      AllowShortIfStatementsOnASingleLine: false
+      IndentCaseLabels: false
+    '';
+  }
+#+end_src
diff --git a/nixos/.flake/home/core.org b/nixos/.flake/home/core.org
index 0d578a8..25f3f2e 100644
--- a/nixos/.flake/home/core.org
+++ b/nixos/.flake/home/core.org
@@ -6,6 +6,7 @@ Set up home manager for my user account and import submodules.
 
   {
     imports = [
+      ./clang-format.nix
       ./cursor.nix
       ./fonts.nix
       ./hyprland.nix
diff --git a/nixos/.flake/home/programs/core.org b/nixos/.flake/home/programs/core.org
index 41ec9a9..49e3019 100644
--- a/nixos/.flake/home/programs/core.org
+++ b/nixos/.flake/home/programs/core.org
@@ -11,6 +11,7 @@ This is the core of my program configuration. This file installs programs that d
       ./git.nix
       ./hyprlock.nix
       ./ncmpcpp.nix
+      ./neovim.nix
       ./ssh.nix
       ./waybar.nix
       ./zsh.nix
@@ -18,6 +19,7 @@ This is the core of my program configuration. This file installs programs that d
 
     home.packages = with pkgs; [
       discord # not FOSS
+      clang-tools
       eza
       fuzzel
       ispell
diff --git a/nixos/.flake/home/programs/neovim.org b/nixos/.flake/home/programs/neovim.org
new file mode 100644
index 0000000..350eded
--- /dev/null
+++ b/nixos/.flake/home/programs/neovim.org
@@ -0,0 +1,32 @@
+#+title: Neovim Settings
+
+Create a simple Neovim configuration.
+#+begin_src nix :tangle ~/.flake/home/programs/neovim.nix :mkdirp yes
+  { config, pkgs, ... }:
+
+  {
+    programs.neovim = {
+      enable = true;
+
+      defaultEditor = true;
+      viAlias = true;
+      vimAlias = true;
+      plugins = with pkgs.vimPlugins; [
+        vim-trailing-whitespace
+        lightline-vim
+        delimitMate
+      ];
+      extraLuaConfig = ''
+        vim.opt.tabstop = 4
+        vim.opt.expandtab = true
+        vim.opt.shiftwidth = 4
+        vim.opt.autoindent = true
+        vim.opt.wildmode = 'longest,list'
+        vim.opt.number = true
+        vim.g.background = light
+        vim.cmd [[colorscheme default]]
+        vim.cmd [[set notermguicolors]]
+      '';
+    };
+  }
+#+end_src
diff --git a/nixos/.flake/home/programs/zsh.org b/nixos/.flake/home/programs/zsh.org
index f2368e2..79795d0 100644
--- a/nixos/.flake/home/programs/zsh.org
+++ b/nixos/.flake/home/programs/zsh.org
@@ -54,7 +54,6 @@ Create potential aliases and create the prompt.
       initExtra = ''
       which lesspipe.sh &> /dev/null && export LESSOPEN="|lesspipe.sh %s"
       which eza &> /dev/null && alias ls=eza
-      which nvim &> /dev/null && alias vi=nvim && alias vim=nvim
       parse_git_dirty() {
         git_status="$(git status 2> /dev/null)"
         [[ "$git_status" =~ "use \"git push\" to publish your local commits" ]] && echo -n " %F{green}%f"
diff --git a/nixos/clang-format.org b/nixos/clang-format.org
deleted file mode 120000
index 960b79e..0000000
--- a/nixos/clang-format.org
+++ /dev/null
@@ -1 +0,0 @@
-../common/clang-format.org
\ No newline at end of file