diff --git a/flake.lock b/flake.lock index 676817e..9978c16 100644 --- a/flake.lock +++ b/flake.lock @@ -322,11 +322,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1756878410, - "narHash": "sha256-MAgB/odrb8pdPjXxRUJWNKIYilz2Zf6PmN2XbnfMP6Y=", + "lastModified": 1756996482, + "narHash": "sha256-X1OdxtIInLLqLpWmAzFcaxVCnZe7pOkWK+g205YJrBI=", "owner": "KyleKrein", "repo": "DesktopShell", - "rev": "62a483c288a5875c92174d013b14e63cb67e3a4a", + "rev": "e64124cce334f29744f33f77881cf6f27978f6bc", "type": "github" }, "original": { diff --git a/homes/x86_64-linux/kylekrein/niri/desktopShell.nix b/homes/x86_64-linux/kylekrein/niri/desktopShell.nix index 9599ac9..23da81c 100644 --- a/homes/x86_64-linux/kylekrein/niri/desktopShell.nix +++ b/homes/x86_64-linux/kylekrein/niri/desktopShell.nix @@ -22,15 +22,24 @@ in wl-clipboard cliphist ddcutil - libsForQt5.qt5ct - kdePackages.qt6ct matugen dgop glib khal # calendar 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 = "${ inputs.desktopShell.packages.${pkgs.system}.dankMaterialShell }/etc/xdg/quickshell"; diff --git a/homes/x86_64-linux/kylekrein/niri/settings.json b/homes/x86_64-linux/kylekrein/niri/settings.json index 1389f6b..ec9e425 100644 --- a/homes/x86_64-linux/kylekrein/niri/settings.json +++ b/homes/x86_64-linux/kylekrein/niri/settings.json @@ -35,6 +35,7 @@ "showWorkspaceIndex": false, "showWorkspacePadding": false, "showWorkspaceApps": true, + "maxWorkspaceIcons": 30, "workspaceNameIcons": {}, "clockCompactMode": false, "focusedWindowCompactMode": false, diff --git a/homes/x86_64-linux/kylekrein/niri/wallpapers/illustrator-planet.jpg b/homes/x86_64-linux/kylekrein/niri/wallpapers/illustrator-planet.jpg new file mode 100644 index 0000000..61fa5a8 Binary files /dev/null and b/homes/x86_64-linux/kylekrein/niri/wallpapers/illustrator-planet.jpg differ diff --git a/modules/nixos/presets/default/default.nix b/modules/nixos/presets/default/default.nix index fdedc69..22ec849 100644 --- a/modules/nixos/presets/default/default.nix +++ b/modules/nixos/presets/default/default.nix @@ -72,7 +72,7 @@ in { variant = ""; options = "grp:caps_toggle"; }; - console.keyMap = "eu"; + console.keyMap = "us"; nix = { settings = { experimental-features = [ diff --git a/modules/nixos/windowManagers/niri/default.nix b/modules/nixos/windowManagers/niri/default.nix index 3542c90..59bc8d2 100644 --- a/modules/nixos/windowManagers/niri/default.nix +++ b/modules/nixos/windowManagers/niri/default.nix @@ -21,10 +21,9 @@ in { config = mkIf cfg.enable { ${namespace} = { - loginManagers.sddm.enable = mkDefault true; programs.dolphin.enable = mkDefault true; }; - security.pam.services.hyprlock = {}; + security.pam.services.quickshell = {}; programs.niri = { enable = true; package = pkgs.niri-unstable; @@ -36,7 +35,9 @@ in { libsecret gamescope xwayland-satellite-unstable - swaybg ]; + + #greeter + services.xserver.displayManager.gdm.enable = true; }; } diff --git a/packages/wlr-autorotate/default.nix b/packages/wlr-autorotate/default.nix new file mode 100644 index 0000000..f5baf5d --- /dev/null +++ b/packages/wlr-autorotate/default.nix @@ -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; + }; +} diff --git a/systems/x86_64-linux/kylekrein-framework12/default.nix b/systems/x86_64-linux/kylekrein-framework12/default.nix index 369c9be..a2bfc5e 100644 --- a/systems/x86_64-linux/kylekrein-framework12/default.nix +++ b/systems/x86_64-linux/kylekrein-framework12/default.nix @@ -47,7 +47,6 @@ in custom.presets.workstation = enabled; custom.presets.gaming = enabled; custom.windowManagers.niri = enabled; - custom.loginManagers.sddm = enabled; custom.services.ai = { enable = true; models = ["qwq" "llama3.1" "qwen2.5-coder:7b" "gpt-oss:20b"]; diff --git a/systems/x86_64-linux/kylekrein-homepc/default.nix b/systems/x86_64-linux/kylekrein-homepc/default.nix index bf5e42f..cb563ae 100644 --- a/systems/x86_64-linux/kylekrein-homepc/default.nix +++ b/systems/x86_64-linux/kylekrein-homepc/default.nix @@ -43,7 +43,6 @@ in swapSize = 32; }; custom.windowManagers.niri = enabled; - custom.loginManagers.sddm = enabled; custom.services.ai = { enable = true; models = ["qwq" "llama3.1" "qwen2.5-coder:7b" "gpt-oss:20b" "gpt-oss:120b"];