migrate to plasm6 - minimal

flake.lock

@@ -242,20 +242,20 @@
     "home-manager": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs-stable"
+          "nixpkgs-nixos-unstable"
         ]
       },
       "locked": {
-        "lastModified": 1706981411,
+        "lastModified": 1710532761,
-        "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
+        "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "652fda4ca6dafeb090943422c34ae9145787af37",
+        "rev": "206f457fffdb9a73596a4cb2211a471bd305243d",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "master",
         "repo": "home-manager",
         "type": "github"
       }

flake.nix

@@ -159,7 +159,7 @@
     };
 
     nixosConfigurations = {
-      foryog = mkWorkstation nixpkgs-stable "x86_64-linux" "foryog";
+      foryog = mkWorkstation nixpkgs-nixos-unstable "x86_64-linux" "foryog";
       thinky = mkWorkstation nixpkgs-stable "x86_64-linux" "thinky";
       bolty = mkServer nixpkgs-stable "x86_64-linux" "bolty";
       vpsfree1 = mkServer nixpkgs-stable "x86_64-linux" "vpsfree1";
@@ -274,8 +274,8 @@
       type = "github";
       owner = "nix-community";
       repo = "home-manager";
-      ref = "release-23.11";
+      ref = "master";
-      inputs.nixpkgs.follows = "nixpkgs-stable";
+      inputs.nixpkgs.follows = "nixpkgs-nixos-unstable";
     };
     flake-utils = {
       type = "github";

nixos/boxes/foryog/default.nix

@@ -1,36 +1,25 @@
-{
+{ config, pkgs, inputs, lib, system, ... }: {
-  config,
-  pkgs,
-  inputs,
-  lib,
-  system,
-  ...
-}: {
   networking.hostName = "foryog";
 
   imports = [
     ./hardware-configuration.nix
     ../../backups.nix
     ../../boot.nix
-    ../../emacs
     ../../git
-    ../../gnome
+    ../../kde
-    ../../gui
-    ../../gui/vscode
-    ../../libvirt.nix
-    ../../mercurial
     ../../vim
     ../../zsh
   ];
 
-  fileSystems."/" = {options = ["compress=zstd"];};
+  fileSystems."/" = { options = [ "compress=zstd" ]; };
 
   services.restic.backups.home-to-b2 = {
     repository = lib.mkForce "b2:cyplo-restic-foureighty:/";
   };
-  boot.kernelParams = ["initcall_debug" ''dyndbg="file suspend.c +p"'' "no_console_suspend"];
+  boot.kernelParams =
+    [ "initcall_debug" ''dyndbg="file suspend.c +p"'' "no_console_suspend" ];
   boot.tmp.cleanOnBoot = true;
-  boot.binfmt.emulatedSystems = ["aarch64-linux"];
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
   boot.plymouth = {
     enable = true;
     logo = ./boot.png;
@@ -46,21 +35,10 @@
 
   hardware.trackpoint.enable = true;
   hardware.keyboard.qmk.enable = true;
-  services.udev.packages = [pkgs.qmk-udev-rules];
+  services.udev.packages = [ pkgs.qmk-udev-rules ];
-  services.xserver = {
+  services.fprintd = { enable = true; };
-    libinput = {
-      enable = true;
-      touchpad = {
-        tapping = true;
-        naturalScrolling = false;
-        middleEmulation = false;
-        disableWhileTyping = true;
-      };
-    };
-  };
-  services.fprintd = {enable = true;};
   programs.ccache.enable = true;
-  hardware.opengl.extraPackages = with pkgs; [libva];
+  hardware.opengl.extraPackages = with pkgs; [ libva ];
   programs.steam.enable = true;
   nixpkgs.config.allowUnfreePredicate = pkg:
     builtins.elem (lib.getName pkg) [
@@ -74,14 +52,11 @@
       "vscode"
     ];
 
-  home-manager.users.cyryl = {...}: {
+  home-manager.users.cyryl = { ... }: {
-    imports = [
+    imports = [ ../../home-manager/programs/kitty.nix ];
-      ../../home-manager/programs/kitty.nix
-      ../../home-manager/programs/helix.nix
-    ];
     home.packages =
-      (with inputs.nixpkgs-master.legacyPackages."${system}"; [bisq-desktop])
+      (with inputs.nixpkgs-master.legacyPackages."${system}"; [ bisq-desktop ])
-      ++ (with pkgs; [lutris])
+      ++ (with pkgs; [ lutris ])
-      ++ (with inputs.endless-sky.legacyPackages."${system}"; [endless-sky]);
+      ++ (with inputs.endless-sky.legacyPackages."${system}"; [ endless-sky ]);
   };
 }

nixos/common-services.nix

@@ -1,12 +1,8 @@
-{
+{ config, pkgs, ... }: {
-  config,
-  pkgs,
-  ...
-}: {
   console.keyMap = "pl2";
-  imports = [./tailscale];
+  imports = [ ./tailscale ];
   services = {
-    udev.packages = [pkgs.android-udev-rules];
+    udev.packages = [ pkgs.android-udev-rules ];
     ratbagd.enable = true;
 
     gvfs.enable = true;
@@ -25,23 +21,5 @@
     };
 
     geoclue2.enable = true;
-    xserver = {
-      enable = true;
-      layout = "pl";
-      xkbOptions = "caps:ctrl_modifier";
-      xkbVariant = "";
-      libinput = {
-        enable = true;
-        touchpad = {
-          naturalScrolling = false;
-          disableWhileTyping = true;
-        };
-      };
-
-      deviceSection = ''
-        Option "TearFree" "true"
-        Option "AccelMethod" "sna"
-      '';
-    };
   };
 }

nixos/gui/default.nix

@@ -32,7 +32,7 @@
     home.packages =
       (with pkgs;
         with pkgs.gnome3;
-        with pkgs.python38Packages; [
+        with pkgs.python39Packages; [
           anarchism
           calibre
           cheese

nixos/gui/vscode/home.nix

@@ -31,7 +31,7 @@
             url = "https://github.com/vadimcn/vscode-lldb/releases/download/v1.6.10/codelldb-${pkgs.system}.vsix";
             sha256 = "sha256-QWbpe6ofacjrTCyWSKljwHDWWeHGmKNqi7cpw8Qy5Tw=";
           };
-          buildInputs = with pkgs; [llvm lldb python38 autoPatchelfHook];
+          buildInputs = with pkgs; [llvm lldb python39 autoPatchelfHook];
         })
       ]
       ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [

nixos/home-manager/linux.nix

@@ -6,7 +6,6 @@
 }: {
   services.gpg-agent = {
     enable = true;
-    pinentryFlavor = "curses";
   };
   home.packages = with pkgs; [
     appimage-run

nixos/home-manager/programs.nix

@@ -36,7 +36,6 @@
 
     eza = {
       enable = true;
-      enableAliases = true;
       git = true;
       icons = true;
     };

nixos/kde/system.nix

@@ -7,26 +7,9 @@
 }: let
   master = inputs.nixpkgs-master;
   pkgs = master.legacyPackages."${system}";
-  lib = pkgs.lib;
-  utils = pkgs.utils;
 in {
-  disabledModules = [
+  disabledModules = [];
-    "services/x11/desktop-managers.plasma5.nix"
+  imports = [];
-    "programs/chromium.nix"
-  ];
-  imports = [
-    ({
-      pkgs,
-      lib,
-      config,
-      utils,
-      ...
-    }:
-      import "${master}/nixos/modules/services/x11/desktop-managers/plasma6.nix" {
-        inherit pkgs lib config utils;
-      })
-    "${master}/nixos/modules/programs/chromium.nix"
-  ];
 
   services.flatpak.enable = true;
 
@@ -35,6 +18,7 @@ in {
     displayManager.sddm = {
       enable = true;
       enableHidpi = true;
+      wayland.enable = true;
     };
     desktopManager.plasma6.enable = true;
   };