Compare commits

...

2 Commits

Author SHA1 Message Date
5a7e4a5020
materusPC: Update inputMethod
common: override path in default.nix
2026-06-15 22:49:36 +02:00
e37d2bb716
materusPC: replace sddm with plasma-login 2026-06-15 22:05:43 +02:00
4 changed files with 38 additions and 31 deletions

View File

@ -8,7 +8,14 @@ let
} }
); );
flake = flake-compatish ./.; flake = flake-compatish {
source = ./.;
overrides = {
self = ./.;
materus-inputs = ./nix-config/subflake;
materus-inputs-unstable = ./nix-config/subflake;
};
};
in in
flake.impure flake.impure

54
flake.lock generated
View File

@ -91,11 +91,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1781374202, "lastModified": 1781534792,
"narHash": "sha256-rR5QHASdw1DcBDmg2BWaI241Wvt5aY8mPZgXBAyUp9E=", "narHash": "sha256-ZH9sr0MtoqonoEDWUQhO7kSbDDn+NIoglhAXpPVb3pg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "d6f892bd9570237c69a3e1c42b465594d54d477a", "rev": "4e006e9741eff4cb4b02545c904a4ff3e9897b1e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -114,11 +114,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1781374202, "lastModified": 1781534792,
"narHash": "sha256-rR5QHASdw1DcBDmg2BWaI241Wvt5aY8mPZgXBAyUp9E=", "narHash": "sha256-ZH9sr0MtoqonoEDWUQhO7kSbDDn+NIoglhAXpPVb3pg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "d6f892bd9570237c69a3e1c42b465594d54d477a", "rev": "4e006e9741eff4cb4b02545c904a4ff3e9897b1e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -370,11 +370,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1781365335, "lastModified": 1781533608,
"narHash": "sha256-zqDBhXMzfbdlO7F2bGHe7MOtB3xngd/+4ieMHDC+ZXo=", "narHash": "sha256-Mgsu/x5cs8EqlhIQ7bMBo14LpkAYtgzDbG/S/eattJA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5b6f5733726a1b2ccafb5dec6ac4ca7299fad66c", "rev": "8aec76cc1e045f37b55d82ca3cee4910ae04d3db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -448,11 +448,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1781324273, "lastModified": 1781499522,
"narHash": "sha256-8o3W8DlntG3V49csNA/po1r0OAuyAuGtAclzl9rKOeM=", "narHash": "sha256-41T+jXsG5FusLGed0GwviF42t4wFuriXL/m9BR4FrqA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "75312cf67b194550cac918d13bdaafc5b56b6795", "rev": "37d164940d9db2188b3d12ab1cd5206494ea4ac1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -470,11 +470,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1781324273, "lastModified": 1781499522,
"narHash": "sha256-8o3W8DlntG3V49csNA/po1r0OAuyAuGtAclzl9rKOeM=", "narHash": "sha256-41T+jXsG5FusLGed0GwviF42t4wFuriXL/m9BR4FrqA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "75312cf67b194550cac918d13bdaafc5b56b6795", "rev": "37d164940d9db2188b3d12ab1cd5206494ea4ac1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -497,11 +497,11 @@
"nur": "nur" "nur": "nur"
}, },
"locked": { "locked": {
"lastModified": 1781209591, "lastModified": 1781461917,
"narHash": "sha256-47j+gBV1UWTT52tF6EwX5IJ+xI4efrX57UZ1hUfFksw=", "narHash": "sha256-OvdeYLUcCfLqsGrZbU30JhAhYBbxDrWquehflQhWwPc=",
"owner": "materusPL", "owner": "materusPL",
"repo": "Nixerus", "repo": "Nixerus",
"rev": "57c8b3dc63c0d13b1122e3d12370722c41116497", "rev": "be078046d0aea8a5d3f5b7f30fe9850425b24be8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -524,11 +524,11 @@
"nur": "nur_3" "nur": "nur_3"
}, },
"locked": { "locked": {
"lastModified": 1781209591, "lastModified": 1781461917,
"narHash": "sha256-47j+gBV1UWTT52tF6EwX5IJ+xI4efrX57UZ1hUfFksw=", "narHash": "sha256-OvdeYLUcCfLqsGrZbU30JhAhYBbxDrWquehflQhWwPc=",
"owner": "materusPL", "owner": "materusPL",
"repo": "Nixerus", "repo": "Nixerus",
"rev": "57c8b3dc63c0d13b1122e3d12370722c41116497", "rev": "be078046d0aea8a5d3f5b7f30fe9850425b24be8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -594,11 +594,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1780902259, "lastModified": 1781216227,
"narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=", "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca", "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -610,11 +610,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1780902259, "lastModified": 1781216227,
"narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=", "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca", "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -143,7 +143,8 @@ in
if ! [ -z "$DISPLAY" ]; then ${pkgs.xhost}/bin/xhost +si:localuser:root &> /dev/null; fi; if ! [ -z "$DISPLAY" ]; then ${pkgs.xhost}/bin/xhost +si:localuser:root &> /dev/null; fi;
if ! [ -z "$DISPLAY" ]; then ${pkgs.xhost}/bin/xhost +si:localuser:$USER &> /dev/null; fi; if ! [ -z "$DISPLAY" ]; then ${pkgs.xhost}/bin/xhost +si:localuser:$USER &> /dev/null; fi;
''; '';
i18n.inputMethod.enabled = "fcitx5"; i18n.inputMethod.enable = true;
i18n.inputMethod.type = "fcitx5";
i18n.inputMethod.fcitx5.addons = [ i18n.inputMethod.fcitx5.addons = [
pkgs.kdePackages.fcitx5-configtool pkgs.kdePackages.fcitx5-configtool
pkgs.fcitx5-lua pkgs.fcitx5-lua

View File

@ -6,8 +6,7 @@
services.displayManager = { services.displayManager = {
autoLogin.enable = true; autoLogin.enable = true;
autoLogin.user = "materus"; autoLogin.user = "materus";
sddm.enable = true; plasma-login-manager.enable = true;
sddm.wayland.enable = true;
}; };
services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enable = true;