Update changelog for new release, separate neovim config, and run a format

CHANGELOG.md

@@ -21,10 +21,16 @@ Simple bug fixes.
 
 **ZaneyOS 2.2**
 
-This release has a big theming change as well as including the move back to rofi. 
+This release has a big theming change as well as including the move back to rofi. *Please note there is a known bug with Steam crashing Hyprland. After re-logging in though it shouldn't do it again. I will continue to hunt for a fix for this.*
 
 - Revert the switch from rofi to wofi. Rofi is just better.
 - Switch from Nix Colors to Stylix. It can build colorschemes from a wallpaper.
 - Simplified the notification center.
 - Improved emoji selection menu and options.
 - Adding fine-cmdline plugin for Neovim.
+- Removed theme changing scripts as the theme is generated by the image set with stylix.image in the config.nix file.
+- Starship is now setup in the config.nix file.
+- Switched from SDDM to tuigreet and greetd.
+- Added Plymouth for better looking booting.
+- Improve the fonts being installed and properly separate them from regular packages.
+- Separated Neovim configuration for readability.

config/neovim.nix

@@ -0,0 +1,88 @@
+{ pkgs, inputs, ... }:
+let
+  finecmdline = pkgs.vimUtils.buildVimPlugin {
+    name = "fine-cmdline";
+    src = inputs.fine-cmdline;
+  };
+in
+{
+  programs = {
+    neovim = {
+      enable = true;
+      defaultEditor = true;
+      viAlias = true;
+      vimAlias = true;
+      vimdiffAlias = true;
+      withNodeJs = true;
+      extraPackages = with pkgs; [
+        lua-language-server
+        gopls
+        xclip
+        wl-clipboard
+        luajitPackages.lua-lsp
+        nil
+        rust-analyzer
+        nodePackages.bash-language-server
+        yaml-language-server
+        pyright
+        marksman
+      ];
+      plugins = with pkgs.vimPlugins; [
+        alpha-nvim
+        auto-session
+        bufferline-nvim
+        dressing-nvim
+        indent-blankline-nvim
+        nui-nvim
+        finecmdline
+        nvim-treesitter.withAllGrammars
+        lualine-nvim
+        nvim-autopairs
+        nvim-web-devicons
+        nvim-cmp
+        nvim-surround
+        nvim-lspconfig
+        cmp-nvim-lsp
+        cmp-buffer
+        luasnip
+        cmp_luasnip
+        friendly-snippets
+        lspkind-nvim
+        comment-nvim
+        nvim-ts-context-commentstring
+        plenary-nvim
+        neodev-nvim
+        luasnip
+        telescope-nvim
+        todo-comments-nvim
+        nvim-tree-lua
+        telescope-fzf-native-nvim
+        vim-tmux-navigator
+      ];
+      extraConfig = ''
+        set noemoji
+        nnoremap : <cmd>FineCmdline<CR>
+      '';
+      extraLuaConfig = ''
+        ${builtins.readFile ./nvim/options.lua}
+        ${builtins.readFile ./nvim/keymaps.lua}
+        ${builtins.readFile ./nvim/plugins/alpha.lua}
+        ${builtins.readFile ./nvim/plugins/autopairs.lua}
+        ${builtins.readFile ./nvim/plugins/auto-session.lua}
+        ${builtins.readFile ./nvim/plugins/comment.lua}
+        ${builtins.readFile ./nvim/plugins/cmp.lua}
+        ${builtins.readFile ./nvim/plugins/lsp.lua}
+        ${builtins.readFile ./nvim/plugins/nvim-tree.lua}
+        ${builtins.readFile ./nvim/plugins/telescope.lua}
+        ${builtins.readFile ./nvim/plugins/todo-comments.lua}
+        ${builtins.readFile ./nvim/plugins/treesitter.lua}
+        ${builtins.readFile ./nvim/plugins/fine-cmdline.lua}
+        require("ibl").setup()
+        require("bufferline").setup{}
+        require("lualine").setup({
+          icons_enabled = true,
+        })
+      '';
+    };
+  };
+}

hosts/familypc/config.nix

@@ -46,6 +46,7 @@
       mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'';
       magicOrExtension = ''\x7fELF....AI\x02'';
     };
