From 18a13787819d3b36cc6f9212510bd6075f970134 Mon Sep 17 00:00:00 2001 From: Senior Matt Date: Sat, 25 Apr 2026 23:34:21 +0500 Subject: [PATCH] latest niri 26.04, blur, cinnamon, plasma. --- flake.lock | 139 ++++++++++--- flake.nix | 7 +- modules/home.nix | 2 +- modules/hosts/laptop/configuration.nix | 16 +- modules/programs/kitty.nix | 21 +- modules/programs/matugen/matugen.nix | 65 +++--- modules/sessions/cinnamon/cinnamon-dconf.nix | 30 ++- modules/sessions/cinnamon/dconf.nix.temp | 202 +++++++++++++++++++ modules/sessions/niri/config.kdl | 6 +- modules/sessions/niri/niri.nix | 9 +- modules/sessions/plasma.nix | 5 + 11 files changed, 416 insertions(+), 86 deletions(-) create mode 100644 modules/sessions/cinnamon/dconf.nix.temp diff --git a/flake.lock b/flake.lock index b025242..3f12c7c 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1775104157, - "narHash": "sha256-rm/7k0D2J9SP30pyZ2C1HqarDncZDN6KAUI0gzgg4TA=", + "lastModified": 1776697674, + "narHash": "sha256-MljmqqcraHHFrvu9owYv05a7WaY0yww4jcHwvb7Id2Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "41e6e2ab37763c09db4e639033392cf40900440a", + "rev": "78ceb2dd5c16309c25ce97ecd4687f24e6ab6366", "type": "github" }, "original": { @@ -127,36 +127,76 @@ "type": "github" } }, - "nix-wrapper-modules": { + "niri-flake": { "inputs": { - "nixpkgs": "nixpkgs" + "niri-stable": "niri-stable", + "niri-unstable": "niri-unstable", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable", + "xwayland-satellite-stable": "xwayland-satellite-stable", + "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1774879171, - "narHash": "sha256-a6JZDuBIwQmuEwYM4dziH+WyrpE8HCP8F7JFIn3CNvw=", - "owner": "BirdeeHub", - "repo": "nix-wrapper-modules", - "rev": "bab35ffae25cf6f4e4fdb3c2f7f0ac80966ce737", + "lastModified": 1777130270, + "narHash": "sha256-AgOIR3O+hLkTe/spgYjp0knc37iy/A5DqGRY+8DP3LE=", + "owner": "sodiboo", + "repo": "niri-flake", + "rev": "e43ef13f23c2c7ae5b10e842745cb345faff4f40", "type": "github" }, "original": { - "owner": "BirdeeHub", - "repo": "nix-wrapper-modules", + "owner": "sodiboo", + "repo": "niri-flake", + "type": "github" + } + }, + "niri-stable": { + "flake": false, + "locked": { + "lastModified": 1756556321, + "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "ref": "v25.08", + "repo": "niri", + "type": "github" + } + }, + "niri-unstable": { + "flake": false, + "locked": { + "lastModified": 1777115961, + "narHash": "sha256-ehSMsSpE+0k8r+2Vseu8kangsYxToZv3vinynsDp9zs=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "8ed0da44d974c32c6877d2f4630c314da0717ecb", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "repo": "niri", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1774610258, - "narHash": "sha256-HaThtroVD9wRdx7KQk0B75JmFcXlMUoEdDFNOMOlsOs=", - "owner": "NixOS", + "lastModified": 1776169885, + "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "832efc09b4caf6b4569fbf9dc01bec3082a00611", + "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -176,18 +216,18 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-stable": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", - "owner": "nixos", + "lastModified": 1776734388, + "narHash": "sha256-vl3dkhlE5gzsItuHoEMVe+DlonsK+0836LIRDnm6MXQ=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "10e7ad5bbcb421fe07e3a4ad53a634b0cd57ffac", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -204,11 +244,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1774852850, - "narHash": "sha256-7VK4v7ZbQw5apfgc+FvgRi8BUC45ERlcp8VTTTQ3tko=", + "lastModified": 1776695587, + "narHash": "sha256-XXn/vKRCiwCkAzXvOxNyLE0mRDfFa0axQDJYMikaGY8=", "owner": "NotAShelf", "repo": "nvf", - "rev": "b4d6539e7e9948aaba5efd7a67a63672d1fa80ef", + "rev": "4de19e12094a30d3cd205822536e0c3c57cba66c", "type": "github" }, "original": { @@ -222,8 +262,8 @@ "flake-parts": "flake-parts", "home-manager": "home-manager", "import-tree": "import-tree", - "nix-wrapper-modules": "nix-wrapper-modules", - "nixpkgs": "nixpkgs_2", + "niri-flake": "niri-flake", + "nixpkgs": "nixpkgs", "nvf": "nvf", "zen-browser": "zen-browser" } @@ -243,6 +283,39 @@ "type": "github" } }, + "xwayland-satellite-stable": { + "flake": false, + "locked": { + "lastModified": 1755491097, + "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "388d291e82ffbc73be18169d39470f340707edaa", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "ref": "v0.7", + "repo": "xwayland-satellite", + "type": "github" + } + }, + "xwayland-satellite-unstable": { + "flake": false, + "locked": { + "lastModified": 1773622265, + "narHash": "sha256-wToKwH7IgWdGLMSIWksEDs4eumR6UbbsuPQ42r0oTXQ=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "a879e5e0896a326adc79c474bf457b8b99011027", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "type": "github" + } + }, "zen-browser": { "inputs": { "nixpkgs": [ @@ -250,11 +323,11 @@ ] }, "locked": { - "lastModified": 1774759885, - "narHash": "sha256-Y3D2GnZTO6BhGWeVcO6qUkiO5g0dDL2tmokLVWNC1WY=", + "lastModified": 1775710180, + "narHash": "sha256-sCokvdNvl8zIzsnjgG0TN5h3RUI7GJyWW9ErfmEj0rM=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "16e3f4cd221a030186a96015d82dcb3fb4afa4d6", + "rev": "2c138beb648d1cbbfae76695a8230ee04e4db25a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9f14624..c74da10 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,12 @@ nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; import-tree.url = "github:vic/import-tree"; - nix-wrapper-modules.url = "github:BirdeeHub/nix-wrapper-modules"; + # nix-wrapper-modules.url = "github:BirdeeHub/nix-wrapper-modules"; + + niri-flake = { + url = "github:sodiboo/niri-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; home-manager = { url = "github:nix-community/home-manager"; diff --git a/modules/home.nix b/modules/home.nix index aba9a12..abb8f53 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -12,7 +12,7 @@ backupCommand = "rm"; users.${self.user} = { - home.stateVersion = "25.11"; + home.stateVersion = "26.05"; programs.home-manager.enable = true; }; }; diff --git a/modules/hosts/laptop/configuration.nix b/modules/hosts/laptop/configuration.nix index 1536fea..63b5bbd 100644 --- a/modules/hosts/laptop/configuration.nix +++ b/modules/hosts/laptop/configuration.nix @@ -17,14 +17,26 @@ self.nixosModules.fastfetch self.nixosModules.home-manager - self.nixosModules.cinnamon - # self.nixosModules.niri + # self.nixosModules.cinnamon + self.nixosModules.niri # self.nixosModules.plasma ]; # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; + boot.loader.timeout = 1; + + # Use the GRUB EFI boot loader. + # boot.loader = { + # grub = { + # enable = true; + # device = "nodev"; # "nodev" is used for UEFI + # efiSupport = true; + # useOSProber = true; + # }; + # efi.canTouchEfiVariables = true; + # }; # Enable flakes. nix.settings.experimental-features = [ "nix-command" "flakes" ]; diff --git a/modules/programs/kitty.nix b/modules/programs/kitty.nix index e542b3a..e074bf5 100644 --- a/modules/programs/kitty.nix +++ b/modules/programs/kitty.nix @@ -1,16 +1,16 @@ -{ self, config, lib, ... }: +{ self, ... }: { - options = { - pywal = { - enable = lib.mkOption { - default = false; - type = lib.types.bool; + flake.nixosModules.kitty = { config, lib, ... }: { + options = { + kitty.pywal = { + enable = lib.mkOption { + default = false; + type = lib.types.bool; + }; }; }; - }; - config = { - flake.nixosModules.kitty = { + config = { home-manager.users.${self.user}.imports = [ { programs.kitty = { @@ -22,8 +22,9 @@ settings = { confirm_os_window_close = 0; # background_opacity = 0.85; + remember_window_size = "no"; }; - extraConfig = lib.mkIf config.pywal.enable '' + extraConfig = lib.mkIf config.kitty.pywal.enable '' include ~/.cache/wal/colors-kitty.conf ''; themeFile = "gruvbox-dark"; diff --git a/modules/programs/matugen/matugen.nix b/modules/programs/matugen/matugen.nix index 9412f3c..20dc2c3 100644 --- a/modules/programs/matugen/matugen.nix +++ b/modules/programs/matugen/matugen.nix @@ -23,42 +23,47 @@ ]; xdg.configFile = { - "matugen/config.toml".text = /* toml */ '' - [config] - [templates.gtk3] - input_path = '${builtins.toString ./templates/gtk-colors.css}' - output_path = '~/.config/gtk-3.0/colors.css' + "matugen/config.toml" = { + text = /* toml */ '' + [config] + [templates.gtk3] + input_path = '${builtins.toString ./templates/gtk-colors.css}' + output_path = '~/.config/gtk-3.0/colors.css' - [templates.gtk4] - input_path = '${builtins.toString ./templates/gtk-colors.css}' - output_path = '~/.config/gtk-4.0/colors.css' + [templates.gtk4] + input_path = '${builtins.toString ./templates/gtk-colors.css}' + output_path = '~/.config/gtk-4.0/colors.css' - [templates.color-scheme] - input_path = '${builtins.toString ./templates/Matugen.colors}' - output_path = '~/.local/share/color-schemes/Matugen.colors' + [templates.color-scheme] + input_path = '${builtins.toString ./templates/Matugen.colors}' + output_path = '~/.local/share/color-schemes/Matugen.colors' - [templates.qt5ct] - input_path = '${builtins.toString ./templates/qtct-colors.conf}' - output_path = '~/.config/qt5ct/colors/matugen.conf' + [templates.qt5ct] + input_path = '${builtins.toString ./templates/qtct-colors.conf}' + output_path = '~/.config/qt5ct/colors/matugen.conf' - [templates.qt6ct] - input_path = '${builtins.toString ./templates/qtct-colors.conf}' - output_path = '~/.config/qt6ct/colors/matugen.conf' + [templates.qt6ct] + input_path = '${builtins.toString ./templates/qtct-colors.conf}' + output_path = '~/.config/qt6ct/colors/matugen.conf' - [templates.niri] - input_path = '${builtins.toString ./templates/niri-colors.kdl}' - output_path = '~/.config/niri/colors.kdl' - # post_hook = 'niri msg action load-config-file' + [templates.niri] + input_path = '${builtins.toString ./templates/niri-colors.kdl}' + output_path = '~/.config/niri/colors.kdl' + # post_hook = 'niri msg action load-config-file' - [templates.dunst] - input_path = '${builtins.toString ./templates/dunstrc-colors}' - output_path = '~/.config/dunst/dunstrc.d/00-style.conf' - post_hook = 'dunstctl reload' - ''; - "kdeglobals".text = '' - [UiSettings] - ColorScheme=Matugen - ''; + [templates.dunst] + input_path = '${builtins.toString ./templates/dunstrc-colors}' + output_path = '~/.config/dunst/dunstrc.d/00-style.conf' + post_hook = 'dunstctl reload' + ''; + }; + + "kdeglobals" = { + text = '' + [UiSettings] + ColorScheme=Matugen + ''; + }; }; qt = { diff --git a/modules/sessions/cinnamon/cinnamon-dconf.nix b/modules/sessions/cinnamon/cinnamon-dconf.nix index 1efc9b1..ca7ae0b 100644 --- a/modules/sessions/cinnamon/cinnamon-dconf.nix +++ b/modules/sessions/cinnamon/cinnamon-dconf.nix @@ -4,12 +4,27 @@ dconf.settings = { "org/cinnamon" = { alttab-switcher-delay = 100; - enabled-applets = [ "panel1:left:0:menu@cinnamon.org:0" "panel1:left:1:separator@cinnamon.org:1" "panel1:left:2:grouped-window-list@cinnamon.org:2" "panel1:right:0:systray@cinnamon.org:3" "panel1:right:1:xapp-status@cinnamon.org:4" "panel1:right:2:notifications@cinnamon.org:5" "panel1:right:3:printers@cinnamon.org:6" "panel1:right:4:removable-drives@cinnamon.org:7" "panel1:right:5:keyboard@cinnamon.org:8" "panel1:right:6:favorites@cinnamon.org:9" "panel1:right:7:network@cinnamon.org:10" "panel1:right:8:sound@cinnamon.org:11" "panel1:right:9:power@cinnamon.org:12" "panel1:right:10:calendar@cinnamon.org:13" "panel1:right:11:cornerbar@cinnamon.org:14" ]; - next-applet-id = 15; + desklet-snap-interval = 25; + enabled-applets = [ "panel1:left:0:menu@cinnamon.org:0" "panel1:left:1:separator@cinnamon.org:1" "panel1:left:2:grouped-window-list@cinnamon.org:2" "panel1:right:2:systray@cinnamon.org:3" "panel1:right:3:xapp-status@cinnamon.org:4" "panel1:right:4:notifications@cinnamon.org:5" "panel1:right:5:printers@cinnamon.org:6" "panel1:right:6:removable-drives@cinnamon.org:7" "panel1:right:7:keyboard@cinnamon.org:8" "panel1:right:8:favorites@cinnamon.org:9" "panel1:right:9:network@cinnamon.org:10" "panel1:right:10:sound@cinnamon.org:11" "panel1:right:11:power@cinnamon.org:12" "panel1:right:12:calendar@cinnamon.org:13" "panel1:right:13:cornerbar@cinnamon.org:14" "panel1:right:1:weather@mockturtl:15" "panel1:center:0:workspace-switcher@cinnamon.org:16" ]; + enabled-desklets = []; + next-applet-id = 17; + panel-edit-mode = false; panel-zone-symbolic-icon-sizes = "[{\"panelId\": 1, \"left\": 28, \"center\": 28, \"right\": 16}]"; panels-height = [ "1:48" ]; }; + "org/cinnamon/desktop/a11y/applications" = { + screen-reader-enabled = false; + }; + + "org/cinnamon/desktop/a11y/mouse" = { + dwell-click-enabled = false; + dwell-threshold = 10; + dwell-time = 1.2; + secondary-click-enabled = false; + secondary-click-time = 1.2; + }; + "org/cinnamon/desktop/applications/calculator" = { exec = "gnome-calculator"; }; @@ -148,17 +163,20 @@ }; "org/cinnamon/gestures" = { + enabled = true; + pinch-percent-threshold = mkUint32 40; swipe-down-2 = "PUSH_TILE_DOWN::end"; - swipe-down-3 = "TOGGLE_OVERVIEW::end"; + swipe-down-3 = "TOGGLE_OVERVIEW::::start"; swipe-down-4 = "VOLUME_DOWN::end"; swipe-left-2 = "PUSH_TILE_LEFT::end"; - swipe-left-3 = "WORKSPACE_NEXT::end"; + swipe-left-3 = "WORKSPACE_NEXT::::start"; swipe-left-4 = "WINDOW_WORKSPACE_PREVIOUS::end"; + swipe-percent-threshold = mkUint32 60; swipe-right-2 = "PUSH_TILE_RIGHT::end"; - swipe-right-3 = "WORKSPACE_PREVIOUS::end"; + swipe-right-3 = "WORKSPACE_PREVIOUS::::start"; swipe-right-4 = "WINDOW_WORKSPACE_NEXT::end"; swipe-up-2 = "PUSH_TILE_UP::end"; - swipe-up-3 = "TOGGLE_EXPO::end"; + swipe-up-3 = "TOGGLE_EXPO::::start"; swipe-up-4 = "VOLUME_UP::end"; tap-3 = "MEDIA_PLAY_PAUSE::end"; }; diff --git a/modules/sessions/cinnamon/dconf.nix.temp b/modules/sessions/cinnamon/dconf.nix.temp new file mode 100644 index 0000000..6bacf3c --- /dev/null +++ b/modules/sessions/cinnamon/dconf.nix.temp @@ -0,0 +1,202 @@ +# Generated via dconf2nix: https://github.com/gvolpe/dconf2nix +{ lib, ... }: + +with lib.hm.gvariant; + +{ + dconf.settings = { + "org/cinnamon" = { + alttab-switcher-delay = 100; + desklet-snap-interval = 25; + enabled-applets = [ "panel1:left:0:menu@cinnamon.org:0" "panel1:left:1:separator@cinnamon.org:1" "panel1:left:2:grouped-window-list@cinnamon.org:2" "panel1:right:2:systray@cinnamon.org:3" "panel1:right:3:xapp-status@cinnamon.org:4" "panel1:right:4:notifications@cinnamon.org:5" "panel1:right:5:printers@cinnamon.org:6" "panel1:right:6:removable-drives@cinnamon.org:7" "panel1:right:7:keyboard@cinnamon.org:8" "panel1:right:8:favorites@cinnamon.org:9" "panel1:right:9:network@cinnamon.org:10" "panel1:right:10:sound@cinnamon.org:11" "panel1:right:11:power@cinnamon.org:12" "panel1:right:12:calendar@cinnamon.org:13" "panel1:right:13:cornerbar@cinnamon.org:14" "panel1:right:1:weather@mockturtl:15" "panel1:center:0:workspace-switcher@cinnamon.org:16" ]; + enabled-desklets = []; + next-applet-id = 17; + panel-edit-mode = false; + panel-zone-symbolic-icon-sizes = "[{\"panelId\": 1, \"left\": 28, \"center\": 28, \"right\": 16}]"; + panels-height = [ "1:48" ]; + }; + + "org/cinnamon/desktop/a11y/applications" = { + screen-reader-enabled = false; + }; + + "org/cinnamon/desktop/a11y/mouse" = { + dwell-click-enabled = false; + dwell-threshold = 10; + dwell-time = 1.2; + secondary-click-enabled = false; + secondary-click-time = 1.2; + }; + + "org/cinnamon/desktop/applications/calculator" = { + exec = "gnome-calculator"; + }; + + "org/cinnamon/desktop/applications/terminal" = { + exec = "kitty"; + exec-arg = "--"; + }; + + "org/cinnamon/desktop/background" = { + picture-uri = "file:///home/matthew/Pictures/clem_calm.jpg"; + }; + + "org/cinnamon/desktop/background/slideshow" = { + delay = 15; + image-source = "directory:///home/matthew/Pictures"; + }; + + "org/cinnamon/desktop/input-sources" = { + sources = [ (mkTuple [ "xkb" "us" ]) (mkTuple [ "xkb" "ru" ]) ]; + xkb-options = [ "terminate:ctrl_alt_bksp" "grp:caps_toggle" ]; + }; + + "org/cinnamon/desktop/interface" = { + cursor-blink-time = 1200; + cursor-size = 24; + cursor-theme = "Bibata-Modern-Classic"; + gtk-theme = "Mint-Y-Dark"; + icon-theme = "Mint-Y"; + text-scaling-factor = 1.2; + toolkit-accessibility = false; + }; + + "org/cinnamon/desktop/keybindings" = { + custom-list = [ "custom0" "custom1" "custom2" ]; + }; + + "org/cinnamon/desktop/keybindings/custom-keybindings/custom0" = { + binding = [ "o" ]; + command = "obsidian"; + name = "Obsidian"; + }; + + "org/cinnamon/desktop/keybindings/custom-keybindings/custom1" = { + binding = [ "t" ]; + command = "Telegram"; + name = "Telegram"; + }; + + "org/cinnamon/desktop/keybindings/custom-keybindings/custom2" = { + binding = [ "g" ]; + command = "godot-mono"; + name = "Godot"; + }; + + "org/cinnamon/desktop/keybindings/media-keys" = { + terminal = [ "t" "c" ]; + www = [ "XF86WWW" "f" ]; + }; + + "org/cinnamon/desktop/keybindings/wm" = { + close = [ "F4" "c" ]; + minimize = [ "u" ]; + move-to-center = [ "c" ]; + move-to-monitor-down = [ "Down" "j" ]; + move-to-monitor-left = [ "Left" "h" ]; + move-to-monitor-right = [ "Right" "l" ]; + move-to-monitor-up = [ "Up" "k" ]; + move-to-workspace-1 = [ "exclam" ]; + move-to-workspace-10 = [ "parenright" ]; + move-to-workspace-2 = [ "at" ]; + move-to-workspace-3 = [ "numbersign" ]; + move-to-workspace-4 = [ "dollar" ]; + move-to-workspace-5 = [ "percent" ]; + move-to-workspace-6 = [ "asciicircum" ]; + move-to-workspace-7 = [ "ampersand" ]; + move-to-workspace-8 = [ "asterisk" ]; + move-to-workspace-9 = [ "parenleft" ]; + move-to-workspace-down = [ "Down" "j" ]; + move-to-workspace-left = [ "Left" "h" ]; + move-to-workspace-right = [ "Right" "l" ]; + move-to-workspace-up = [ "Up" "k" ]; + push-tile-down = [ "Down" "j" ]; + push-tile-left = [ "Left" "h" ]; + push-tile-right = [ "Right" "l" ]; + push-tile-up = [ "Up" "k" ]; + switch-input-source = [ "ISO_Next_Group" "XF86Keyboard" ]; + switch-to-workspace-1 = [ "1" ]; + switch-to-workspace-10 = [ "0" ]; + switch-to-workspace-2 = [ "2" ]; + switch-to-workspace-3 = [ "3" ]; + switch-to-workspace-4 = [ "4" ]; + switch-to-workspace-5 = [ "5" ]; + switch-to-workspace-6 = [ "6" ]; + switch-to-workspace-7 = [ "7" ]; + switch-to-workspace-8 = [ "8" ]; + switch-to-workspace-9 = [ "9" ]; + switch-to-workspace-down = [ "Down" "w" ]; + switch-to-workspace-left = [ "Left" "h" ]; + switch-to-workspace-right = [ "Right" "l" ]; + toggle-fullscreen = [ "f" "F11" ]; + toggle-maximized = [ "F10" "m" ]; + }; + + "org/cinnamon/desktop/media-handling" = { + autorun-never = false; + }; + + "org/cinnamon/desktop/peripherals/keyboard" = { + delay = mkUint32 228; + repeat-interval = mkUint32 30; + }; + + "org/cinnamon/desktop/peripherals/mouse" = { + accel-profile = "flat"; + double-click = 400; + drag-threshold = 8; + speed = 0.0; + }; + + "org/cinnamon/desktop/peripherals/touchpad" = { + speed = 0.0; + }; + + "org/cinnamon/desktop/screensaver" = { + layout-group = 0; + }; + + "org/cinnamon/desktop/sound" = { + event-sounds = false; + }; + + "org/cinnamon/desktop/wm/preferences" = { + min-window-opacity = 30; + mouse-button-modifier = ""; + }; + + "org/cinnamon/gestures" = { + enabled = true; + pinch-percent-threshold = mkUint32 40; + swipe-down-2 = "PUSH_TILE_DOWN::end"; + swipe-down-3 = "TOGGLE_OVERVIEW::::start"; + swipe-down-4 = "VOLUME_DOWN::end"; + swipe-left-2 = "PUSH_TILE_LEFT::end"; + swipe-left-3 = "WORKSPACE_NEXT::::start"; + swipe-left-4 = "WINDOW_WORKSPACE_PREVIOUS::end"; + swipe-percent-threshold = mkUint32 60; + swipe-right-2 = "PUSH_TILE_RIGHT::end"; + swipe-right-3 = "WORKSPACE_PREVIOUS::::start"; + swipe-right-4 = "WINDOW_WORKSPACE_NEXT::end"; + swipe-up-2 = "PUSH_TILE_UP::end"; + swipe-up-3 = "TOGGLE_EXPO::::start"; + swipe-up-4 = "VOLUME_UP::end"; + tap-3 = "MEDIA_PLAY_PAUSE::end"; + }; + + "org/cinnamon/muffin" = { + draggable-border-width = 10; + placement-mode = "center"; + tile-maximize = true; + }; + + "org/cinnamon/settings-daemon/plugins/color" = { + night-light-last-coordinates = mkTuple [ 43.25 76.95 ]; + }; + + "org/cinnamon/theme" = { + name = "Mint-Y-Dark"; + }; + + }; +} diff --git a/modules/sessions/niri/config.kdl b/modules/sessions/niri/config.kdl index 9c7fc58..ac821e5 100644 --- a/modules/sessions/niri/config.kdl +++ b/modules/sessions/niri/config.kdl @@ -118,7 +118,7 @@ output "eDP-1" { // https://yalter.github.io/niri/Configuration:-Layout layout { // Set gaps around windows in logical pixels. - gaps 8 + gaps 4 always-center-single-column @@ -364,6 +364,10 @@ window-rule { window-rule { // geometry-corner-radius 0 clip-to-geometry true + opacity 0.9 + background-effect { + blur true + } } binds { diff --git a/modules/sessions/niri/niri.nix b/modules/sessions/niri/niri.nix index 303daa8..3cb3694 100644 --- a/modules/sessions/niri/niri.nix +++ b/modules/sessions/niri/niri.nix @@ -1,4 +1,4 @@ -{ self, ... }: +{ self, inputs, ... }: { flake.nixosModules.niri = { pkgs, lib, config, ... }: { @@ -6,10 +6,15 @@ self.nixosModules.matugen self.nixosModules.waybar ]; + + nixpkgs.overlays = [ inputs.niri-flake.overlays.niri ]; kitty.pywal.enable = true; - programs.niri.enable = true; + programs.niri = { + enable = true; + package = pkgs.niri-unstable; + }; services.displayManager.ly = let diff --git a/modules/sessions/plasma.nix b/modules/sessions/plasma.nix index 7ab4a2b..96127a2 100644 --- a/modules/sessions/plasma.nix +++ b/modules/sessions/plasma.nix @@ -3,6 +3,11 @@ services.desktopManager.plasma6.enable = true; services.displayManager.plasma-login-manager.enable = true; services.power-profiles-daemon.enable = false; + services.xserver.enable = false; + + environment.systemPackages = with pkgs; [ + klassy + ]; nixpkgs.overlays = [ (final: prev: {