Skip to content

Commit

Permalink
feat(nix): update to 24.11
Browse files Browse the repository at this point in the history
  • Loading branch information
radoslawgrochowski committed Dec 1, 2024
1 parent e4f5a82 commit 0981fc3
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 48 deletions.
31 changes: 7 additions & 24 deletions flake.lock

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

17 changes: 8 additions & 9 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,20 @@
description = "radoslawgrochowski workstation configuration";

inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-master.url = "github:nixos/nixpkgs/master";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nix-darwin = {
url = "github:LnL7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs-stable";
inputs.nixpkgs.follows = "nixpkgs";
};
nixos-wsl = {
url = "github:nix-community/NixOS-WSL";
inputs.nixpkgs.follows = "nixpkgs-stable";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = {
url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs-stable";
inputs.nixpkgs.follows = "nixpkgs";
};
flake-utils.url = "github:numtide/flake-utils";
nix-index-database = {
Expand All @@ -27,12 +26,11 @@
};

outputs =
inputs@{ self
{ self
, nix-darwin
, nixpkgs
, nixpkgs-unstable
, nixpkgs-stable
, flake-utils
, nix-index-database
, ...
}:
let
Expand Down Expand Up @@ -85,7 +83,8 @@
./hosts/wsl
./presets/wsl.nix
./modules/docker
./modules/video
./modules/vido
nix-index-database.nixosModules.nix-index
];
specialArgs = commonSpecialArgs;
};
Expand Down
4 changes: 2 additions & 2 deletions modules/nvim/plugins/dap/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
nvim-dap-ui
];
extraPackages = [
pkgs.unstable.vscode-js-debug
pkgs.vscode-js-debug
];
config = /* lua */''
JS_DEBUG_PATH = '${"${pkgs.unstable.vscode-js-debug}"}/bin/js-debug';
JS_DEBUG_PATH = '${"${pkgs.vscode-js-debug}"}/bin/js-debug';
${builtins.readFile ./config.lua}
'';
}
Expand Down
7 changes: 3 additions & 4 deletions modules/nvim/plugins/lsp/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,14 @@
nodePackages.typescript
nodePackages.typescript-language-server
nodePackages.yaml-language-server
nodePackages.yaml-language-server
shellcheck
shfmt
stylua
pkgs.unstable.elixir
pkgs.unstable.elixir-ls
elixir
elixir-ls
];
config = /* lua */''
ELIXIR_LS_PATH = '${"${pkgs.unstable.elixir-ls}"}/bin/elixir-ls';
ELIXIR_LS_PATH = '${"${pkgs.elixir-ls}"}/bin/elixir-ls';
${builtins.readFile ./config.lua}
'';
}
Expand Down
2 changes: 1 addition & 1 deletion modules/nvim/plugins/mini/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ pkgs }:
{
plugins = [ pkgs.unstable.vimPlugins.mini-nvim ];
plugins = [ pkgs.vimPlugins.mini-nvim ];
config = builtins.readFile ./config.lua;
}
7 changes: 2 additions & 5 deletions modules/nvim/plugins/test/default.nix
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
{ pkgs }:
let
unstable = pkgs.unstable.vimPlugins;
in
{
plugins = with pkgs.vimPlugins; [
# dependencies
nvim-nio
plenary-nvim
FixCursorHold-nvim

unstable.neotest
unstable.neotest-jest
neotest
neotest-jest
];
config = builtins.readFile ./config.lua;
}
3 changes: 0 additions & 3 deletions overlays/nixpkgs-custom.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
unstable = import inputs.nixpkgs-unstable {
system = final.system;
};
stable = import inputs.nixpkgs-stable {
system = final.system;
};
master = import inputs.nixpkgs-master {
system = final.system;
};
Expand Down

0 comments on commit 0981fc3

Please sign in to comment.