flake update, new nevim build

Gako358 · Mar 29, 2024 · 3b6107b · 3b6107b
1 parent 18d2ee5
commit 3b6107b
Show file tree

Hide file tree

Showing 8 changed files with 888 additions and 113 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -33,6 +33,7 @@
 
     # Scramgit
     scramgit.url = "github:gako358/scram";
+    nvimFlake.url = "github:gako358/neovim";
   };
 
   outputs = {
@@ -41,6 +42,7 @@
     hardware,
     flake-utils,
     home-manager,
+    nvimFlake,
     scramgit,
     ...
   } @ inputs: let

diff --git a/home/home.nix b/home/home.nix
@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-let
+{pkgs, ...}: let
   username = "merrinx";
   homeDirectory = "/home/${username}";
   configHome = "${homeDirectory}/.config";
@@ -44,8 +43,7 @@ let
     xarchiver # archive manager
     zip # zip files
   ];
-in
-{
+in {
   programs = {
     home-manager.enable = true;
     gh.enable = true;
@@ -63,8 +61,8 @@ in
 
   dconf.settings = {
     "org/virt-manager/virt-manager/connections" = {
-      autoconnect = [ "qemu:///system" ];
-      uris = [ "qemu:///system" ];
+      autoconnect = ["qemu:///system"];
+      uris = ["qemu:///system"];
     };
   };
 

diff --git a/home/programs/config/default.nix b/home/programs/config/default.nix
@@ -1,6 +1,5 @@
 {
   imports = [
-    ./emacs
     ./hyprland
     ./neofetch
     ./wofi

diff --git a/home/programs/config/gnome.nix b/home/programs/config/gnome.nix
@@ -1,7 +1,8 @@
-{ specialArgs
-, pkgs
-, lib
-, ...
+{
+  specialArgs,
+  pkgs,
+  lib,
+  ...
 }:
 if specialArgs.hidpi
 then {
@@ -39,8 +40,6 @@ then {
         "org.gnome.Nautilus.desktop"
         "spotify.desktop"
         "dbeaver.desktop"
-        "code.desktop"
-        "emacs-client.desktop"
         "discord.desktop"
         "gimp.desktop"
         "microsoft-edge.desktop"
@@ -81,103 +80,103 @@ then {
 
     # Keybindings
     "org/gnome/settings-daemon/plugins/media-keys" = {
-      email = [ "<Super>e" ];
-      www = [ "<Super>w" ];
-      screensaver = [ "<Super>L" ];
+      email = ["<Super>e"];
+      www = ["<Super>w"];
+      screensaver = ["<Super>L"];
     };
 
     # Windows
     "org/gnome/desktop/wm/keybindings" = {
       # Activate the window menu
-      activate-window-menu = [ ];
+      activate-window-menu = [];
       # Move window
-      begin-move = [ ];
+      begin-move = [];
       # Resize window
-      begin-resize = [ "<Super>r" ];
+      begin-resize = ["<Super>r"];
       # Close window
-      close = [ "<Super>q" ];
+      close = ["<Super>q"];
       # Switch windows of an app directly
-      cycle-group = [ ];
-      cycle-group-backward = [ ];
+      cycle-group = [];
+      cycle-group-backward = [];
       # Switch system controls directly
-      cycle-panels = [ ];
-      cycle-panels-backward = [ ];
+      cycle-panels = [];
+      cycle-panels-backward = [];
       # Switch windows directly
-      cycle-windows = [ ];
-      cycle-windows-backward = [ ];
+      cycle-windows = [];
+      cycle-windows-backward = [];
       # Maximize window
-      maximize = [ "<Super>Up" ];
+      maximize = ["<Super>Up"];
       # Minimize window
-      minimize = [ "<Super>c" ];
+      minimize = ["<Super>c"];
       # Move window to workspace 1
-      move-to-workspace-1 = [ "<Shift><Super>exclam" ];
+      move-to-workspace-1 = ["<Shift><Super>exclam"];
       # Move window to workspace 2
-      move-to-workspace-2 = [ "<Shift><Super>at" ];
+      move-to-workspace-2 = ["<Shift><Super>at"];
       # Move window to workspace 3
-      move-to-workspace-3 = [ "<Shift><Super>numbersign" ];
+      move-to-workspace-3 = ["<Shift><Super>numbersign"];
       # Move window to workspace 4
-      move-to-workspace-4 = [ "<Shift><Super>dollar" ];
+      move-to-workspace-4 = ["<Shift><Super>dollar"];
       # Switch to workspace 1
-      switch-to-workspace-1 = [ "<Super>1" ];
+      switch-to-workspace-1 = ["<Super>1"];
       # Switch to workspace 2
-      switch-to-workspace-2 = [ "<Super>2" ];
+      switch-to-workspace-2 = ["<Super>2"];
       # Switch to workspace 3
-      switch-to-workspace-3 = [ "<Super>3" ];
+      switch-to-workspace-3 = ["<Super>3"];
       # Switch to workspace 4
-      switch-to-workspace-4 = [ "<Super>4" ];
+      switch-to-workspace-4 = ["<Super>4"];
       # Switch to workspace on the left
-      switch-to-workspace-left = [ "Page_Up" ];
+      switch-to-workspace-left = ["Page_Up"];
       # Switch to workspace on the right
-      switch-to-workspace-right = [ "Page_Down" ];
+      switch-to-workspace-right = ["Page_Down"];
       # Switch windows
-      switch-windows = [ "<Super>Tab" ];
-      switch-windows-backward = [ "<Shift><Super>Tab" ];
+      switch-windows = ["<Super>Tab"];
+      switch-windows-backward = ["<Shift><Super>Tab"];
       # Toggle fullscreen mode
-      toggle-fullscreen = [ ];
+      toggle-fullscreen = [];
       # Toggle maximization state
-      toggle-maximized = [ "<Super>f" ];
+      toggle-maximized = ["<Super>f"];
       # Restore window
-      unmaximize = [ "<Super>Down" ];
+      unmaximize = ["<Super>Down"];
     };
     "org/gnome/shell/keybindings" = {
       # Focus the active notification
-      focus-active-notification = [ ];
+      focus-active-notification = [];
       # Open the application menu
-      open-application-menu = [ ];
+      open-application-menu = [];
       # Switch to application 1
-      switch-to-application-1 = [ ];
+      switch-to-application-1 = [];
       # Switch to application 2
-      switch-to-application-2 = [ ];
+      switch-to-application-2 = [];
       # Switch to application 3
-      switch-to-application-3 = [ ];
+      switch-to-application-3 = [];
       # Switch to application 4
-      switch-to-application-4 = [ ];
+      switch-to-application-4 = [];
       # Switch to application 5
-      switch-to-application-5 = [ ];
+      switch-to-application-5 = [];
       # Switch to application 6
-      switch-to-application-6 = [ ];
+      switch-to-application-6 = [];
       # Switch to application 7
-      switch-to-application-7 = [ ];
+      switch-to-application-7 = [];
       # Switch to application 8
-      switch-to-application-8 = [ ];
+      switch-to-application-8 = [];
       # Switch to application 9
-      switch-to-application-9 = [ ];
+      switch-to-application-9 = [];
       # Show all applications
-      toggle-application-view = [ ];
+      toggle-application-view = [];
       # Show the notification list
-      toggle-message-tray = [ "<Super>n" ];
+      toggle-message-tray = ["<Super>n"];
       # Show the overview
-      toggle-overview = [ ];
+      toggle-overview = [];
     };
     # Custom
     "org/gnome/shell/extensions/user-theme".name = "Flat-Remix-Blue-Light";
     "org/gnome/desktop/interface" = {
       color-scheme = "prefer-dark";
     };
     "org/gnome/desktop/wm/preferences" = {
-      workspace-names = [ "Main" ];
+      workspace-names = ["Main"];
       "titlebar-font" = lib.hm.gvariant.mkString "Roboto Bold 11";
     };
   };
 }
-else { }
+else {}
diff --git a/home/programs/default.nix b/home/programs/default.nix
@@ -37,6 +37,6 @@ in [
   ./citrix.nix
   ./git.nix
   ./network.nix
-  ./vscode.nix
+  ./tmux.nix
   more
 ]
diff --git a/home/programs/vscode.nix b/home/programs/vscode.nix
diff --git a/hosts/system/gnome.nix b/hosts/system/gnome.nix
@@ -50,27 +50,7 @@ then {
 
   environment.systemPackages = with pkgs; [
     inputs.scramgit.defaultPackage.${pkgs.system}
+    inputs.nvimFlake.defaultPackage.${pkgs.system}
   ];
-
-  programs.neovim = {
-    enable = true;
-    viAlias = true;
-    vimAlias = true;
-
-    configure = {
-      customRC = ''
-        set relativenumber
-        set cc=80
-        set list
-      '';
-
-      packages.myVimPackage = with pkgs.vimPlugins; {
-        start = [
-          copilot-vim
-          telescope-nvim
-        ];
-      };
-    };
-  };
 }
 else { }