From a7ad63946569117bed5f92744e04f26437bbd5fc Mon Sep 17 00:00:00 2001 From: materus Date: Sat, 2 Mar 2024 19:43:32 +0100 Subject: [PATCH] flake: update lock; materusPC: remove useless caps config, change sddm to x11 --- .../host/materusPC/hardware/boot.nix | 2 +- configurations/host/materusPC/kde.nix | 4 +- configurations/host/materusPC/tmp.nix | 16 +- flake.lock | 138 +++++++++--------- 4 files changed, 73 insertions(+), 87 deletions(-) diff --git a/configurations/host/materusPC/hardware/boot.nix b/configurations/host/materusPC/hardware/boot.nix index 5c43ee9..df5e1fb 100644 --- a/configurations/host/materusPC/hardware/boot.nix +++ b/configurations/host/materusPC/hardware/boot.nix @@ -17,7 +17,7 @@ in { #Kernel boot.kernelPackages = pkgs.linuxPackages_zen; - boot.kernelParams = [ "rcu_nocbs=8-15,24-31" "nohz_full=8-15,24-31" "pcie_acs_override=downstream,multifunction" /*"pci-stub.ids=1002:744c"*/ "nox2apic" "nvme_core.default_ps_max_latency_us=0" "nvme_core.io_timeout=255" "nvme_core.max_retries=10" "nvme_core.shutdown_timeout=10" "amd_iommu=on" "iommu=pt" ] ++ video; + boot.kernelParams = [ "rcu_nocbs=8-15,24-31" "nohz_full=8-15,24-31" "vfio_iommu_type1.allow_unsafe_interrupts=1" "pcie_acs_override=downstream,multifunction" /*"pci-stub.ids=1002:744c"*/ "nox2apic" "nvme_core.default_ps_max_latency_us=0" "nvme_core.io_timeout=255" "nvme_core.max_retries=10" "nvme_core.shutdown_timeout=10" "amd_iommu=on" "iommu=pt" ] ++ video; boot.kernelModules = [ "pci-stub" "amdgpu" "i2c_dev" "kvm_amd" "vfio" "vfio_iommu_type1" "vfio-pci" "v4l2loopback" ]; boot.extraModprobeConfig = '' options kvm_amd nested=1 avic=1 npt=1 sev=0 diff --git a/configurations/host/materusPC/kde.nix b/configurations/host/materusPC/kde.nix index c6b49b8..f4a0673 100644 --- a/configurations/host/materusPC/kde.nix +++ b/configurations/host/materusPC/kde.nix @@ -28,7 +28,7 @@ in services.xserver.displayManager.sddm.enable = true; services.xserver.displayManager.sddm.settings = { General = { - DisplayServer = "wayland"; + #DisplayServer = "wayland"; InputMethod=""; }; Theme = { @@ -36,7 +36,7 @@ in CursorSize = "24"; }; Wayland = { - CompositorCommand = "${pkgs.weston}/bin/weston -c ${westonSddm}"; + #CompositorCommand = "${pkgs.weston}/bin/weston -c ${westonSddm}"; }; }; diff --git a/configurations/host/materusPC/tmp.nix b/configurations/host/materusPC/tmp.nix index a9301ee..4d4342a 100644 --- a/configurations/host/materusPC/tmp.nix +++ b/configurations/host/materusPC/tmp.nix @@ -32,21 +32,7 @@ # keyMap = "pl"; useXkbConfig = true; # use xkbOptions in tty. }; - services.xserver.extraLayouts.hyper-pl = { - description = "PL, hyper mod3"; - languages = [ "pol" ]; - symbolsFile = pkgs.writeText "hyper-pl" '' - xkb_symbols "hyper-pl" - { - include "pl(basic)" - name[Group1]="Polish HYPR"; - - modifier_map Mod3 { }; - };''; - }; - services.xserver.layout = "hyper-pl"; - services.xserver.xkbOptions = "caps:hyper"; services.xserver.enable = true; services.xserver.videoDrivers = [ "amdgpu" ]; services.dbus.enable = true; @@ -135,7 +121,7 @@ QT_IM_MODULE="fcitx"; XMODIFIERS="@im=fcitx"; SDL_IM_MODULE="fcitx"; - SDL_AUDIODRIVER = "pipewire"; + #SDL_AUDIODRIVER = "pipewire"; #SSH_ASKPASS_REQUIRE = "prefer"; diff --git a/flake.lock b/flake.lock index b13f8ef..11209c9 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1705180696, - "narHash": "sha256-6TwTHERD+2SX21zvBwmm58mtmgVXHLPu273i04JdH9Y=", + "lastModified": 1709025227, + "narHash": "sha256-KXcORItjYJTdEO/BlBd0Uym1Xa3eBu43uvpFiWjJOdY=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "b390e87cd404e65ab4d786666351f1292e89162a", + "rev": "4e9b16c8b44958bc6bf46d99c3bb1b59c9c9c764", "type": "github" }, "original": { @@ -24,11 +24,11 @@ "fromYaml": "fromYaml_2" }, "locked": { - "lastModified": 1705180696, - "narHash": "sha256-6TwTHERD+2SX21zvBwmm58mtmgVXHLPu273i04JdH9Y=", + "lastModified": 1709025227, + "narHash": "sha256-KXcORItjYJTdEO/BlBd0Uym1Xa3eBu43uvpFiWjJOdY=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "b390e87cd404e65ab4d786666351f1292e89162a", + "rev": "4e9b16c8b44958bc6bf46d99c3bb1b59c9c9c764", "type": "github" }, "original": { @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1705332421, - "narHash": "sha256-USpGLPme1IuqG78JNqSaRabilwkCyHmVWY0M9vYyqEA=", + "lastModified": 1708939976, + "narHash": "sha256-O5+nFozxz2Vubpdl1YZtPrilcIXPcRAjqNdNE8oCRoA=", "owner": "numtide", "repo": "devshell", - "rev": "83cb93d6d063ad290beee669f4badf9914cc16ec", + "rev": "5ddecd67edbd568ebe0a55905273e56cc82aabe3", "type": "github" }, "original": { @@ -140,11 +140,11 @@ ] }, "locked": { - "lastModified": 1705332421, - "narHash": "sha256-USpGLPme1IuqG78JNqSaRabilwkCyHmVWY0M9vYyqEA=", + "lastModified": 1708939976, + "narHash": "sha256-O5+nFozxz2Vubpdl1YZtPrilcIXPcRAjqNdNE8oCRoA=", "owner": "numtide", "repo": "devshell", - "rev": "83cb93d6d063ad290beee669f4badf9914cc16ec", + "rev": "5ddecd67edbd568ebe0a55905273e56cc82aabe3", "type": "github" }, "original": { @@ -167,11 +167,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1708879861, - "narHash": "sha256-Uw6YY4HHkjoDb+1PihpCYgTuKSTimo9vgXLdhOg+sEY=", + "lastModified": 1709283110, + "narHash": "sha256-V3/gFVUB6HwgPTDhcpwe3g4rVOYIe10wdLbztTGeyCU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8bd96b59c634cb8fd2cf7528a81be84d0779b0df", + "rev": "d7155aaadc98b2c13874f78cc5e00f2dfefd7a6e", "type": "github" }, "original": { @@ -194,11 +194,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1708879861, - "narHash": "sha256-Uw6YY4HHkjoDb+1PihpCYgTuKSTimo9vgXLdhOg+sEY=", + "lastModified": 1709283110, + "narHash": "sha256-V3/gFVUB6HwgPTDhcpwe3g4rVOYIe10wdLbztTGeyCU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8bd96b59c634cb8fd2cf7528a81be84d0779b0df", + "rev": "d7155aaadc98b2c13874f78cc5e00f2dfefd7a6e", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -232,11 +232,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -359,11 +359,11 @@ ] }, "locked": { - "lastModified": 1708806879, - "narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=", + "lastModified": 1709204054, + "narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=", "owner": "nix-community", "repo": "home-manager", - "rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a", + "rev": "2f3367769a93b226c467551315e9e270c3f78b15", "type": "github" }, "original": { @@ -378,11 +378,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1708591310, - "narHash": "sha256-8mQGVs8JccWTnORgoLOTh9zvf6Np+x2JzhIc+LDcJ9s=", + "lastModified": 1709204054, + "narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=", "owner": "nix-community", "repo": "home-manager", - "rev": "0e0e9669547e45ea6cca2de4044c1a384fd0fe55", + "rev": "2f3367769a93b226c467551315e9e270c3f78b15", "type": "github" }, "original": { @@ -403,11 +403,11 @@ "nur": "nur" }, "locked": { - "lastModified": 1708804686, - "narHash": "sha256-WPn7vJ0fp3oQab0YoMfrkkV2gXAzq81hkBZaVFK4YtM=", + "lastModified": 1708883627, + "narHash": "sha256-WJUPTX+5yr8iwMY3N6haEH/IFBwlLIL/x7vy4cxMpRQ=", "owner": "materusPL", "repo": "Nixerus", - "rev": "d6f0de8b5207b15921c9423db8b45029e20140cc", + "rev": "b810eb9727baa3905afe6cc7f876a7d9b8016e74", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "nur": "nur_3" }, "locked": { - "lastModified": 1708804686, - "narHash": "sha256-WPn7vJ0fp3oQab0YoMfrkkV2gXAzq81hkBZaVFK4YtM=", + "lastModified": 1708883627, + "narHash": "sha256-WJUPTX+5yr8iwMY3N6haEH/IFBwlLIL/x7vy4cxMpRQ=", "owner": "materusPL", "repo": "Nixerus", - "rev": "d6f0de8b5207b15921c9423db8b45029e20140cc", + "rev": "b810eb9727baa3905afe6cc7f876a7d9b8016e74", "type": "github" }, "original": { @@ -446,11 +446,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1708594753, - "narHash": "sha256-c/gH7iXS/IYH9NrFOT+aJqTq+iEBkvAkpWuUHGU3+f0=", + "lastModified": 1709147990, + "narHash": "sha256-vpXMWoaCtMYJ7lisJedCRhQG9BSsInEyZnnG5GfY9tQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3f7d0bca003eac1a1a7f4659bbab9c8f8c2a0958", + "rev": "33a97b5814d36ddd65ad678ad07ce43b1a67f159", "type": "github" }, "original": { @@ -462,11 +462,11 @@ }, "nixos-hardware_2": { "locked": { - "lastModified": 1708594753, - "narHash": "sha256-c/gH7iXS/IYH9NrFOT+aJqTq+iEBkvAkpWuUHGU3+f0=", + "lastModified": 1709147990, + "narHash": "sha256-vpXMWoaCtMYJ7lisJedCRhQG9BSsInEyZnnG5GfY9tQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3f7d0bca003eac1a1a7f4659bbab9c8f8c2a0958", + "rev": "33a97b5814d36ddd65ad678ad07ce43b1a67f159", "type": "github" }, "original": { @@ -494,11 +494,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1708702655, - "narHash": "sha256-qxT5jSLhelfLhQ07+AUxSTm1VnVH+hQxDkQSZ/m/Smo=", + "lastModified": 1709218635, + "narHash": "sha256-nytX/MkfqeTD4z7bMq4QRXcHxO9B3vRo9tM6fMtPFA8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5101e457206dd437330d283d6626944e28794b3", + "rev": "068d4db604958d05d0b46c47f79b507d84dbc069", "type": "github" }, "original": { @@ -526,11 +526,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1708702655, - "narHash": "sha256-qxT5jSLhelfLhQ07+AUxSTm1VnVH+hQxDkQSZ/m/Smo=", + "lastModified": 1709218635, + "narHash": "sha256-nytX/MkfqeTD4z7bMq4QRXcHxO9B3vRo9tM6fMtPFA8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5101e457206dd437330d283d6626944e28794b3", + "rev": "068d4db604958d05d0b46c47f79b507d84dbc069", "type": "github" }, "original": { @@ -558,11 +558,11 @@ }, "nixpkgs-stable_5": { "locked": { - "lastModified": 1708440434, - "narHash": "sha256-XY+B9mbhL/i+Q6fP6gBQ6P76rv9rWtpjQiUJ+DGtaUg=", + "lastModified": 1709218635, + "narHash": "sha256-nytX/MkfqeTD4z7bMq4QRXcHxO9B3vRo9tM6fMtPFA8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "526d051b128b82ae045a70e5ff1adf8e6dafa560", + "rev": "068d4db604958d05d0b46c47f79b507d84dbc069", "type": "github" }, "original": { @@ -574,11 +574,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "type": "github" }, "original": { @@ -604,11 +604,11 @@ }, "nur_2": { "locked": { - "lastModified": 1708864816, - "narHash": "sha256-SM1zlHhoZf20lhp0v7ss52MYEWux/j+jfqfxUp8yqW8=", + "lastModified": 1709303553, + "narHash": "sha256-MeKsAxL+qcCit4GXclrM1rwaZdgxp9Qv70zIj3/jpSg=", "owner": "nix-community", "repo": "NUR", - "rev": "1fe352ab8a7560c8bbd793852c52979894a7705e", + "rev": "c14e838f7baab6f5ddce63082f79d129446bd20a", "type": "github" }, "original": { @@ -634,11 +634,11 @@ }, "nur_4": { "locked": { - "lastModified": 1708864816, - "narHash": "sha256-SM1zlHhoZf20lhp0v7ss52MYEWux/j+jfqfxUp8yqW8=", + "lastModified": 1709303553, + "narHash": "sha256-MeKsAxL+qcCit4GXclrM1rwaZdgxp9Qv70zIj3/jpSg=", "owner": "nix-community", "repo": "NUR", - "rev": "1fe352ab8a7560c8bbd793852c52979894a7705e", + "rev": "c14e838f7baab6f5ddce63082f79d129446bd20a", "type": "github" }, "original": { @@ -650,11 +650,11 @@ }, "nur_5": { "locked": { - "lastModified": 1708640132, - "narHash": "sha256-w1h/s7LwjqYLUyspIuKankX6qHHeNWVhm3Oe+cvPIS8=", + "lastModified": 1709303553, + "narHash": "sha256-MeKsAxL+qcCit4GXclrM1rwaZdgxp9Qv70zIj3/jpSg=", "owner": "nix-community", "repo": "NUR", - "rev": "e7d3179956f6054b12efb01f3a998474b48007df", + "rev": "c14e838f7baab6f5ddce63082f79d129446bd20a", "type": "github" }, "original": { @@ -699,11 +699,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1708830076, - "narHash": "sha256-Cjh2xdjxC6S6nW6Whr2dxSeh8vjodzhTmQdI4zPJ4RA=", + "lastModified": 1708987867, + "narHash": "sha256-k2lDaDWNTU5sBVHanYzjDKVDmk29RHIgdbbXu5sdzBA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2874fbbe4a65bd2484b0ad757d27a16107f6bc17", + "rev": "a1c8de14f60924fafe13aea66b46157f0150f4cf", "type": "github" }, "original": { @@ -722,11 +722,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1708830076, - "narHash": "sha256-Cjh2xdjxC6S6nW6Whr2dxSeh8vjodzhTmQdI4zPJ4RA=", + "lastModified": 1708987867, + "narHash": "sha256-k2lDaDWNTU5sBVHanYzjDKVDmk29RHIgdbbXu5sdzBA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2874fbbe4a65bd2484b0ad757d27a16107f6bc17", + "rev": "a1c8de14f60924fafe13aea66b46157f0150f4cf", "type": "github" }, "original": {