diff --git a/base/gui-programs.nix b/base/gui-programs.nix index e592fbf..7431a12 100644 --- a/base/gui-programs.nix +++ b/base/gui-programs.nix @@ -34,13 +34,16 @@ in { if config.my.gui.isNvidia then ["nvidia"] else options.services.xserver.videoDrivers.default; - layout = "fr"; - xkbVariant = "us"; - libinput = { - enable = true; - touchpad = { - naturalScrolling = true; - }; + xkb = { + layout = "fr"; + variant = "us"; + }; + }; + + libinput = { + enable = true; + touchpad = { + naturalScrolling = true; }; }; diff --git a/flake.lock b/flake.lock index 16883f4..a0701ca 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1707830867, - "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", + "lastModified": 1716561646, + "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", "owner": "ryantm", "repo": "agenix", - "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", + "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", "type": "github" }, "original": { @@ -48,11 +48,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1711934712, - "narHash": "sha256-sBDe+QmX/QohlnKeSEzrftcXyZL5FY09OMjZ59Rpyy4=", + "lastModified": 1716983378, + "narHash": "sha256-nfbgkhyXdClO6/Cog7GK+r8kd4gmbg2vWA5gSkYnhG4=", "owner": "nix-community", "repo": "disko", - "rev": "611c9ea53250f7bb22286b3d26872280a0e608f9", + "rev": "5f7bdc72053380270f2a88690a14292c63cd5643", "type": "github" }, "original": { @@ -125,11 +125,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1711352745, - "narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=", + "lastModified": 1716987116, + "narHash": "sha256-uuEkErFVsFdg2K0cKbNQ9JlFSAm/xYqPr4rbPLI91Y8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0", + "rev": "8251761f93d6f5b91cee45ac09edb6e382641009", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1711983799, - "narHash": "sha256-Wo9rOsVxGIMcLmFilSai2Fi7kN50doxsuksoTIXPytI=", + "lastModified": 1716968199, + "narHash": "sha256-vYbYTeWF4YMKYu6lHLQH+OagpubB9aZ1+V630h6qJr4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bea75f6bdceecb9a349e7425ae2ca5c91c01b9c", + "rev": "c598bbfe379934e8f379bc474cc1914a7c34fbdc", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1711715736, - "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=", + "lastModified": 1716715802, + "narHash": "sha256-usk0vE7VlxPX8jOavrtpOqphdfqEQpf9lgedlY/r66c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d", + "rev": "e2dd4e18cc1c7314e24154331bae07df76eb582f", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1716542732, - "narHash": "sha256-0Y9fRr0CUqWT4KgBITmaGwlnNIGMYuydu2L8iLTfHU4=", + "lastModified": 1716966868, + "narHash": "sha256-I5dlFm936SkuUu9haYabEBCUPeX6EuXLT1uFkEM/lbY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d12251ef6e8e6a46e05689eeccd595bdbd3c9e60", + "rev": "fafeae3d248c41c6c8a2ab5e09f9e2d3de706ef8", "type": "github" }, "original": { diff --git a/home/tridactylrc b/home/tridactylrc index 7601c0e..9b74c6c 100644 --- a/home/tridactylrc +++ b/home/tridactylrc @@ -18,6 +18,8 @@ bind , nohlsearch " case insensitive if lowercase, case sensitive if using some uppercase letters set findcase smart +set modeindicatormodes {"ignore": "false"} + " New reddit is bad " autocmd DocStart ^http(s?)://www.reddit.com js tri.excmds.urlmodify("-t", "www", "old") diff --git a/hosts/talos/default.nix b/hosts/talos/default.nix index 9da872c..16d0d00 100644 --- a/hosts/talos/default.nix +++ b/hosts/talos/default.nix @@ -148,11 +148,11 @@ services.xserver.enable = true; # Enable the KDE Plasma Desktop Environment. - services.xserver.displayManager.sddm = { + services.displayManager.sddm = { enable = true; wayland.enable = true; }; - services.xserver.displayManager.defaultSession = "plasmawayland"; + services.displayManager.defaultSession = "plasmawayland"; services.xserver.desktopManager.plasma5.enable = true; services.power-profiles-daemon.enable = true; diff --git a/modules/sddm.nix b/modules/sddm.nix index ee50f5e..41941ba 100644 --- a/modules/sddm.nix +++ b/modules/sddm.nix @@ -15,7 +15,7 @@ in { options.my.displayManager.sddm.enable = mkEnableOption "SDDM setup"; config = mkIf cfg.enable { - services.xserver.displayManager.sddm = { + services.displayManager.sddm = { enable = true; theme = "sugar-candy"; }; diff --git a/services/nextcloud.nix b/services/nextcloud.nix index 39e39c7..8c9ee12 100644 --- a/services/nextcloud.nix +++ b/services/nextcloud.nix @@ -62,7 +62,7 @@ in { hostName = "cloud.${domain}"; https = true; - package = pkgs.nextcloud27; + package = pkgs.nextcloud29; maxUploadSize = "1G";