diff --git a/flake.lock b/flake.lock index d6a91aa..57906e5 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1719076240, - "narHash": "sha256-yI1e5MZTqWyrbG9JnnOCFiFNJol5ZJ/LjWD7qjrn4Xs=", + "lastModified": 1719106959, + "narHash": "sha256-dxrEcXldbG9pw2f+BCgu5lv7nUeHphQHhGZupaaDmGg=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "5e8f95ab8a282758813e3d8922fdaa0783ee5b41", + "rev": "b5e4ae0a33bb011e9515181ff1634471a975539f", "type": "github" }, "original": { @@ -290,16 +290,16 @@ ] }, "locked": { - "lastModified": 1717476296, - "narHash": "sha256-ScHe38Tr+TxGURC17kby4mIIxOG3aJvZWXzPM79UnEk=", + "lastModified": 1718530513, + "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "owner": "nix-community", "repo": "home-manager", - "rev": "095ef64aa3b2ab4a4f1bf07f29997e21e3a5576a", + "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -427,16 +427,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1718811006, - "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", + "lastModified": 1718835956, + "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "03d771e513ce90147b65fe922d87d3a0356fc125", + "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 3ecb22e..70f27bb 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-23.11"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; emacs-overlay.url = "github:nix-community/emacs-overlay"; diff --git a/hosts/froidmpa-laptop/default.nix b/hosts/froidmpa-laptop/default.nix index 0a18223..0cc75f3 100644 --- a/hosts/froidmpa-laptop/default.nix +++ b/hosts/froidmpa-laptop/default.nix @@ -29,7 +29,18 @@ home-manager.users.${config.user.name} = { pkgs, config, ... }: { services.network-manager-applet.enable = true; services.blueman-applet.enable = true; + wayland.windowManager.hyprland.settings = { + dwindle.no_gaps_when_only = 1; + }; }; + services.pipewire.wireplumber.extraConfig = { + "monitor.bluez.properties" = { + "bluez5.enable-sbc-xq" = true; + "bluez5.enable-msbc" = true; + "bluez5.enable-hw-volume" = true; + "bluez5.roles" = [ "hsp_hs" "hsp_ag" "hfp_hf" "hfp_ag" ]; + }; + }; system.stateVersion = "21.05"; } diff --git a/hosts/froidmpa-laptop/hardware-configuration.nix b/hosts/froidmpa-laptop/hardware-configuration.nix index 7c1c1a8..bd5ac83 100644 --- a/hosts/froidmpa-laptop/hardware-configuration.nix +++ b/hosts/froidmpa-laptop/hardware-configuration.nix @@ -1,10 +1,7 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = - [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; boot = { initrd.availableKernelModules = [ "nvme" "xhci_pci" "sdhci_pci" ]; @@ -15,23 +12,21 @@ extraModulePackages = [ ]; loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; - initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/1e900b2e-daea-4558-b18f-3d3a5843de61"; + initrd.luks.devices."crypted".device = + "/dev/disk/by-uuid/1e900b2e-daea-4558-b18f-3d3a5843de61"; }; hardware.cpu.amd.updateMicrocode = true; - fileSystems."/" = - { - device = "/dev/disk/by-uuid/a8abad9b-5615-4887-8431-3d80b78d073e"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/a8abad9b-5615-4887-8431-3d80b78d073e"; + fsType = "ext4"; + }; - - fileSystems."/boot" = - { - device = "/dev/disk/by-uuid/077C-758A"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/077C-758A"; + fsType = "vfat"; + }; swapDevices = [{ device = "/dev/disk/by-uuid/bb8fa9ef-9b8f-413d-913a-6c891649a954"; }]; @@ -42,27 +37,12 @@ bluetooth = { enable = true; # Enable A2DP Sink - settings = { - General = { - Enable = "Source,Sink,Media,Socket"; - }; - }; - }; - pulseaudio = { - enable = true; - - # Use full build to have Bluetooth support - package = pkgs.pulseaudioFull; + settings = { General = { Enable = "Source,Sink,Media,Socket"; }; }; }; }; networking.networkmanager.enable = true; - # Enable touchpad support. - services.xserver.libinput.enable = true; - - services.xserver.videoDrivers = [ "amdgpu" "modesetting" ]; - services.blueman.enable = true; services.logind.lidSwitch = "ignore"; diff --git a/modules/desktop/alacritty.nix b/modules/desktop/alacritty.nix index 37358d5..56380b6 100644 --- a/modules/desktop/alacritty.nix +++ b/modules/desktop/alacritty.nix @@ -46,7 +46,7 @@ in { }; scrolling.history = 65535; font.size = 8; - key_bindings = [ + keyboard.bindings = [ { key = "Up"; mods = "Control"; diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index cdb8b16..fdd62af 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -42,7 +42,7 @@ in { gpg-agent = { enable = true; enableSshSupport = false; - pinentryFlavor = "gtk2"; + pinentryPackage = pkgs.pinentry-gtk2; }; unclutter.enable = true; }; @@ -152,7 +152,7 @@ in { mumble libreoffice-fresh onlyoffice-bin - pkgs.thunderbird + thunderbird portfolio gnucash transmission-remote-gtk diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index 5d355ad..aea101e 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -60,7 +60,7 @@ in { kb_options = "caps:escape"; numlock_by_default = "true"; touchpad = { - natural_scroll = true; + natural_scroll = false; disable_while_typing = true; tap-to-click = false; middle_button_emulation = false; @@ -375,6 +375,8 @@ in { ]; }; + hardware.opengl.enable = true; + security.pam.services.swaylock = { }; }; diff --git a/modules/desktop/themes/qt.nix b/modules/desktop/themes/qt.nix index 7d107e6..60c70cb 100644 --- a/modules/desktop/themes/qt.nix +++ b/modules/desktop/themes/qt.nix @@ -18,7 +18,7 @@ in { qt = { enable = true; - platformTheme = "gtk"; + platformTheme.name = "gtk"; style = { name = "adwaita-dark"; package = pkgs.unstable.adwaita-qt; diff --git a/modules/desktop/zsh.nix b/modules/desktop/zsh.nix index 9a89726..9cf3a36 100644 --- a/modules/desktop/zsh.nix +++ b/modules/desktop/zsh.nix @@ -21,7 +21,7 @@ in { size = 50000; }; enableCompletion = true; - enableAutosuggestions = true; + autosuggestion.enable = true; syntaxHighlighting.enable = true; initExtra = '' autoload -Uz up-line-or-beginning-search down-line-or-beginning-search diff --git a/modules/editor/emacs/emacs.nix b/modules/editor/emacs/emacs.nix index f718ef2..faa20b2 100644 --- a/modules/editor/emacs/emacs.nix +++ b/modules/editor/emacs/emacs.nix @@ -39,7 +39,6 @@ in { # metals # Scala # Nix nil - nixfmt phpactor # PHP #OCaml ocaml