diff --git a/flake.nix b/flake.nix index f614aeb..ef5431b 100644 --- a/flake.nix +++ b/flake.nix @@ -44,6 +44,8 @@ plasma-manager.url = "github:pjones/plasma-manager"; flatpaks.url = "github:GermanBread/declarative-flatpak"; + + # atuin.url = "github:atuinsh/atuin"; }; outputs = { @@ -55,6 +57,7 @@ helix, plasma-manager, flatpaks, + # atuin, nixd, nix-ld-rs, nix-index-database, diff --git a/home/home.nix b/home/home.nix index 071f527..ab6d187 100644 --- a/home/home.nix +++ b/home/home.nix @@ -53,6 +53,7 @@ in { culr # kdeconnect + plasma-browser-integration keepassxc git-credential-keepassxc @@ -61,21 +62,21 @@ in { mpv gtk-engine-murrine - ( - (plasma5Packages.polonium.override {}).overrideAttrs - (old: { - version = "1.0.0-alpha"; + # ( + # (plasma5Packages.polonium.override {}).overrideAttrs + # (old: { + # version = "1.0.0-alpha"; - src = fetchFromGitHub { - owner = "zeroxoneafour"; - repo = "polonium"; - rev = "94ba0faac40d2fbccebdb34bb4f7d6c7d162396f"; - hash = "sha256-uoL3GfGTj/rIQdWuBY0dBdEurkusSGF8YRnUS3gtvnQ="; - }; + # src = fetchFromGitHub { + # owner = "zeroxoneafour"; + # repo = "polonium"; + # rev = "94ba0faac40d2fbccebdb34bb4f7d6c7d162396f"; + # hash = "sha256-uoL3GfGTj/rIQdWuBY0dBdEurkusSGF8YRnUS3gtvnQ="; + # }; - npmDepsHash = "sha256-kaT3Uyq+/JkmebakG9xQuR4Kjo7vk6BzI1/LffOj/eo="; - }) - ) + # npmDepsHash = "sha256-kaT3Uyq+/JkmebakG9xQuR4Kjo7vk6BzI1/LffOj/eo="; + # }) + # ) ] ++ pkgs.rice.fonts.pkgs ++ pkgs.rice.icons.pkgs; @@ -133,6 +134,12 @@ in { }; }; + programs.atuin = { + enable = true; + enableZshIntegration = true; + # flags = ["--disable-up-arrow"]; + # package = inputs.atuin; + }; # programs.nix-index-database.comma.enable = true; # programs.nix-index = { # enable = true; diff --git a/home/programs/firefox.nix b/home/programs/firefox.nix index 397b233..e2e3f40 100644 --- a/home/programs/firefox.nix +++ b/home/programs/firefox.nix @@ -51,7 +51,28 @@ in { "{b86e4813-687a-43e6-ab65-0bde4ab75758}" = officialAddon "localcdn-fork-of-decentraleyes"; "plasma-browser-integration@kde.org" = officialAddon "plasma-integration"; }; + + Preferences = { + "extensions.pocket.enabled" = lock-false; + "extensions.screenshots.disabled" = lock-true; + "browser.topsites.contile.enabled" = lock-false; + "browser.formfill.enable" = lock-false; + "browser.search.suggest.enabled" = lock-false; + "browser.search.suggest.enabled.private" = lock-false; + "browser.urlbar.suggest.searches" = lock-false; + "browser.urlbar.showSearchSuggestionsFirst" = lock-false; + "browser.newtabpage.activity-stream.feeds.section.topstories" = lock-false; + "browser.newtabpage.activity-stream.feeds.snippets" = lock-false; + "browser.newtabpage.activity-stream.section.highlights.includePocket" = lock-false; + "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = lock-false; + "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = lock-false; + "browser.newtabpage.activity-stream.section.highlights.includeVisited" = lock-false; + "browser.newtabpage.activity-stream.showSponsored" = lock-false; + "browser.newtabpage.activity-stream.system.showSponsored" = lock-false; + "browser.newtabpage.activity-stream.showSponsoredTopSites" = lock-false; + }; }; + profiles.default = { id = 0; name = "Default"; @@ -61,25 +82,5 @@ in { "widget.use-xdg-desktop-portal.mime-handler" = 1; }; }; - - Preferences = { - "extensions.pocket.enabled" = lock-false; - "extensions.screenshots.disabled" = lock-true; - "browser.topsites.contile.enabled" = lock-false; - "browser.formfill.enable" = lock-false; - "browser.search.suggest.enabled" = lock-false; - "browser.search.suggest.enabled.private" = lock-false; - "browser.urlbar.suggest.searches" = lock-false; - "browser.urlbar.showSearchSuggestionsFirst" = lock-false; - "browser.newtabpage.activity-stream.feeds.section.topstories" = lock-false; - "browser.newtabpage.activity-stream.feeds.snippets" = lock-false; - "browser.newtabpage.activity-stream.section.highlights.includePocket" = lock-false; - "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = lock-false; - "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = lock-false; - "browser.newtabpage.activity-stream.section.highlights.includeVisited" = lock-false; - "browser.newtabpage.activity-stream.showSponsored" = lock-false; - "browser.newtabpage.activity-stream.system.showSponsored" = lock-false; - "browser.newtabpage.activity-stream.showSponsoredTopSites" = lock-false; - }; }; } diff --git a/home/programs/plasma.nix b/home/programs/plasma.nix index 735901d..927d659 100644 --- a/home/programs/plasma.nix +++ b/home/programs/plasma.nix @@ -3,6 +3,7 @@ enable = true; shortcuts = { "ActivityManager"."switch-to-activity-8e94f782-b970-49f5-80e1-19c9cf6c8a88" = [ ]; + "KDE Keyboard Layout Switcher"."Switch to Last-Used Keyboard Layout" = "Meta+Alt+L"; "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; "firefox.desktop"."_launch" = "Meta+F"; "firefox.desktop"."new-private-window" = [ ]; @@ -11,29 +12,36 @@ "kaccess"."Toggle Screen Reader On and Off" = [ ]; "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; - "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; + "kcm_touchpad"."Toggle Touchpad" = ["" "Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; "kded5"."Show System Activity" = "Ctrl+Esc"; - "kded5"."display" = ["Display" "Meta+P"]; + "kded5"."display" = ["" "Display" "Meta+P"]; "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = [ ]; "kitty.desktop"."_launch" = "Meta+Return"; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; + "kmix"."decrease_volume_small" = "Shift+Volume Down"; "kmix"."increase_microphone_volume" = "Microphone Volume Up"; "kmix"."increase_volume" = "Volume Up"; - "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; + "kmix"."increase_volume_small" = "Shift+Volume Up"; + "kmix"."mic_mute" = ["" "Microphone Mute" "Meta+Volume Mute"]; "kmix"."mute" = "Volume Mute"; "ksmserver"."Halt Without Confirmation" = [ ]; "ksmserver"."Lock Session" = "Screensaver"; - "ksmserver"."Log Out" = ["Meta+Shift+E" "Ctrl+Alt+Del"]; + "ksmserver"."Log Out" = ["" "Meta+Shift+E" "Ctrl+Alt+Del"]; "ksmserver"."Log Out Without Confirmation" = [ ]; + "ksmserver"."Reboot" = [ ]; "ksmserver"."Reboot Without Confirmation" = [ ]; + "ksmserver"."Shut Down" = [ ]; "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; + "kwin"."Cycle Overview" = [ ]; + "kwin"."Cycle Overview Opposite" = [ ]; "kwin"."Decrease Opacity" = [ ]; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; - "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; + "kwin"."ExposeAll" = ["" "Ctrl+F10" "Launch (C)"]; "kwin"."ExposeClass" = "Ctrl+F7"; "kwin"."ExposeClassCurrentDesktop" = [ ]; + "kwin"."Grid View" = "Meta+G"; "kwin"."Increase Opacity" = [ ]; "kwin"."Kill Window" = "Meta+Ctrl+Esc"; "kwin"."Move Tablet to Next Output" = [ ]; @@ -58,6 +66,7 @@ "kwin"."PoloniumInsertBelow" = "Meta+Shift+J"; "kwin"."PoloniumInsertLeft" = "Meta+Shift+H"; "kwin"."PoloniumInsertRight" = "Meta+Shift+L"; + "kwin"."PoloniumOpenSettings" = "Meta+\\,none"; "kwin"."PoloniumRebuildLayout" = "Meta+Ctrl+Space"; "kwin"."PoloniumResizeTileDown" = "Meta+Shift+Down"; "kwin"."PoloniumResizeTileLeft" = [ ]; @@ -134,7 +143,7 @@ "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = [ ]; "kwin"."Window Above Other Windows" = [ ]; "kwin"."Window Below Other Windows" = [ ]; - "kwin"."Window Close" = ["Alt+F4" "Meta+Shift+Q"]; + "kwin"."Window Close" = ["" "Alt+F4" "Meta+Shift+Q"]; "kwin"."Window Fullscreen" = [ ]; "kwin"."Window Grow Horizontal" = [ ]; "kwin"."Window Grow Vertical" = [ ]; @@ -218,13 +227,13 @@ "mediacontrol"."stopmedia" = "Media Stop"; "org.kde.dolphin.desktop"."_launch" = "Meta+E"; "org.kde.krunner.desktop"."RunClipboard" = "Alt+Shift+F2"; - "org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Search" "Meta+D"]; - "org.kde.plasma.emojier.desktop"."_launch" = ["Meta+." "Meta+Ctrl+Alt+Shift+Space"]; + "org.kde.krunner.desktop"."_launch" = ["" "Alt+Space" "Alt+F2" "Search" "Meta+D"]; + "org.kde.plasma.emojier.desktop"."_launch" = ["" "Meta+." "Meta+Ctrl+Alt+Shift+Space"]; "org.kde.spectacle.desktop"."ActiveWindowScreenShot" = "Meta+Print"; "org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = [ ]; "org.kde.spectacle.desktop"."FullScreenScreenShot" = "Shift+Print"; "org.kde.spectacle.desktop"."OpenWithoutScreenshot" = [ ]; - "org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Meta+Shift+S" "Meta+Shift+Print"]; + "org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "Meta+Shift+S" "Meta+Shift+Print"]; "org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = "Meta+Ctrl+Print"; "org.kde.spectacle.desktop"."_launch" = "Print"; "org.keepassxc.KeePassXC.desktop"."_launch" = "Meta+-"; @@ -236,14 +245,17 @@ "org.strawberrymusicplayer.strawberry.desktop"."_launch" = "Meta+="; "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down"; "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down"; + "org_kde_powerdevil"."Decrease Screen Brightness Small" = "Shift+Monitor Brightness Down"; "org_kde_powerdevil"."Hibernate" = "Hibernate"; "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up"; "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up"; + "org_kde_powerdevil"."Increase Screen Brightness Small" = "Shift+Monitor Brightness Up"; "org_kde_powerdevil"."PowerDown" = "Power Down"; "org_kde_powerdevil"."PowerOff" = "Power Off"; "org_kde_powerdevil"."Sleep" = "Sleep"; "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; "org_kde_powerdevil"."Turn Off Screen" = [ ]; + "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B"]; "plasmashell"."activate task manager entry 1" = [ ]; "plasmashell"."activate task manager entry 10" = [ ]; "plasmashell"."activate task manager entry 2" = [ ]; @@ -271,6 +283,15 @@ "plasmashell"."switch to next activity" = [ ]; "plasmashell"."switch to previous activity" = [ ]; "plasmashell"."toggle do not disturb" = [ ]; + "services.firefox.desktop"."_launch" = "Meta+F"; + "services.kitty.desktop"."_launch" = "Meta+Return"; + "services.org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Search" "Meta+D"]; + "services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; + "services.org.kde.spectacle.desktop"."RecordWindow" = [ ]; + "services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Meta+Shift+S" "Meta+Shift+Print"]; + "services.org.kde.spectacle.desktop"."_launch" = "Print"; + "services.org.keepassxc.KeePassXC.desktop"."_launch" = "Meta+-"; + "services.org.strawberrymusicplayer.strawberry.desktop"."_launch" = "Meta+="; "systemsettings.desktop"."_launch" = "Tools"; "systemsettings.desktop"."kcm-kscreen" = [ ]; "systemsettings.desktop"."kcm-lookandfeel" = [ ]; @@ -916,12 +937,19 @@ "kwinrc"."Desktops"."Id_4" = "52e78d4f-f71b-4605-aa04-4d630dc3b204"; "kwinrc"."Desktops"."Number" = 4; "kwinrc"."Desktops"."Rows" = 4; + "kwinrc"."Effect-glide"."InDistance" = 500; + "kwinrc"."Effect-glide"."InRotationAngle" = 120; + "kwinrc"."Effect-glide"."OutDistance" = 500; + "kwinrc"."Effect-glide"."OutRotationAngle" = 120; "kwinrc"."Effect-kwin4_effect_translucency"."Inactive" = 96; + "kwinrc"."Effect-scale"."InScale" = 0.5; + "kwinrc"."Effect-scale"."OutScale" = 0.5; "kwinrc"."Effect-windowview"."BorderActivateAll" = 9; "kwinrc"."Effect-wobblywindows"."Drag" = 90; "kwinrc"."Effect-wobblywindows"."Stiffness" = 6; "kwinrc"."Effect-wobblywindows"."WobblynessLevel" = 2; "kwinrc"."Input"."TabletMode" = "off"; + "kwinrc"."NightColor"."Active" = true; "kwinrc"."NightColor"."LatitudeAuto" = "-33.8715"; "kwinrc"."NightColor"."LatitudeFixed" = "-33.87"; "kwinrc"."NightColor"."LongitudeAuto" = 151.2006; @@ -937,20 +965,22 @@ "kwinrc"."Plugins"."magnifierEnabled" = true; "kwinrc"."Plugins"."poloniumEnabled" = true; "kwinrc"."Plugins"."sheetEnabled" = true; - "kwinrc"."Plugins"."slideEnabled" = false; "kwinrc"."Plugins"."slidebackEnabled" = true; "kwinrc"."Plugins"."wobblywindowsEnabled" = true; "kwinrc"."Plugins"."zoomEnabled" = false; "kwinrc"."Script-polonium"."Borders" = 3; + "kwinrc"."Script-polonium"."FilterCaption" = "Emoji Selector"; "kwinrc"."Script-polonium"."FilterClientCaption" = "Emoji Selector"; "kwinrc"."Script-polonium"."InsertionPoint" = 2; "kwinrc"."Script-polonium"."ResizeAmount" = 16; "kwinrc"."Script-polonium"."Unfullscreen" = true; "kwinrc"."TabBox"."LayoutName" = "compact"; "kwinrc"."Tiling"."padding" = 4; + "kwinrc"."Tiling.0e03a935-d467-5008-ac02-2d49bd489fa5"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[]}"; "kwinrc"."Tiling.1146a6ac-0683-568b-a352-d8ca7470eab6"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[]}"; "kwinrc"."Tiling.5b7fa715-9e22-58f3-9fa5-60878e126c62"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5},{\"width\":0.5}]}"; "kwinrc"."Tiling.7cee4d9c-0c6a-5563-91f4-7c81d68172ce"."tiles" = "{\"layoutDirection\":\"vertical\",\"tiles\":[]}"; + "kwinrc"."Tiling.f726f7e7-1cfe-5dd0-933b-15892472fe80"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5},{\"width\":0.5}]}"; "kwinrc"."Tiling.fec5a356-f9de-520a-8d72-a01616b3b699"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[]}"; "kwinrc"."Wayland"."EnablePrimarySelection" = false; "kwinrc"."Windows"."ActiveMouseScreen" = false; diff --git a/system/configuration.nix b/system/configuration.nix index 8a36ba6..42bce28 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -83,7 +83,7 @@ services.xserver.desktopManager.plasma6.enable = true; # new plasma! services.xserver.displayManager.sddm.enable = true; services.xserver.displayManager.defaultSession = "plasma"; - environment.plasma6.excludePackages = with pkgs.qt6Packages; [ + environment.plasma6.excludePackages = with pkgs.kdePackages; [ konsole gwenview ]; @@ -147,6 +147,8 @@ qt6Packages.qtstyleplugin-kvantum ]; + services.atuin.enable = true; + documentation.dev.enable = true; documentation.man.enable = true; documentation.enable = true;