From dea5300fb699e8cf22af343119f4905f31b82022 Mon Sep 17 00:00:00 2001 From: "Alexander \"PapaTutuWawa" Date: Thu, 24 Feb 2022 11:06:07 +0100 Subject: [PATCH] surface: Add tablet-mode --- flake.lock | 185 +++++++++++++++++++++--------- flake.nix | 3 +- hosts/miku.nix | 3 +- lib/mkSystem.nix | 1 + modules/hardware/surface-pro6.nix | 3 + 5 files changed, 138 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index 8457ed0..ca0506e 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "emacs": { "locked": { - "lastModified": 1645179483, - "narHash": "sha256-Q11wkzvQvtUNgMpPxE0fofp5XT9K2wglhOi4nNG6nyg=", + "lastModified": 1645674787, + "narHash": "sha256-AhmEvep9SKfuMAobV2wELXoff7DQY7EjyDa8y3gtCgk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6a753da27cd3d5c0be49be6faaf2ed1feabdb240", + "rev": "47052c17338916be9177893dd3c3b64f1a7a4bcb", "type": "github" }, "original": { @@ -63,16 +63,46 @@ "type": "github" } }, + "flake-utils_3": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1645140957, - "narHash": "sha256-WTJzLSCDLBI537o2L/3kRyqEV5YRT7+1QSGryeKReHE=", + "lastModified": 1645628011, + "narHash": "sha256-iNZCTjJ63TN5oM6rx2f4H0zaCbXM/iup7UWtQuCuyTM=", "owner": "nix-community", "repo": "home-manager", - "rev": "4f4165a8b9108818ab0193bbd1a252106870b2a2", + "rev": "0b1745b4ef4c35ec5d554b176539730fcb5ec141", "type": "github" }, "original": { @@ -84,7 +114,10 @@ }, "home-manager_2": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": [ + "ostylk", + "nixpkgs" + ] }, "locked": { "lastModified": 1643933536, @@ -118,7 +151,7 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1639947939, @@ -136,11 +169,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1644870092, - "narHash": "sha256-RLPD92lqXW98LDIbbwYqwAbt3R4iD1V1PiylfgBq5cU=", + "lastModified": 1645346782, + "narHash": "sha256-3qd0cu+2kapIP7cdHW9n8zh1wCvRGg83K7/cCj5Xv+A=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "10eab1c4cd8e715c0b41d32c28af2b89fc67bed0", + "rev": "1ccfe243aa6e94bf80f2a66f6be41d086d37fc87", "type": "github" }, "original": { @@ -168,10 +201,8 @@ }, "nixpkgs": { "locked": { - "lastModified": 1642104392, - "narHash": "sha256-m71b7MgMh9FDv4MnI5sg9MiBVW6DhE1zq+d/KlLWSC8=", - "path": "/nix/store/bfllm0im5z34n4v84zvip0kwy6vwl2yz-source", - "rev": "5aaed40d22f0d9376330b6fa413223435ad6fee5", + "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", + "path": "/nix/store/96y8li2047jfsg5b6zasdaz9gvdw5ywg-source", "type": "path" }, "original": { @@ -197,11 +228,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1644525281, - "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", + "lastModified": 1645433236, + "narHash": "sha256-4va4MvJ076XyPp5h8sm5eMQvCrJ6yZAbBmyw95dGyw4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", + "rev": "7f9b6e2babf232412682c09e57ed666d8f84ac2d", "type": "github" }, "original": { @@ -225,19 +256,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1642104392, - "narHash": "sha256-m71b7MgMh9FDv4MnI5sg9MiBVW6DhE1zq+d/KlLWSC8=", - "path": "/nix/store/bfllm0im5z34n4v84zvip0kwy6vwl2yz-source", - "rev": "5aaed40d22f0d9376330b6fa413223435ad6fee5", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1644750380, "narHash": "sha256-c4LvV88zB9YvM/6rLElbq4e62XtEO9pBINqsrlmH++M=", @@ -253,12 +271,12 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { - "lastModified": 1642104392, - "narHash": "sha256-m71b7MgMh9FDv4MnI5sg9MiBVW6DhE1zq+d/KlLWSC8=", - "path": "/nix/store/bfllm0im5z34n4v84zvip0kwy6vwl2yz-source", - "rev": "5aaed40d22f0d9376330b6fa413223435ad6fee5", + "lastModified": 1640233012, + "narHash": "sha256-DNKMmWZ/RLoh5IVJLAa5HYOy4IW28mBBYDMgMxzzom8=", + "path": "/nix/store/gf00nqfl948lq9b8sw2xz3fpirwq5amw-source", + "rev": "611f29bedadfb2aa4c9c26c4af65f05dd35f2f3f", "type": "path" }, "original": { @@ -266,29 +284,45 @@ "type": "indirect" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { - "lastModified": 1642244250, - "narHash": "sha256-vWpUEqQdVP4srj+/YLJRTN9vjpTs4je0cdWKXPbDItc=", - "owner": "nixos", + "lastModified": 1645373091, + "narHash": "sha256-eRbiakFKdxtjrqOtErp4BgOJlLN5VEBymldfxy+ZKzI=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "0fd9ee1aa36ce865ad273f4f07fdc093adeb5c00", + "rev": "d0ae0897999e7ba4615e02ca1770df6065099daf", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-21.05", + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1645373091, + "narHash": "sha256-eRbiakFKdxtjrqOtErp4BgOJlLN5VEBymldfxy+ZKzI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d0ae0897999e7ba4615e02ca1770df6065099daf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1645182018, - "narHash": "sha256-esXJXkK70fvlztdhqE+tYJtQliwOfvZvvT/ZiwRGW6A=", + "lastModified": 1645675667, + "narHash": "sha256-ZCRO9zrswTlH8Oa+4VnaDYSb4XfRJt7mGizZ51QvDLM=", "owner": "nix-community", "repo": "nur", - "rev": "9bfbaf7fcf989f4fe5ac3818f4e3d740d4d90143", + "rev": "56d2eccbdd80d84139e35f48f9b272e7c704f8cc", "type": "github" }, "original": { @@ -304,16 +338,17 @@ "home-manager": "home-manager_2", "impermanence": "impermanence", "nixos-hardware": "nixos-hardware_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable", - "rnix-lsp": "rnix-lsp" + "rnix-lsp": "rnix-lsp", + "tablet-mode": "tablet-mode" }, "locked": { - "lastModified": 1645134535, - "narHash": "sha256-uevN8fmSoV1pCs4dNaPg78LfsGd5iQAVnEehp0R442o=", + "lastModified": 1645661585, + "narHash": "sha256-wuEbw7nlOn0scaju/5KIHoEJKHxLQhEvR/J1Ozilavw=", "ref": "master", - "rev": "114a8d500801e1947e6572a41f6490f3864adcfb", - "revCount": 160, + "rev": "6de27f9c39e7aa1afd7e36489316f85fce5e8e79", + "revCount": 166, "type": "git", "url": "https://dev.ostylk.de/NixDistro/Config" }, @@ -325,7 +360,10 @@ "rnix-lsp": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_7", + "nixpkgs": [ + "ostylk", + "nixpkgs" + ], "utils": "utils" }, "locked": { @@ -352,7 +390,8 @@ "nixpkgs": "nixpkgs_2", "nur": "nur", "ostylk": "ostylk", - "stable": "stable" + "stable": "stable", + "tablet-mode": "tablet-mode_2" } }, "stable": { @@ -371,6 +410,44 @@ "type": "github" } }, + "tablet-mode": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1645650704, + "narHash": "sha256-bAY4EDC2nLE10vz5nPTtky9Ri7RCu9N2yfCrPcjIQFs=", + "ref": "master", + "rev": "5046236ea223d00ea0e2c0d8d2b856d3f0d01454", + "revCount": 12, + "type": "git", + "url": "https://dev.ostylk.de/NixDistro/tablet-mode.git" + }, + "original": { + "type": "git", + "url": "https://dev.ostylk.de/NixDistro/tablet-mode.git" + } + }, + "tablet-mode_2": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1645657720, + "narHash": "sha256-qzUhfvNASfW9McIeV1UkKhkN39mDVmtDBHSLLoxTGJY=", + "ref": "master", + "rev": "9c4cfa67d08acd5bcacffa95e122da136d2b78e1", + "revCount": 13, + "type": "git", + "url": "https://dev.ostylk.de/NixDistro/tablet-mode.git" + }, + "original": { + "type": "git", + "url": "https://dev.ostylk.de/NixDistro/tablet-mode.git" + } + }, "utils": { "locked": { "lastModified": 1629481132, diff --git a/flake.nix b/flake.nix index 4f3b951..36cf541 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,7 @@ nur.url = "github:nix-community/nur"; ostylk.url = "git+https://dev.ostylk.de/NixDistro/Config"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + tablet-mode.url = "git+https://dev.ostylk.de/NixDistro/tablet-mode.git"; }; outputs = { @@ -25,7 +26,7 @@ }) eachDefaultLinuxSystem; mkSystem = import ./lib/mkSystem.nix { inherit inputs; - inherit (inputs) nur emacs; + inherit (inputs) nur emacs tablet-mode; inherit (nixpkgs) lib config; }; in { diff --git a/hosts/miku.nix b/hosts/miku.nix index 36a25d5..4f9af79 100644 --- a/hosts/miku.nix +++ b/hosts/miku.nix @@ -63,7 +63,7 @@ #xournalpp.enable = true; zsh.enable = true; #office.enable = true; - #plasma.enable = true; + plasma.enable = true; gaming.enable = true; }; services = { @@ -151,7 +151,6 @@ wayland = true; enable = true; }; - desktopManager.plasma5.enable = true; }; earlyoom.enable = lib.mkForce false; }; diff --git a/lib/mkSystem.nix b/lib/mkSystem.nix index e959caa..b412adc 100644 --- a/lib/mkSystem.nix +++ b/lib/mkSystem.nix @@ -52,6 +52,7 @@ in inputs.nixpkgs.lib.nixosSystem { # My module system (import ../modules) inputs.ostylk.nixosModules.nftables + inputs.tablet-mode.nixosModules # Actual config (import ./baseSystem.nix) diff --git a/modules/hardware/surface-pro6.nix b/modules/hardware/surface-pro6.nix index caa5e03..be9232d 100644 --- a/modules/hardware/surface-pro6.nix +++ b/modules/hardware/surface-pro6.nix @@ -47,6 +47,9 @@ in { sha256 = "1xj70n9agy41906jgm4yjmsx58i7pzsizpvv3rkzq78k95qjfmc9"; }; }; + + # from dev.ostylk.de/NixDistro/tablet-mode.git + tablet-mode.enable = true; }; boot = {