diff --git a/flake.nix b/flake.nix index cf03858..b889e8e 100644 --- a/flake.nix +++ b/flake.nix @@ -79,7 +79,7 @@ deploy.overlay ./pkgs/default.nix - fenix.overlay + fenix.overlay ]; }; latest = { }; diff --git a/pkgs/_build/generated.nix b/pkgs/_build/generated.nix index 21c6b59..a7b1024 100644 --- a/pkgs/_build/generated.nix +++ b/pkgs/_build/generated.nix @@ -12,7 +12,7 @@ leaveDotGit = false; sha256 = "0rr66y86g6g8ixg69yd6ahyzirl82gfvyv6j2w6b0zv5x0979x9v"; }; - + }; manix = { pname = "manix"; @@ -25,6 +25,6 @@ leaveDotGit = false; sha256 = "1b7xi8c2drbwzfz70czddc4j33s7g1alirv12dwl91hbqxifx8qs"; }; - + }; } diff --git a/pkgs/go-fold-if-err-nil.nix b/pkgs/go-fold-if-err-nil.nix index e7979b6..13c68f1 100644 --- a/pkgs/go-fold-if-err-nil.nix +++ b/pkgs/go-fold-if-err-nil.nix @@ -1,6 +1,6 @@ { lib, sources, stdenv, vimUtils, ... }: vimUtils.buildVimPluginFrom2Nix { - inherit (sources.go-fold-if-err-nil) src version; - name = "go-fold-if-err-nil"; - meta.homepage = "https://im.badat.dev/bad/nvimgofoldiferrnil"; + inherit (sources.go-fold-if-err-nil) src version; + name = "go-fold-if-err-nil"; + meta.homepage = "https://im.badat.dev/bad/nvimgofoldiferrnil"; } diff --git a/profiles/flatpak/default.nix b/profiles/flatpak/default.nix index 8483bfd..7ca9b1d 100644 --- a/profiles/flatpak/default.nix +++ b/profiles/flatpak/default.nix @@ -1,4 +1,4 @@ { pkgs, ... }: { - services.flatpak.enable = true; + services.flatpak.enable = true; } diff --git a/profiles/java/default.nix b/profiles/java/default.nix index 310483b..1d2e46c 100644 --- a/profiles/java/default.nix +++ b/profiles/java/default.nix @@ -2,6 +2,6 @@ { programs.java.enable = true; environment.systemPackages = with pkgs; [ - jdk + jdk ]; } diff --git a/profiles/pipewire/default.nix b/profiles/pipewire/default.nix index 7e15f4f..7124ca5 100644 --- a/profiles/pipewire/default.nix +++ b/profiles/pipewire/default.nix @@ -1,46 +1,46 @@ -{...}: +{ ... }: { -# rtkit is optional but recommended -security.rtkit.enable = true; -services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - # If you want to use JACK applications, uncomment this - #jack.enable = true; + # rtkit is optional but recommended + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; - # use the example session manager (no others are packaged yet so this is enabled by default, - # no need to redefine it in your config for now) - media-session.enable = true; + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + media-session.enable = true; - #bluetooth config + #bluetooth config media-session.config.bluez-monitor.rules = [ - { - # Matches all cards - matches = [ { "device.name" = "~bluez_card.*"; } ]; - actions = { - "update-props" = { - "bluez5.reconnect-profiles" = [ "hfp_hf" "hsp_hs" "a2dp_sink" ]; - # mSBC is not expected to work on all headset + adapter combinations. - "bluez5.msbc-support" = true; - # SBC-XQ is not expected to work on all headset + adapter combinations. - "bluez5.sbc-xq-support" = true; + { + # Matches all cards + matches = [{ "device.name" = "~bluez_card.*"; }]; + actions = { + "update-props" = { + "bluez5.reconnect-profiles" = [ "hfp_hf" "hsp_hs" "a2dp_sink" ]; + # mSBC is not expected to work on all headset + adapter combinations. + "bluez5.msbc-support" = true; + # SBC-XQ is not expected to work on all headset + adapter combinations. + "bluez5.sbc-xq-support" = true; + }; }; - }; - } - { - matches = [ - # Matches all sources - { "node.name" = "~bluez_input.*"; } - # Matches all outputs - { "node.name" = "~bluez_output.*"; } - ]; - actions = { - "node.pause-on-idle" = false; - }; - } - ]; -}; + } + { + matches = [ + # Matches all sources + { "node.name" = "~bluez_input.*"; } + # Matches all outputs + { "node.name" = "~bluez_output.*"; } + ]; + actions = { + "node.pause-on-idle" = false; + }; + } + ]; + }; } diff --git a/profiles/pulse/default.nix b/profiles/pulse/default.nix index 4405c25..6051118 100644 --- a/profiles/pulse/default.nix +++ b/profiles/pulse/default.nix @@ -1,5 +1,5 @@ -{pkgs, ...}: - { +{ pkgs, ... }: +{ sound.enable = true; hardware.pulseaudio = { enable = true; diff --git a/users/mae/home-manager-base.nix b/users/mae/home-manager-base.nix index b4dafec..8b77c88 100644 --- a/users/mae/home-manager-base.nix +++ b/users/mae/home-manager-base.nix @@ -4,12 +4,12 @@ home.sessionVariables = { XDG_DATA_DIRS = "$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share"; -# NIX_BUILD_SHELL = "zsh"; + # NIX_BUILD_SHELL = "zsh"; }; gtk.theme.name = "arc-dark"; gtk.theme.package = pkgs.arc-theme; programs.go = { - enable = true; - goPath = ".local/go"; + enable = true; + goPath = ".local/go"; }; } diff --git a/users/profiles/direnv/default.nix b/users/profiles/direnv/default.nix index 7d3c9fe..d345e2d 100644 --- a/users/profiles/direnv/default.nix +++ b/users/profiles/direnv/default.nix @@ -2,8 +2,8 @@ programs.direnv = { enable = true; nix-direnv = { - enable = true; - enableFlakes = true; + enable = true; + enableFlakes = true; }; }; } diff --git a/users/profiles/sway/desktop.nix b/users/profiles/sway/desktop.nix index b81a458..98544b4 100644 --- a/users/profiles/sway/desktop.nix +++ b/users/profiles/sway/desktop.nix @@ -1,6 +1,6 @@ { pkgs, lib, ... }: let -rofi = pkgs.rofi.override { plugins = [ pkgs.rofi-emoji ]; }; + rofi = pkgs.rofi.override { plugins = [ pkgs.rofi-emoji ]; }; in { wayland.windowManager.sway = rec { @@ -14,7 +14,7 @@ in xkb_layout = "pl"; accel_profile = "flat"; dwt = "disabled"; - pointer_accel = "0.0"; + pointer_accel = "0.0"; }; }; bars = [{ @@ -25,12 +25,12 @@ in }]; floating.criteria = [{ title = "Steam - Update News"; }]; startup = [ - # Copied from https://git.sr.ht/~sumner/home-manager-config/tree/master/item/modules/window-manager/wayland.nix#L64 - # See https://github.com/nix-community/home-manager/issues/2028 - # Make all the pinentry stuff work - # See: https://github.com/NixOS/nixpkgs/issues/119445#issuecomment-820507505 - # and: https://github.com/NixOS/nixpkgs/issues/57602#issuecomment-820512097 - { command = "dbus-update-activation-environment WAYLAND_DISPLAY"; } + # Copied from https://git.sr.ht/~sumner/home-manager-config/tree/master/item/modules/window-manager/wayland.nix#L64 + # See https://github.com/nix-community/home-manager/issues/2028 + # Make all the pinentry stuff work + # See: https://github.com/NixOS/nixpkgs/issues/119445#issuecomment-820507505 + # and: https://github.com/NixOS/nixpkgs/issues/57602#issuecomment-820512097 + { command = "dbus-update-activation-environment WAYLAND_DISPLAY"; } ]; }; wrapperFeatures.gtk = true; @@ -45,20 +45,20 @@ in export _JAVA_AWT_WM_NONREPARENTING=1 ''; }; - + programs.rofi = { - enable = true; - package = rofi; - theme = "purple"; - extraConfig = { - modi = "combi"; - combi-modi = "drun,emoji"; - }; + enable = true; + package = rofi; + theme = "purple"; + extraConfig = { + modi = "combi"; + combi-modi = "drun,emoji"; + }; }; programs.mako = { - enable = true; - defaultTimeout = 2000; + enable = true; + defaultTimeout = 2000; }; programs.i3status-rust = {