Skip to content

Commit

Permalink
flake: Update to nixpkgs 24.11
Browse files Browse the repository at this point in the history
This also includes fixing evaluation warnings, primarily coming from
nixvim. Further more build support for Gradle was updated/changed in
nixpkgs, so groovy-language-server now also uses that.
  • Loading branch information
britter committed Dec 11, 2024
1 parent eab75f4 commit ffc80dd
Show file tree
Hide file tree
Showing 12 changed files with 375 additions and 129 deletions.
130 changes: 101 additions & 29 deletions flake.lock

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

6 changes: 3 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
};
flake-utils.url = "github:numtide/flake-utils";
home-manager = {
url = "github:nix-community/home-manager/release-24.05";
url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs";
};
nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
nixos-hardware.url = "github:nixos/nixos-hardware/master";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
nixvim = {
url = "github:nix-community/nixvim/nixos-24.05";
url = "github:nix-community/nixvim/nixos-24.11";
inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager";
};
Expand Down
8 changes: 4 additions & 4 deletions home/desktop/sway/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ in {
home.packages = with pkgs; [
dconf
evince # pdf viewer
gnome.nautilus
gnome.adwaita-icon-theme
gnome.file-roller # archive manager
gnome.gnome-calendar
nautilus
adwaita-icon-theme
file-roller # archive manager
gnome-calendar
loupe # image provider
qalculate-gtk # calculator
wl-clipboard # terminal access to the clipboard
Expand Down
2 changes: 1 addition & 1 deletion home/terminal/nvim/completion.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ _: {
cmp_luasnip.enable = true;
luasnip = {
enable = true;
extraConfig = {
settings = {
enable_autosnippets = true;
store_selection_keys = "<Tab>";
};
Expand Down
2 changes: 1 addition & 1 deletion home/terminal/nvim/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ in {
};
treesitter = {
enable = true;
indent = true;
settings.indent.enable = true;
};
};
};
Expand Down
2 changes: 1 addition & 1 deletion home/terminal/nvim/lsp.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ _: {
servers = {
gopls.enable = true;
nixd.enable = true;
tsserver.enable = true;
ts_ls.enable = true;
};
keymaps = {
lspBuf = {
Expand Down
4 changes: 2 additions & 2 deletions home/terminal/nvim/ui.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{pkgs, ...}: {
_: {
programs.nixvim = {
colorschemes.catppuccin = {
enable = true;
Expand All @@ -24,11 +24,11 @@
list = true;
listchars = "tab:→·,lead:·,space:·,trail:~,extends:→,precedes:←,nbsp:␣";
};
extraPlugins = [pkgs.vimPlugins."nvim-web-devicons"];
plugins = {
bufferline.enable = true;
lualine.enable = true;
neo-tree.enable = true;
web-devicons.enable = true;
};
keymaps = [
{
Expand Down
1 change: 1 addition & 0 deletions modules/gaming/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ in {
"steam"
"steam-original"
"steam-run"
"steam-unwrapped"
];

# performance stats overlay
Expand Down
9 changes: 2 additions & 7 deletions modules/nextcloud/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,10 @@ in {
};
database.createLocally = true;
extraApps = {
inherit (config.services.nextcloud.package.packages.apps) bookmarks calendar contacts cookbook deck notes;
news = pkgs.fetchNextcloudApp {
url = "https://github.com/nextcloud/news/releases/download/25.0.0/news.tar.gz";
sha256 = "sha256-DNbHfRstY6C7UhdsyW3VvuzNHmMt/qJ/5dDrLQYqtN8=";
license = "agpl3Plus";
};
inherit (config.services.nextcloud.package.packages.apps) bookmarks calendar contacts cookbook deck news notes;
integration_google = pkgs.fetchNextcloudApp {
url = "https://github.com/nextcloud-releases/integration_google/releases/download/v3.1.0/integration_google-v3.1.0.tar.gz";
sha256 = "sha256-tqsi95+CIoHRFvv8I0HoVl5hjhROrr9epWvNeDynMXQ=";
sha256 = "sha256-KZoslAdLUes/Myc8QD9MuwFBt6gdF1U0+Gv0vIusllY=";
license = "agpl3Plus";
};
};
Expand Down
1 change: 0 additions & 1 deletion modules/sound/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ in {
};

config = lib.mkIf cfg.enable {
sound.enable = true;
hardware.pulseaudio.enable = false;
# The PulseAudio server uses this to acquire realtime priority
security.rtkit.enable = true;
Expand Down
Loading

0 comments on commit ffc80dd

Please sign in to comment.