summaryrefslogtreecommitdiff
path: root/nixos
diff options
context:
space:
mode:
Diffstat (limited to 'nixos')
-rw-r--r--nixos/common.nix8
-rw-r--r--nixos/kusanagi.nix14
-rw-r--r--nixos/wmonly.nix2
3 files changed, 12 insertions, 12 deletions
diff --git a/nixos/common.nix b/nixos/common.nix
index 4bacead..6b490be 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -52,9 +52,9 @@
services.xserver.enable = true;
# Configure keymap in X11
- services.xserver.layout = "fr-custom-lx,ergol-lx";
- services.xserver.xkbOptions = "terminate:ctrl_alt_bksp,caps:escape";
- services.xserver.extraLayouts = {
+ services.xserver.xkb.layout = "fr-custom-lx,ergol-lx";
+ services.xserver.xkb.options = "terminate:ctrl_alt_bksp,caps:escape";
+ services.xserver.xkb.extraLayouts = {
"fr-custom-lx" = {
description = "French (LX custom azerty)";
languages = ["fre"];
@@ -84,7 +84,7 @@
};
# Enable touchpad support (enabled default in most desktopManager).
- services.xserver.libinput.enable = true;
+ services.libinput.enable = true;
# Enable logitech unifying reciever support
hardware.logitech.wireless.enable = true;
diff --git a/nixos/kusanagi.nix b/nixos/kusanagi.nix
index d030e97..d6970ea 100644
--- a/nixos/kusanagi.nix
+++ b/nixos/kusanagi.nix
@@ -10,9 +10,9 @@ let
sha256 = "sha256:0pxljc5bzcwb8c43qmm5l49p03snq7piqnshglqday2dw6cfcd6l";
};
home-manager = builtins.fetchTarball {
- # branch release-23.11 as of 2023-12-25
- url = "https://github.com/nix-community/home-manager/archive/d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224.tar.gz";
- sha256 = "sha256:16ab1k33aivqc5ighi95nh28pssbds5glz3bb371gb06qpiydihl";
+ # branch release-24.05 as of 2024-06-23
+ url = "https://github.com/nix-community/home-manager/archive/a1fddf0967c33754271761d91a3d921772b30d0e.tar.gz";
+ sha256 = "sha256:1vvrrk14vrhb6drj3fy8snly0sf24x3402ykb9q5j1gy99vvqqq6";
};
in
{
@@ -131,10 +131,10 @@ in
# ---- automatic login ----
- services.xserver.displayManager.defaultSession = "sway";
+ services.displayManager.defaultSession = "sway";
services.xserver.displayManager.lightdm.enable = true;
- services.xserver.displayManager.autoLogin.enable = true;
- services.xserver.displayManager.autoLogin.user = "lx";
+ services.displayManager.autoLogin.enable = true;
+ services.displayManager.autoLogin.user = "lx";
# ---- specialization with extra stuff
@@ -149,7 +149,7 @@ in
services.printing.drivers = [ pkgs.cups-brother-hl1210w ];
services.avahi.enable = true;
- services.avahi.nssmdns = true;
+ services.avahi.nssmdns4 = true;
services.avahi.openFirewall = true;
# ---- tor paths ----
diff --git a/nixos/wmonly.nix b/nixos/wmonly.nix
index 42c9300..da5596b 100644
--- a/nixos/wmonly.nix
+++ b/nixos/wmonly.nix
@@ -28,7 +28,7 @@
geany
gnome.nautilus
gnome.eog
- gnome.gedit
+ gedit
gnome.file-roller
evince