Merge branch 'pjones:trunk' into konsole

.github/workflows/ci.yml

@@ -0,0 +1,17 @@
+name: "Check"
+on:
+  pull_request:
+# cancel previous runs when pushing new changes
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+jobs:
+  checks:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: cachix/install-nix-action@v22
+      with:
+        extra_nix_config: "system-features = kvm nixos-test"
+    - run: nix flake check -L --keep-going
+    - run: nix flake check -L --keep-going ./example

.gitignore

@@ -1 +1,3 @@
-/example/result
+result-*
+result
+.direnv

example/flake.nix

@@ -2,9 +2,9 @@
   description = "Plasma Manager Example";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
 
-    home-manager.url = "github:nix-community/home-manager/release-22.05";
+    home-manager.url = "github:nix-community/home-manager/release-23.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     plasma-manager.url = "github:pjones/plasma-manager";

example/home.nix

@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 {
   programs.plasma = {
     enable = true;

flake.nix

@@ -2,9 +2,9 @@
   description = "Manage KDE Plasma with Home Manager";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
 
-    home-manager.url = "github:nix-community/home-manager/release-22.05";
+    home-manager.url = "github:nix-community/home-manager/release-23.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
   };
 

script/write_config.py

@@ -3,7 +3,7 @@
 import os
 import re
 import sys
-from typing import Dict
+from typing import Dict, Optional
 
 
 class KConfParser:
@@ -89,7 +89,7 @@ def save(self):
                     f.write(f"{self.key_value_to_line(key, value)}\n")
 
     @staticmethod
-    def get_key_value(line: str) -> tuple[str, str | None]:
+    def get_key_value(line: str) -> tuple[str, Optional[str]]:
         line_splitted = line.split("=", 1)
         key = line_splitted[0].strip()
         value = line_splitted[1].strip() if len(line_splitted) > 1 else None