Skip to content

Commit

Permalink
chore: update flake.lock to include new dependencies and refactor con…
Browse files Browse the repository at this point in the history
…figuration

- Added new dependencies to flake.lock including nixvim, devshell, and others.
- Refactored configuration.nix to move nix settings to a separate module.
- Updated home-manager configuration to include nixvim module.
- Removed neovim from system packages in configuration.nix.
  • Loading branch information
BastianAsmussen committed Jul 5, 2024
1 parent 3578213 commit 1172761
Show file tree
Hide file tree
Showing 7 changed files with 274 additions and 6 deletions.
250 changes: 248 additions & 2 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
inputs.nixpkgs.follows = "nixpkgs";
};

nixvim = {
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs";
};
};

outputs = {nixpkgs, ...} @ inputs: let
Expand Down
4 changes: 0 additions & 4 deletions hosts/limitless/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
nvidia.enable = true;
ssh.enable = true;

nix.settings.experimental-features = ["nix-command" "flakes"];
nixpkgs.config.allowUnfree = true;

boot.loader = {
efi = {
canTouchEfiVariables = true;
Expand Down Expand Up @@ -74,7 +71,6 @@
};

environment.systemPackages = with pkgs; [
neovim
git
gitui
eza
Expand Down
1 change: 1 addition & 0 deletions modules/home-manager/home.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
./firefox.nix
./fzf.nix
./git.nix
./nixvim.nix
./oh-my-posh.nix
./tmux.nix
./zoxide.nix
Expand Down
9 changes: 9 additions & 0 deletions modules/home-manager/nixvim.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{inputs, pkgs, ...}: {
imports = [
inputs.nixvim.homeManagerModules.nixvim
];

programs.nixvim = {
enable = true;
};
}
3 changes: 3 additions & 0 deletions modules/nixos/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
{lib, ...}: {
imports = [
./home-manager.nix
./nix.nix
./nvidia.nix
./security.nix
./stylix.nix
];

nix.enable = lib.mkDefault true;

home-manager.enable = lib.mkDefault true;

gpg.enable = lib.mkDefault true;
Expand Down
8 changes: 8 additions & 0 deletions modules/nixos/nix.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
nixpkgs.config.allowUnfree = true;

nix.settings = {
warn-dirty = false;
experimental-features = ["nix-command" "flakes"];
};
}

0 comments on commit 1172761

Please sign in to comment.