diff --git a/configuration.nix b/configuration.nix index e9b0235..87878ef 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,7 +2,7 @@ ## your system. Help is available in the configuration.nix(5) man page, on # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). -{ lib, pkgs, ... }: +{ ... }: { imports = diff --git a/gui.nix b/gui.nix index 3e0b9c0..35f10ac 100644 --- a/gui.nix +++ b/gui.nix @@ -15,6 +15,7 @@ services.pipewire = { enable = true; alsa.enable = true; + alsa.support32Bit = true; pulse.enable = true; }; diff --git a/noah-home.nix b/noah-home.nix index 9aa1a31..b57cda4 100644 --- a/noah-home.nix +++ b/noah-home.nix @@ -1,4 +1,11 @@ -{ pkgs, lib, ...}: { + +{ pkgs, lib, ... }: let + unstable = import { + config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "jetbrains-toolbox" + ]; + }; +in { home.packages = with pkgs; [ # main tool firefox-devedition @@ -48,7 +55,7 @@ python3 # JetBrains - jetbrains-toolbox + unstable.jetbrains-toolbox # GUI tools i3status @@ -63,6 +70,8 @@ spotify tailscale ]; + + programs.fish.enable = true; programs.neovim = { enable = true; diff --git a/nvim/lua/lsp.lua b/nvim/lua/lsp.lua index f00734e..b7bfcfb 100644 --- a/nvim/lua/lsp.lua +++ b/nvim/lua/lsp.lua @@ -88,7 +88,7 @@ local simple_lsps = { "clojure_lsp", "guile_ls", -- Of course the Java-based ones are verbose af - "kotlin_langauge_server", + "kotlin_language_server", "java_language_server", "jsonls", "pest_ls", diff --git a/packages.nix b/packages.nix index 2e57b82..0d1d25a 100644 --- a/packages.nix +++ b/packages.nix @@ -1,5 +1,6 @@ { pkgs, lib, ... }: { + # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ @@ -13,17 +14,16 @@ qemu OVMF ]; - - # Unfree packages need to be whitelisted here - nixpkgs.config.allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) [ - "discord" - "spotify" - "obsidian" - "tailscale" - "jetbrains-toolbox" - ]; # Logseq uses an ancient version of Electron, so we enable that nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" ]; + # Whitelist some unfree packages + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "jetbrains-toolbox-2.2.1.19765" + "jetbrains-toolbox" + "discord" + "spotify" + "obsidian" + "tailscale" + ]; } diff --git a/shell.nix b/shell.nix index ed4a9c9..eeb2dd4 100644 --- a/shell.nix +++ b/shell.nix @@ -1,4 +1,4 @@ -{ pkgs ? import {} }: +{ pkgs ? import {} }: pkgs.mkShell { packages = with pkgs; [ nil lua-language-server ]; }