diff --git a/configurations/host/materusPC/containers/arch.nix b/configurations/host/materusPC/containers/arch.nix index 69620bc..5b0f45b 100644 --- a/configurations/host/materusPC/containers/arch.nix +++ b/configurations/host/materusPC/containers/arch.nix @@ -103,7 +103,8 @@ in "/run/udev" "/run/pipewire" - + "/run/pulse" + "/sys/class" "/sys/devices" diff --git a/configurations/host/materusPC/other/desktop/sddm.nix b/configurations/host/materusPC/other/desktop/sddm.nix index 59cb69c..2ef33c6 100644 --- a/configurations/host/materusPC/other/desktop/sddm.nix +++ b/configurations/host/materusPC/other/desktop/sddm.nix @@ -1,12 +1,19 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: let plasma-materus = pkgs.writeScript "plasma-materus" '' - export KWIN_DRM_DEVICES="/dev/dri/by-path/pci-0000\:53\:00.0-card" - ${pkgs.kdePackages.plasma-workspace}/libexec/plasma-dbus-run-session-if-needed ${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland + export KWIN_DRM_DEVICES="/dev/dri/by-path/pci-0000\:53\:00.0-card" + ${pkgs.kdePackages.plasma-workspace}/libexec/plasma-dbus-run-session-if-needed ${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland ''; - - westonSddm = let xcfg = config.services.xserver; in pkgs.writeText "weston.ini" - '' + westonSddm = + let + xcfg = config.services.xserver; + in + pkgs.writeText "weston.ini" '' [core] xwayland=false shell=fullscreen-shell.so @@ -37,7 +44,7 @@ let in { services.displayManager.defaultSession = "plasma-materus"; - + services.displayManager.sddm.enable = true; services.displayManager.sddm.wayland.enable = true; services.displayManager.sddm.wayland.compositor = lib.mkForce "weston"; @@ -47,16 +54,20 @@ in "-c ${westonSddm}" ]; services.displayManager.sessionPackages = [ - ((pkgs.writeTextDir "share/wayland-sessions/plasma-materus.desktop" '' - [Desktop Entry] - Name=Plasma (Wayland Materus) - Comment=Plasma Desktop with KWIN_DRM_DEVICES env - Exec=${plasma-materus} - DesktopNames=KDE - Type=Application - '') - .overrideAttrs (_: {passthru.providedSessions = ["plasma-materus"];})) -]; + ( + (pkgs.writeTextDir "share/wayland-sessions/plasma-materus.desktop" '' + [Desktop Entry] + Name=Plasma (Wayland Materus) + Comment=Plasma Desktop with KWIN_DRM_DEVICES env + Exec=${plasma-materus} + DesktopNames=KDE + Type=Application + '').overrideAttrs + (_: { + passthru.providedSessions = [ "plasma-materus" ]; + }) + ) + ]; services.displayManager.sddm.settings = { General = { diff --git a/configurations/profile/home/editor/code.nix b/configurations/profile/home/editor/code.nix index 3750d08..e72250d 100644 --- a/configurations/profile/home/editor/code.nix +++ b/configurations/profile/home/editor/code.nix @@ -55,6 +55,7 @@ let open-vsx.eamodio.gitlens #Other + open-vsx.asciidoctor.asciidoctor-vscode open-vsx.ms-azuretools.vscode-docker open-vsx.webfreak.debug open-vsx.mkhl.direnv diff --git a/flake.lock b/flake.lock index 64c76b7..8dd6a5b 100644 --- a/flake.lock +++ b/flake.lock @@ -159,11 +159,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1749232178, - "narHash": "sha256-pekC+SuqoHkoYPuWhC1aADCIP0cD3tvemu4WOF/JMUY=", + "lastModified": 1749806554, + "narHash": "sha256-mvvQ8dcGJTmUfudSD8i0Wd4uiQpjcKjDPX9ruEbYK2k=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f6850858f78e2b6328f6e8bb7bf9df10dd0b7973", + "rev": "d2fb39a8ecf7610891cbc64cff05588308c5166a", "type": "github" }, "original": { @@ -182,11 +182,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1749232178, - "narHash": "sha256-pekC+SuqoHkoYPuWhC1aADCIP0cD3tvemu4WOF/JMUY=", + "lastModified": 1749806554, + "narHash": "sha256-mvvQ8dcGJTmUfudSD8i0Wd4uiQpjcKjDPX9ruEbYK2k=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f6850858f78e2b6328f6e8bb7bf9df10dd0b7973", + "rev": "d2fb39a8ecf7610891cbc64cff05588308c5166a", "type": "github" }, "original": { @@ -458,11 +458,11 @@ ] }, "locked": { - "lastModified": 1749243446, - "narHash": "sha256-P1gumhZN5N9q+39ndePHYrtwOwY1cGx+VoXGl+vTm7A=", + "lastModified": 1749821119, + "narHash": "sha256-X3WAS322EsebI4ohJcXhKpiyG1v+7wE4VOiXy1pxM/c=", "owner": "nix-community", "repo": "home-manager", - "rev": "2d7d65f65b61fdfce23278e59ca266ddd0ef0a36", + "rev": "79dfd9aa295e53773aad45480b44c131da29f35b", "type": "github" }, "original": { @@ -477,11 +477,12 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", - "path": "/nix/store/dimhhb7nhymgd9f35ajdzf6xkij6rsh8-source", - "rev": "d5f1f641b289553927b3801580598d200a501863", - "type": "path" + "lastModified": 1749821119, + "narHash": "sha256-X3WAS322EsebI4ohJcXhKpiyG1v+7wE4VOiXy1pxM/c=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "79dfd9aa295e53773aad45480b44c131da29f35b", + "type": "github" }, "original": { "id": "home-manager", @@ -500,11 +501,11 @@ ] }, "locked": { - "lastModified": 1749175351, - "narHash": "sha256-TIOk5mBsbs/HBYkgnU/trAjmxAO50OTHZkSdMvvAGok=", + "lastModified": 1749780284, + "narHash": "sha256-at8sCy3IXlgo1zV0j0Wowhn/dHXqBkb2huSdJ2Jt+mo=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "832bd4f14d5a64df323b456132c33c572e7f0c75", + "rev": "6ec5e3e4a11887ae47d55ece1b83a0ed8082cddf", "type": "github" }, "original": { @@ -526,11 +527,11 @@ ] }, "locked": { - "lastModified": 1749175351, - "narHash": "sha256-TIOk5mBsbs/HBYkgnU/trAjmxAO50OTHZkSdMvvAGok=", + "lastModified": 1749780284, + "narHash": "sha256-at8sCy3IXlgo1zV0j0Wowhn/dHXqBkb2huSdJ2Jt+mo=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "832bd4f14d5a64df323b456132c33c572e7f0c75", + "rev": "6ec5e3e4a11887ae47d55ece1b83a0ed8082cddf", "type": "github" }, "original": { @@ -596,11 +597,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1749195551, - "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=", + "lastModified": 1749808356, + "narHash": "sha256-VQ2HFRVz0VxjYYFtdRTlAq/PuOT+j876YTWubk0WLJM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4602f7e1d3f197b3cb540d5accf5669121629628", + "rev": "b328aa7871068d9f98b656d8f6829b39a541a114", "type": "github" }, "original": { @@ -612,11 +613,11 @@ }, "nixos-hardware_2": { "locked": { - "lastModified": 1749195551, - "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=", + "lastModified": 1749808356, + "narHash": "sha256-VQ2HFRVz0VxjYYFtdRTlAq/PuOT+j876YTWubk0WLJM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4602f7e1d3f197b3cb540d5accf5669121629628", + "rev": "b328aa7871068d9f98b656d8f6829b39a541a114", "type": "github" }, "original": { @@ -644,11 +645,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1748995628, - "narHash": "sha256-bFufQGSAEYQgjtc4wMrobS5HWN0hDP+ZX+zthYcml9U=", + "lastModified": 1749668643, + "narHash": "sha256-gaWJEWGBW/g1u6o5IM4Un0vluv86cigLuBnjsKILffc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eb3b6a2366a7095939cd22f0dc0e9991313294b", + "rev": "1965fd20a39c8e441746bee66d550af78f0c0a7b", "type": "github" }, "original": { @@ -660,11 +661,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1748995628, - "narHash": "sha256-bFufQGSAEYQgjtc4wMrobS5HWN0hDP+ZX+zthYcml9U=", + "lastModified": 1749668643, + "narHash": "sha256-gaWJEWGBW/g1u6o5IM4Un0vluv86cigLuBnjsKILffc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eb3b6a2366a7095939cd22f0dc0e9991313294b", + "rev": "1965fd20a39c8e441746bee66d550af78f0c0a7b", "type": "github" }, "original": { @@ -676,11 +677,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1749086602, - "narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=", + "lastModified": 1749727998, + "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4792576cb003c994bd7cc1edada3129def20b27d", + "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", "type": "github" }, "original": { @@ -740,27 +741,27 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1746055187, - "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_6": { "locked": { - "lastModified": 1749143949, - "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { @@ -772,11 +773,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1741173522, - "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { @@ -871,11 +872,12 @@ "treefmt-nix": "treefmt-nix_5" }, "locked": { - "lastModified": 1741294988, - "narHash": "sha256-3408u6q615kVTb23WtDriHRmCBBpwX7iau6rvfipcu4=", - "path": "/nix/store/hfzv9pkm0c6hzvkav8ii476s4cx9nph3-source", - "rev": "b30c245e2c44c7352a27485bfd5bc483df660f0e", - "type": "path" + "lastModified": 1749820497, + "narHash": "sha256-l6gXEHXGZxsvOZylT4oWqw1syKtcKfnZMQ9wtR4PwSc=", + "owner": "nix-community", + "repo": "NUR", + "rev": "7c388148972b182ef27bddff0f36c515011b3dfe", + "type": "github" }, "original": { "id": "nur", @@ -970,11 +972,11 @@ ] }, "locked": { - "lastModified": 1747603214, - "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", + "lastModified": 1749592509, + "narHash": "sha256-VunQzfZFA+Y6x3wYi2UE4DEQ8qKoAZZCnZPUlSoqC+A=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", + "rev": "50754dfaa0e24e313c626900d44ef431f3210138", "type": "github" }, "original": { @@ -992,11 +994,11 @@ ] }, "locked": { - "lastModified": 1747603214, - "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", + "lastModified": 1749592509, + "narHash": "sha256-VunQzfZFA+Y6x3wYi2UE4DEQ8qKoAZZCnZPUlSoqC+A=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", + "rev": "50754dfaa0e24e313c626900d44ef431f3210138", "type": "github" }, "original": {