+    plymouth.enable = true;
   };
 
   # Styling Options
@@ -95,6 +96,18 @@
     };
   };
 
+  # Extra Module Options
+  drivers.amdgpu.enable = true;
+  drivers.nvidia.enable = false;
+  drivers.nvidia-prime = {
+    enable = false;
+    intelBusID = "";
+    nvidiaBusID = "";
+  };
+  drivers.intel.enable = false;
+  vm.guest-services.enable = false;
+  local.hardware-clock.enable = false;
+
   qt = {
     enable = true;
     style = "adwaita-dark";
@@ -225,69 +238,68 @@
     mutableUsers = true;
   };
 
-  environment.systemPackages = with pkgs;
+  environment.systemPackages = with pkgs; [
-    [
+    vim
-      vim
+    wget
-      wget
+    killall
-      killall
+    git
-      git
+    cmatrix
-      cmatrix
+    lolcat
-      lolcat
+    neofetch
-      neofetch
+    htop
-      htop
+    libvirt
-      libvirt
+    lxqt.lxqt-policykit
-      lxqt.lxqt-policykit
+    mangohud
-      mangohud
+    lm_sensors
-      lm_sensors
+    unzip
-      unzip
+    unrar
-      unrar
+    libnotify
-      libnotify
+    eza
-      eza
+    v4l-utils
-      v4l-utils
+    ydotool
-      ydotool
+    wl-clipboard
-      wl-clipboard
+    pciutils
-      pciutils
+    ffmpeg
-      ffmpeg
+    socat
-      socat
+    cowsay
-      cowsay
+    ripgrep
-      ripgrep
+    lsd
-      lsd
+    lshw
-      lshw
+    pkg-config
-      pkg-config
+    meson
-      meson
+    hyprpicker
-      hyprpicker
+    gnumake
-      gnumake
+    ninja
-      ninja
+    brightnessctl
-      brightnessctl
+    virt-viewer
-      virt-viewer
+    swappy
-      swappy
+    appimage-run
-      appimage-run
+    networkmanagerapplet
-      networkmanagerapplet
+    yad
-      yad
+    playerctl
-      playerctl
+    nh
-      nh
+    nixfmt-rfc-style
-      nixfmt-rfc-style
+    discord
-      discord
+    libvirt
-      libvirt
+    swww
-      swww
+    grim
-      grim
+    slurp
-      slurp
+    gnome.file-roller
-      gnome.file-roller
+    swaynotificationcenter
-      swaynotificationcenter
+    imv
-      imv
+    transmission-gtk
-      transmission-gtk
+    distrobox
-      distrobox
+    mpv
-      mpv
+    gimp
-      gimp
+    rustup
-      rustup
+    audacity
-      audacity
+    pavucontrol
-      pavucontrol
+    tree
-      tree
+    protonup-qt
-      protonup-qt
+    spotify
-      spotify
+    neovide
-      neovide
+    greetd.tuigreet
-      greetd.tuigreet
+  ];
-    ];
 
   fonts = {
     packages = with pkgs; [
@@ -339,7 +351,7 @@
           # .wayland-session is a script generated by home-manager, which links to the current wayland compositor(sway/hyprland or others).
           # with such a vendor-no-locking script, we can switch to another wayland compositor without modifying greetd's config here.
           # command = "$HOME/.wayland-session"; # start a wayland session directly without a login manager
-          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland";  # start Hyprland with a TUI login manager
+          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland"; # start Hyprland with a TUI login manager
         };
       };
     };
@@ -458,18 +470,6 @@
     driSupport32Bit = true;
   };
 
-  # Extra Module Options
-  drivers.amdgpu.enable = true;
-  drivers.nvidia.enable = false;
-  drivers.nvidia-prime = {
-    enable = false;
-    intelBusID = "";
-    nvidiaBusID = "";
-  };
-  drivers.intel.enable = false;
-  vm.guest-services.enable = false;
-  local.hardware-clock.enable = false;
-
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];

hosts/familypc/home.nix

@@ -23,6 +23,7 @@ in
     inputs.hyprland.homeManagerModules.default
     ../../config/emoji.nix
     ../../config/hyprland.nix
