Fixed many issues with Tablet
- Fixes issues with desktop shell - Replaced sddm with gdm (because it has virtual keyboard) - Packaged wlr-autorotate
This commit is contained in:
parent
6220db7aca
commit
5ead82d1ee
9 changed files with 72 additions and 12 deletions
6
flake.lock
generated
6
flake.lock
generated
|
|
@ -322,11 +322,11 @@
|
||||||
"quickshell": "quickshell"
|
"quickshell": "quickshell"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756878410,
|
"lastModified": 1756996482,
|
||||||
"narHash": "sha256-MAgB/odrb8pdPjXxRUJWNKIYilz2Zf6PmN2XbnfMP6Y=",
|
"narHash": "sha256-X1OdxtIInLLqLpWmAzFcaxVCnZe7pOkWK+g205YJrBI=",
|
||||||
"owner": "KyleKrein",
|
"owner": "KyleKrein",
|
||||||
"repo": "DesktopShell",
|
"repo": "DesktopShell",
|
||||||
"rev": "62a483c288a5875c92174d013b14e63cb67e3a4a",
|
"rev": "e64124cce334f29744f33f77881cf6f27978f6bc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -22,15 +22,24 @@ in
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
cliphist
|
cliphist
|
||||||
ddcutil
|
ddcutil
|
||||||
libsForQt5.qt5ct
|
|
||||||
kdePackages.qt6ct
|
|
||||||
matugen
|
matugen
|
||||||
dgop
|
dgop
|
||||||
glib
|
glib
|
||||||
khal # calendar
|
khal # calendar
|
||||||
gammastep # night mode
|
gammastep # night mode
|
||||||
kdePackages.qtvirtualkeyboard
|
colloid-gtk-theme
|
||||||
];
|
];
|
||||||
|
programs.niri.settings.environment = {
|
||||||
|
GTK_THEME = "Colloid";
|
||||||
|
};
|
||||||
|
qt.enable = true;
|
||||||
|
qt.style.name = "gtk3";
|
||||||
|
programs.kitty = {
|
||||||
|
themeFile = lib.mkForce null;
|
||||||
|
extraConfig = ''
|
||||||
|
include ${home}/.config/kitty/dank-theme.conf
|
||||||
|
'';
|
||||||
|
};
|
||||||
xdg.configFile."quickshell".source = "${
|
xdg.configFile."quickshell".source = "${
|
||||||
inputs.desktopShell.packages.${pkgs.system}.dankMaterialShell
|
inputs.desktopShell.packages.${pkgs.system}.dankMaterialShell
|
||||||
}/etc/xdg/quickshell";
|
}/etc/xdg/quickshell";
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,7 @@
|
||||||
"showWorkspaceIndex": false,
|
"showWorkspaceIndex": false,
|
||||||
"showWorkspacePadding": false,
|
"showWorkspacePadding": false,
|
||||||
"showWorkspaceApps": true,
|
"showWorkspaceApps": true,
|
||||||
|
"maxWorkspaceIcons": 30,
|
||||||
"workspaceNameIcons": {},
|
"workspaceNameIcons": {},
|
||||||
"clockCompactMode": false,
|
"clockCompactMode": false,
|
||||||
"focusedWindowCompactMode": false,
|
"focusedWindowCompactMode": false,
|
||||||
|
|
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 7.1 MiB |
|
|
@ -72,7 +72,7 @@ in {
|
||||||
variant = "";
|
variant = "";
|
||||||
options = "grp:caps_toggle";
|
options = "grp:caps_toggle";
|
||||||
};
|
};
|
||||||
console.keyMap = "eu";
|
console.keyMap = "us";
|
||||||
nix = {
|
nix = {
|
||||||
settings = {
|
settings = {
|
||||||
experimental-features = [
|
experimental-features = [
|
||||||
|
|
|
||||||
|
|
@ -21,10 +21,9 @@ in {
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
${namespace} = {
|
${namespace} = {
|
||||||
loginManagers.sddm.enable = mkDefault true;
|
|
||||||
programs.dolphin.enable = mkDefault true;
|
programs.dolphin.enable = mkDefault true;
|
||||||
};
|
};
|
||||||
security.pam.services.hyprlock = {};
|
security.pam.services.quickshell = {};
|
||||||
programs.niri = {
|
programs.niri = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.niri-unstable;
|
package = pkgs.niri-unstable;
|
||||||
|
|
@ -36,7 +35,9 @@ in {
|
||||||
libsecret
|
libsecret
|
||||||
gamescope
|
gamescope
|
||||||
xwayland-satellite-unstable
|
xwayland-satellite-unstable
|
||||||
swaybg
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
#greeter
|
||||||
|
services.xserver.displayManager.gdm.enable = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
51
packages/wlr-autorotate/default.nix
Normal file
51
packages/wlr-autorotate/default.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
stdenv,
|
||||||
|
fetchFromGitHub,
|
||||||
|
gnumake,
|
||||||
|
pkg-config,
|
||||||
|
wayland-scanner,
|
||||||
|
glib,
|
||||||
|
wayland,
|
||||||
|
cmake,
|
||||||
|
}:
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "wlr-autorotate";
|
||||||
|
version = "unstable-2023-09-18";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "Lassebq";
|
||||||
|
repo = "wlr-autorotate";
|
||||||
|
rev = "fae02f4e0a9aaf11142d550ce6e7159065ef369c";
|
||||||
|
hash = "sha256-wYTtP0Qj4qOinJZ6/kfh/5HHcayF+UwWRPB5kP3SIyU=";
|
||||||
|
};
|
||||||
|
dontUseCmakeConfigure = true;
|
||||||
|
buildPhase = ''
|
||||||
|
make all
|
||||||
|
'';
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/bin
|
||||||
|
cp build/wlr-autorotate $out/bin
|
||||||
|
'';
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
gnumake
|
||||||
|
cmake
|
||||||
|
pkg-config
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
glib.dev
|
||||||
|
wayland-scanner
|
||||||
|
wayland
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Automatically changes screen orientation in wlroots based compositors based on the state of accelerometer";
|
||||||
|
homepage = "https://github.com/Lassebq/wlr-autorotate";
|
||||||
|
license = lib.licenses.mit;
|
||||||
|
maintainers = with lib.maintainers; [];
|
||||||
|
mainProgram = "wlr-autorotate";
|
||||||
|
platforms = lib.platforms.all;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -47,7 +47,6 @@ in
|
||||||
custom.presets.workstation = enabled;
|
custom.presets.workstation = enabled;
|
||||||
custom.presets.gaming = enabled;
|
custom.presets.gaming = enabled;
|
||||||
custom.windowManagers.niri = enabled;
|
custom.windowManagers.niri = enabled;
|
||||||
custom.loginManagers.sddm = enabled;
|
|
||||||
custom.services.ai = {
|
custom.services.ai = {
|
||||||
enable = true;
|
enable = true;
|
||||||
models = ["qwq" "llama3.1" "qwen2.5-coder:7b" "gpt-oss:20b"];
|
models = ["qwq" "llama3.1" "qwen2.5-coder:7b" "gpt-oss:20b"];
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,6 @@ in
|
||||||
swapSize = 32;
|
swapSize = 32;
|
||||||
};
|
};
|
||||||
custom.windowManagers.niri = enabled;
|
custom.windowManagers.niri = enabled;
|
||||||
custom.loginManagers.sddm = enabled;
|
|
||||||
custom.services.ai = {
|
custom.services.ai = {
|
||||||
enable = true;
|
enable = true;
|
||||||
models = ["qwq" "llama3.1" "qwen2.5-coder:7b" "gpt-oss:20b" "gpt-oss:120b"];
|
models = ["qwq" "llama3.1" "qwen2.5-coder:7b" "gpt-oss:20b" "gpt-oss:120b"];
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue