Merge pull request #16 from redyf/dev

Dev
redyf · Jan 12, 2024 · d8bf9a9 · d8bf9a9
2 parents dc58f34 + 79d13f8
commit d8bf9a9
Show file tree

Hide file tree

Showing 8 changed files with 183 additions and 202 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -17,11 +17,7 @@
     nur.url = "github:nix-community/NUR";
     nix-colors.url = "github:misterio77/nix-colors";
     spicetify-nix.url = "github:the-argus/spicetify-nix";
-
-    nixvim = {
-      url = "github:nix-community/nixvim";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    Neve.url = "github:redyf/Neve";
 
     # SFMono w/ patches
     sf-mono-liga-src = {

diff --git a/home/desktop/dev/editors/default.nix b/home/desktop/dev/editors/default.nix
@@ -1,6 +1,7 @@
 _: {
   imports = [
-    ./nvim
+    ./neve
+    # ./nvim
     # ./helix
     # ./emacs
     # ./vscode

diff --git a/home/desktop/dev/editors/neve/default.nix b/home/desktop/dev/editors/neve/default.nix
@@ -0,0 +1,9 @@
+{ inputs
+, config
+, pkgs
+, ...
+}: {
+  home.packages = with pkgs; [
+    inputs.Neve.packages.${system}.default
+  ];
+}
diff --git a/home/desktop/dev/editors/nvim/default.nix b/home/desktop/dev/editors/nvim/default.nix
@@ -1,21 +1,10 @@
-{ inputs
-, config
-, pkgs
-, ...
-}:
-# let
-#  cfg = config.modules.nvim;
-#  jabuti-nvim = pkgs.vimUtils.buildVimPlugin {
-#    name = "jabuti-nvim";
-#    src = pkgs.fetchFromGitHub {
-#      owner = "jabuti-theme";
-#      repo = "jabuti-nvim";
-#      rev = "17f1b94cbf1871a89cdc264e4a8a2b3b4f7c76d2";
-#      sha256 = "sha256-iPjwx/rTd98LUPK1MUfqKXZhQ5NmKx/rN8RX1PIuDFA=";
-#    };
-#  };
-# in {
 {
+  inputs,
+  config,
+  pkgs,
+  system,
+  ...
+}: {
   programs.neovim = {
     enable = true;
     package = pkgs.neovim-unwrapped;
@@ -25,103 +14,5 @@
     withRuby = false;
     withNodeJs = false;
     withPython3 = false;
-    #     extraPackages = with pkgs; [
-    #       texlab # latex LSP
-    #       nil # nix language server
-    #       sumneko-lua-language-server # lua lsp
-    #       stylua # lua linter
-    #       uncrustify # C and stuff
-    #       shellcheck # shell
-    #       alejandra # nix formatter
-    #       gopls # go
-    #       revive # go formatter
-    #       asmfmt # go formatter 2
-    #       ccls # cpp
-    #       black # python
-    #       shellcheck # bash
-    #       shfmt # shell
-    #       nodejs # take a guess
-    #       marksman # markdown language server
-    #       nodePackages.pyright
-    #       nodePackages.prettier
-    #       nodePackages.stylelint
-    #       nodePackages.jsonlint # JSON
-    #       nodePackages.typescript-language-server # Typescript
-    #       nodePackages.vscode-langservers-extracted # HTML, CSS, JavaScript
-    #       nodePackages.yarn
-    #       nodePackages.bash-language-server
-    #       nodePackages.node2nix # node and tix, we game
-    #     ];
-    plugins = with pkgs.vimPlugins; [
-      #  {
-      #    plugin = jabuti-nvim;
-      #    config = "colorscheme jabuti";
-      #  }
-      #       copilot-lua
-      #       lsp_lines-nvim
-      #       vim-nix
-      #       nvim-ts-autotag
-      #       cmp-nvim-lsp-signature-help
-      #       cmp-buffer
-      #       comment-nvim
-      #       lsp_lines-nvim
-      #       null-ls-nvim
-      #       vim-fugitive
-      #       friendly-snippets
-      #       luasnip
-      #       rust-tools-nvim
-      #       crates-nvim
-      #       vim-illuminate
-      #       cmp_luasnip
-      #       nvim-cmp
-      #       impatient-nvim
-      #       indent-blankline-nvim
-      #       nvim-tree-lua
-      #       telescope-nvim
-      #       nvim-web-devicons
-      #       cmp-nvim-lsp
-      #       cmp-path
-      #       catppuccin-nvim
-      #       lspkind-nvim
-      #       nvim-lspconfig
-      #       hop-nvim
-      #       alpha-nvim
-      #       nvim-autopairs
-      #       nvim-colorizer-lua
-      #       nvim-ts-rainbow
-      #       gitsigns-nvim
-      #       toggleterm-nvim
-      #       todo-comments-nvim
-      #       (nvim-treesitter.withPlugins (plugins:
-      #         with plugins; [
-      #           tree-sitter-python
-      #           tree-sitter-c
-      #           tree-sitter-nix
-      #           tree-sitter-cpp
-      #           tree-sitter-rust
-      #           tree-sitter-toml
-      #           tree-sitter-json
-      #           tree-sitter-lua
-      #           tree-sitter-go
-      #           tree-sitter-java
-      #           tree-sitter-typescript
-      #           tree-sitter-javascript
-      #           tree-sitter-cmake
-      #           tree-sitter-comment
-      #           tree-sitter-http
-      #           tree-sitter-regex
-      #           tree-sitter-dart
-      #           tree-sitter-make
-      #           tree-sitter-html
-      #           tree-sitter-css
-      #           tree-sitter-latex
-      #           tree-sitter-bibtex
-      #           tree-sitter-php
-      #           tree-sitter-sql
-      #           tree-sitter-zig
-      #           tree-sitter-dockerfile
-      #           tree-sitter-markdown
-      #         ]))
-    ];
   };
 }
diff --git a/home/desktop/graphical/wms/hyprland/default.nix b/home/desktop/graphical/wms/hyprland/default.nix
@@ -16,7 +16,7 @@ let
   cursor = "macOS-BigSur";
 in
 {
-  environment.systemPackages = with pkgs; [
+  home.packages = with pkgs; [
     grim
     slurp
     swappy
@@ -328,7 +328,7 @@ in
     '';
   };
   # Hyprland configuration files
-  home.configFile = {
+  xdg.configFile = {
     "hypr/autostart".source = ./autostart;
     "hypr/store/dynamic_out.txt".source = ./store/dynamic_out.txt;
     "hypr/store/prev.txt".source = ./store/prev.txt;

diff --git a/home/desktop/services/wayland/waybar/default.nix b/home/desktop/services/wayland/waybar/default.nix
@@ -1,8 +1,9 @@
-{ pkgs
-, lib
-, config
-, osConfig
-, ...
+{
+  pkgs,
+  lib,
+  config,
+  osConfig,
+  ...
 }:
 with lib; let
   # Bar v1
@@ -14,13 +15,9 @@ with lib; let
   # Tokyonight
   # waybar_config = import ./tokyonight/config.nix {inherit osConfig config lib pkgs;};
   # waybar_style = import ./tokyonight/style.nix {inherit (config) colorscheme;};
-  waybar_config = import ./catppuccin/config.nix { inherit osConfig config lib pkgs; };
-  waybar_style = import ./catppuccin/style.nix { inherit (config) colorscheme; };
-in
-{
-  home.packages = with pkgs; [
-    python39Packages.requests
-  ];
+  waybar_config = import ./catppuccin/config.nix {inherit osConfig config lib pkgs;};
+  waybar_style = import ./catppuccin/style.nix {inherit (config) colorscheme;};
+in {
   programs.waybar = {
     enable = true;
     package = pkgs.waybar;

diff --git a/hosts/redyf/configuration.nix b/hosts/redyf/configuration.nix
@@ -182,12 +182,19 @@
       XCURSOR_SIZE = "32";
       QT_AUTO_SCREEN_SCALE_FACTOR = "1";
       QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
+      EDITOR = "nvim";
     };
     sessionVariables = {
       NIXOS_OZONE_WL = "1"; # Hint electron apps to use wayland
       # WLR_NO_HARDWARE_CURSORS = "1"; # Fix cursor rendering issue on wlr nvidia.
       DEFAULT_BROWSER = "${pkgs.brave}/bin/brave"; # Set default browser
     };
+    systemPackages = with pkgs; [
+      git
+      wget
+      playerctl
+      inputs.xdg-portal-hyprland.packages.${system}.xdg-desktop-portal-hyprland
+    ];
   };
 
   hardware = {
@@ -286,13 +293,6 @@
     };
   };
 
-  environment.systemPackages = with pkgs; [
-    git
-    wget
-    playerctl
-    inputs.xdg-portal-hyprland.packages.${system}.xdg-desktop-portal-hyprland
-  ];
-
   # Enables flakes + garbage collector
   nix = {
     package = pkgs.nixFlakes;