+    ../../config/neovim.nix
     ../../config/rofi/rofi.nix
     ../../config/rofi/config-emoji.nix
     ../../config/rofi/config-long.nix
@@ -112,12 +113,11 @@ in
       package = pkgs.papirus-icon-theme;
     };
     gtk3.extraConfig = {
-      gtk-application-prefer-dark-theme=1;
+      gtk-application-prefer-dark-theme = 1;
     };
     gtk4.extraConfig = {
-      gtk-application-prefer-dark-theme=1;
+      gtk-application-prefer-dark-theme = 1;
     };
-
   };
 
   # Scripts
@@ -146,6 +146,10 @@ in
           after_sleep_cmd = "hyprctl dispatch dpms on";
           ignore_dbus_inhibit = false;
           lock_cmd = "hyprlock";
+          starship = {
+            enable = true;
+            package = pkgs.starship;
+          };
         };
         listener = [
           {
@@ -164,84 +168,6 @@ in
 
   programs = {
     gh.enable = true;
-    neovim = {
-      enable = true;
-      defaultEditor = true;
-      viAlias = true;
-      vimAlias = true;
-      vimdiffAlias = true;
-      withNodeJs = true;
-      extraPackages = with pkgs; [
-        lua-language-server
-        gopls
-        xclip
-        wl-clipboard
-        luajitPackages.lua-lsp
-        nil
-        rust-analyzer
-        nodePackages.bash-language-server
-        yaml-language-server
-        pyright
-        marksman
-      ];
-      plugins = with pkgs.vimPlugins; [
-        alpha-nvim
-        auto-session
-        bufferline-nvim
-        dressing-nvim
-        indent-blankline-nvim
-        nui-nvim
-        finecmdline
-        nvim-treesitter.withAllGrammars
-        lualine-nvim
-        nvim-autopairs
-        nvim-web-devicons
-        nvim-cmp
-        nvim-surround
-        nvim-lspconfig
-        cmp-nvim-lsp
-        cmp-buffer
-        luasnip
-        cmp_luasnip
-        friendly-snippets
-        lspkind-nvim
-        comment-nvim
-        nvim-ts-context-commentstring
-        plenary-nvim
-        neodev-nvim
-        luasnip
-        telescope-nvim
-        todo-comments-nvim
-        nvim-tree-lua
-        telescope-fzf-native-nvim
-        vim-tmux-navigator
-      ];
-      extraConfig = ''
-        set noemoji
-        nnoremap : <cmd>FineCmdline<CR>
-      '';
-      extraLuaConfig = ''
-        ${builtins.readFile ../../config/nvim/options.lua}
-        ${builtins.readFile ../../config/nvim/keymaps.lua}
-        ${builtins.readFile ../../config/nvim/plugins/alpha.lua}
-        ${builtins.readFile ../../config/nvim/plugins/autopairs.lua}
-        ${builtins.readFile ../../config/nvim/plugins/auto-session.lua}
-        ${builtins.readFile ../../config/nvim/plugins/comment.lua}
-        ${builtins.readFile ../../config/nvim/plugins/cmp.lua}
-        ${builtins.readFile ../../config/nvim/plugins/lsp.lua}
-        ${builtins.readFile ../../config/nvim/plugins/nvim-tree.lua}
-        ${builtins.readFile ../../config/nvim/plugins/telescope.lua}
-        ${builtins.readFile ../../config/nvim/plugins/todo-comments.lua}
-        ${builtins.readFile ../../config/nvim/plugins/treesitter.lua}
-        ${builtins.readFile ../../config/nvim/plugins/fine-cmdline.lua}
-        require("ibl").setup()
-        require("bufferline").setup{}
-        require("lualine").setup({
-          icons_enabled = true,
-          theme = 'dracula',
-        })
-      '';
-    };
     kitty = {
       enable = true;
       package = pkgs.kitty;
@@ -258,10 +184,6 @@ in
         inactive_tab_font_style bold
       '';
     };
-    starship = {
-      enable = true;
-      package = pkgs.starship;
-    };
     bash = {
       enable = true;
       enableCompletion = true;