Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Nixos 23.11 #301

Merged
merged 6 commits into from
Jan 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 41 additions & 42 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 @@ -3,7 +3,7 @@

inputs = {
# NixOS related inputs
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-unfree = {
url = "github:numtide/nixpkgs-unfree";
Expand All @@ -29,7 +29,7 @@
};

aagl = {
url = "github:ezKEa/aagl-gtk-on-nix?rev=0c9d93bdb311f7948f9fb0e98d869316d78eec12";
url = "github:ezKEa/aagl-gtk-on-nix";
inputs.nixpkgs.follows = "nixpkgs";
};

Expand All @@ -43,7 +43,7 @@

# home-manager related inputs
home-manager = {
url = "github:nix-community/home-manager/release-23.05";
url = "github:nix-community/home-manager/release-23.11";
inputs.nixpkgs.follows = "nixpkgs";
};
nurpkgs.url = "github:nix-community/NUR";
Expand Down
9 changes: 9 additions & 0 deletions home-config/config/desktop/pipewire.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ in {
config = lib.mkIf config.custom.desktop-environment {
xdg.configFile."pipewire/pipewire.conf.d/99-rnnoise.conf" = {
text = builtins.toJSON {
"context.properties" = {
"link.max-buffers" = 16;
"core.daemon" = true;
"core.name" = "pipewire-0";
"module.x11.bell" = false;
"module.access" = true;
"module.jackdbus-detect" = false;
};

"context.modules" = [
{
name = "libpipewire-module-filter-chain";
Expand Down
8 changes: 7 additions & 1 deletion home-config/config/graphical-applications/firefox.nix
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,18 @@ in {

programs.firefox = {
enable = true;
package = pkgs.firefox.override {cfg.enableTridactylNative = true;};
package = pkgs.firefox.override {
nativeMessagingHosts = [
pkgs.tridactyl-native
];
};
profiles."tlater" = {
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
aria2-integration
buster-captcha-solver
clearurls
decentraleyes
indie-wiki-buddy
keepassxc-browser
libredirect
no-pdf-download
Expand All @@ -57,6 +62,7 @@ in {
# cloudhole
# devtools-adb-extension
# firefox-sticky-window-containers
# warframe-reliquary-prime
];

userChrome =
Expand Down
2 changes: 1 addition & 1 deletion home-config/config/tty-applications/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

home.packages = with pkgs; [
bat
exa
eza
fd
ripgrep
screen
Expand Down
5 changes: 3 additions & 2 deletions home-config/config/tty-applications/zsh.nix
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,11 @@ in {

enableAutosuggestions = true;
enableCompletion = true;
enableSyntaxHighlighting = true;
enableVteIntegration = true;
defaultKeymap = "emacs";

syntaxHighlighting.enable = true;

plugins = [
{
name = "bgnotify";
Expand All @@ -66,7 +67,7 @@ in {
];

shellAliases = {
"ls" = "exa";
"ls" = "eza";
"winetricks" = "winetricks -q";
"pbcopy" = "xsel --clipboard --input";
"pbpaste" = "xsel --clipboard";
Expand Down
2 changes: 1 addition & 1 deletion home-modules/firefox-webapp.nix
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ in {
};

extraArgs = mkOption {
type = listOf string;
type = listOf str;
default = [];
description = "Extra args to launch Firefox with.";
};
Expand Down
4 changes: 2 additions & 2 deletions modules/cursor-theme.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
pkgs,
...
}: let
inherit (lib.types) string nullOr number;
inherit (lib.types) str nullOr number;
in {
options.theming = {
cursor = {
theme = lib.mkOption {
default = null;
type = nullOr string;
type = nullOr str;
description = "The default cursor theme to use. Package must be installed separately";
};

Expand Down
Loading
Loading