diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 9a46c42..3d59b2c 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -22,7 +22,7 @@ ./package-configs/foot ]; nixpkgs = { - config.permittedInsecurePackages = ["cinny-4.2.1" "cinny-unwrapped-4.2.1"]; + config.permittedInsecurePackages = ["cinny-4.2.2" "cinny-unwrapped-4.2.2"]; # You can add overlays here overlays = [ # You can also add overlays exported from other flakes: @@ -90,7 +90,7 @@ # Chat applications: signal-desktop - webcord-vencord + vesktop cinny-desktop # Gaming: diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 8113fef..b1f5c6a 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -83,7 +83,7 @@ "applications:systemsettings.desktop" "applications:org.kde.dolphin.desktop" "applications:signal-desktop.desktop" - "applications:webcord.desktop" + "applications:vesktop.desktop" "applications:cinny.desktop" "applications:steam.desktop" "applications:noisetorch.desktop" @@ -117,28 +117,27 @@ "kmix"."increase_microphone_volume" = "Microphone Volume Up"; "kmix"."increase_volume" = "Volume Up"; "kmix"."increase_volume_small" = "Shift+Volume Up"; - "kmix"."mic_mute" = ["Microphone Mute" "" "Meta+Volume Mute\\, ,Microphone Mute" "Meta+Volume Mute,Mute Microphone"]; + "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"]; "kmix"."mute" = "Volume Mute"; - "ksmserver"."Halt Without Confirmation" = []; - "ksmserver"."Lock Session" = ["Meta+L" "" "Screensaver\\, ,Meta+L" "Screensaver,Lock Session"]; + "ksmserver"."Halt Without Confirmation" = "none,,Shut Down Without Confirmation"; + "ksmserver"."Lock Session" = ["Meta+L" "Screensaver,Meta+L" "Screensaver,Lock Session"]; "ksmserver"."Log Out" = "Ctrl+Alt+Del"; - "ksmserver"."Log Out Without Confirmation" = []; - "ksmserver"."LogOut" = []; - "ksmserver"."Reboot" = []; - "ksmserver"."Reboot Without Confirmation" = []; - "ksmserver"."Shut Down" = []; + "ksmserver"."Log Out Without Confirmation" = "none,,Log Out Without Confirmation"; + "ksmserver"."LogOut" = "none,,Log Out"; + "ksmserver"."Reboot" = "none,,Reboot"; + "ksmserver"."Reboot Without Confirmation" = "none,,Reboot Without Confirmation"; + "ksmserver"."Shut Down" = "none,,Shut Down"; "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; - "kwin"."Cube" = "Meta+C\\, ,none"; "kwin"."Cycle Overview" = []; "kwin"."Cycle Overview Opposite" = []; - "kwin"."Decrease Opacity" = []; + "kwin"."Decrease Opacity" = "none,,Decrease Opacity of Active Window by 5%"; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; - "kwin"."ExposeAll" = ["Ctrl+F10" "" "Launch (C)\\, ,Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"]; + "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C),Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"]; "kwin"."ExposeClass" = "Ctrl+F7"; "kwin"."ExposeClassCurrentDesktop" = []; "kwin"."Grid View" = "Meta+G"; - "kwin"."Increase Opacity" = []; + "kwin"."Increase Opacity" = "none,,Increase Opacity of Active Window by 5%"; "kwin"."Kill Window" = "Meta+Ctrl+Esc"; "kwin"."Move Tablet to Next Output" = []; "kwin"."MoveMouseToCenter" = "Meta+F6"; @@ -148,10 +147,8 @@ "kwin"."MoveZoomRight" = []; "kwin"."MoveZoomUp" = []; "kwin"."Overview" = "Meta+W"; - "kwin"."Setup Window Shortcut" = []; + "kwin"."Setup Window Shortcut" = "none,,Setup Window Shortcut"; "kwin"."Show Desktop" = "Meta+D"; - "kwin"."ShowDesktopGrid" = "Meta+F8\\, ,none"; - "kwin"."Suspend Compositing" = "Alt+Shift+F12\\, ,none"; "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; @@ -161,136 +158,136 @@ "kwin"."Switch Window Right" = "Meta+Alt+Right"; "kwin"."Switch Window Up" = "Meta+Alt+Up"; "kwin"."Switch to Desktop 1" = "Ctrl+F1"; - "kwin"."Switch to Desktop 10" = []; - "kwin"."Switch to Desktop 11" = []; - "kwin"."Switch to Desktop 12" = []; - "kwin"."Switch to Desktop 13" = []; - "kwin"."Switch to Desktop 14" = []; - "kwin"."Switch to Desktop 15" = []; - "kwin"."Switch to Desktop 16" = []; - "kwin"."Switch to Desktop 17" = []; - "kwin"."Switch to Desktop 18" = []; - "kwin"."Switch to Desktop 19" = []; + "kwin"."Switch to Desktop 10" = "none,,Switch to Desktop 10"; + "kwin"."Switch to Desktop 11" = "none,,Switch to Desktop 11"; + "kwin"."Switch to Desktop 12" = "none,,Switch to Desktop 12"; + "kwin"."Switch to Desktop 13" = "none,,Switch to Desktop 13"; + "kwin"."Switch to Desktop 14" = "none,,Switch to Desktop 14"; + "kwin"."Switch to Desktop 15" = "none,,Switch to Desktop 15"; + "kwin"."Switch to Desktop 16" = "none,,Switch to Desktop 16"; + "kwin"."Switch to Desktop 17" = "none,,Switch to Desktop 17"; + "kwin"."Switch to Desktop 18" = "none,,Switch to Desktop 18"; + "kwin"."Switch to Desktop 19" = "none,,Switch to Desktop 19"; "kwin"."Switch to Desktop 2" = "Ctrl+F2"; - "kwin"."Switch to Desktop 20" = []; + "kwin"."Switch to Desktop 20" = "none,,Switch to Desktop 20"; "kwin"."Switch to Desktop 3" = "Ctrl+F3"; "kwin"."Switch to Desktop 4" = "Ctrl+F4"; - "kwin"."Switch to Desktop 5" = []; - "kwin"."Switch to Desktop 6" = []; - "kwin"."Switch to Desktop 7" = []; - "kwin"."Switch to Desktop 8" = []; - "kwin"."Switch to Desktop 9" = []; - "kwin"."Switch to Next Desktop" = []; - "kwin"."Switch to Next Screen" = []; - "kwin"."Switch to Previous Desktop" = []; - "kwin"."Switch to Previous Screen" = []; - "kwin"."Switch to Screen 0" = []; - "kwin"."Switch to Screen 1" = []; - "kwin"."Switch to Screen 2" = []; - "kwin"."Switch to Screen 3" = []; - "kwin"."Switch to Screen 4" = []; - "kwin"."Switch to Screen 5" = []; - "kwin"."Switch to Screen 6" = []; - "kwin"."Switch to Screen 7" = []; - "kwin"."Switch to Screen Above" = []; - "kwin"."Switch to Screen Below" = []; - "kwin"."Switch to Screen to the Left" = []; - "kwin"."Switch to Screen to the Right" = []; + "kwin"."Switch to Desktop 5" = "none,,Switch to Desktop 5"; + "kwin"."Switch to Desktop 6" = "none,,Switch to Desktop 6"; + "kwin"."Switch to Desktop 7" = "none,,Switch to Desktop 7"; + "kwin"."Switch to Desktop 8" = "none,,Switch to Desktop 8"; + "kwin"."Switch to Desktop 9" = "none,,Switch to Desktop 9"; + "kwin"."Switch to Next Desktop" = "none,,Switch to Next Desktop"; + "kwin"."Switch to Next Screen" = "none,,Switch to Next Screen"; + "kwin"."Switch to Previous Desktop" = "none,,Switch to Previous Desktop"; + "kwin"."Switch to Previous Screen" = "none,,Switch to Previous Screen"; + "kwin"."Switch to Screen 0" = "none,,Switch to Screen 0"; + "kwin"."Switch to Screen 1" = "none,,Switch to Screen 1"; + "kwin"."Switch to Screen 2" = "none,,Switch to Screen 2"; + "kwin"."Switch to Screen 3" = "none,,Switch to Screen 3"; + "kwin"."Switch to Screen 4" = "none,,Switch to Screen 4"; + "kwin"."Switch to Screen 5" = "none,,Switch to Screen 5"; + "kwin"."Switch to Screen 6" = "none,,Switch to Screen 6"; + "kwin"."Switch to Screen 7" = "none,,Switch to Screen 7"; + "kwin"."Switch to Screen Above" = "none,,Switch to Screen Above"; + "kwin"."Switch to Screen Below" = "none,,Switch to Screen Below"; + "kwin"."Switch to Screen to the Left" = "none,,Switch to Screen to the Left"; + "kwin"."Switch to Screen to the Right" = "none,,Switch to Screen to the Right"; "kwin"."Toggle Night Color" = []; - "kwin"."Toggle Window Raise/Lower" = []; + "kwin"."Toggle Window Raise/Lower" = "none,,Toggle Window Raise/Lower"; "kwin"."Walk Through Desktop List" = []; "kwin"."Walk Through Desktop List (Reverse)" = []; "kwin"."Walk Through Desktops" = []; "kwin"."Walk Through Desktops (Reverse)" = []; "kwin"."Walk Through Windows" = "Alt+Tab"; - "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab\\, Alt+Shift+Tab\\, ,Alt+Shift+Tab,Walk Through Windows (Reverse)"; - "kwin"."Walk Through Windows Alternative" = []; - "kwin"."Walk Through Windows Alternative (Reverse)" = []; - "kwin"."Walk Through Windows of Current Application" = "\\, Alt+`\\, ,Alt+`,Walk Through Windows of Current Application"; + "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Tab"; + "kwin"."Walk Through Windows Alternative" = "none,,Walk Through Windows Alternative"; + "kwin"."Walk Through Windows Alternative (Reverse)" = "none,,Walk Through Windows Alternative (Reverse)"; + "kwin"."Walk Through Windows of Current Application" = "Alt+`"; "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; - "kwin"."Walk Through Windows of Current Application Alternative" = []; - "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = []; - "kwin"."Window Above Other Windows" = []; - "kwin"."Window Below Other Windows" = []; + "kwin"."Walk Through Windows of Current Application Alternative" = "none,,Walk Through Windows of Current Application Alternative"; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = "none,,Walk Through Windows of Current Application Alternative (Reverse)"; + "kwin"."Window Above Other Windows" = "none,,Keep Window Above Others"; + "kwin"."Window Below Other Windows" = "none,,Keep Window Below Others"; "kwin"."Window Close" = "Alt+F4"; - "kwin"."Window Fullscreen" = []; - "kwin"."Window Grow Horizontal" = []; - "kwin"."Window Grow Vertical" = []; - "kwin"."Window Lower" = []; + "kwin"."Window Fullscreen" = "none,,Make Window Fullscreen"; + "kwin"."Window Grow Horizontal" = "none,,Expand Window Horizontally"; + "kwin"."Window Grow Vertical" = "none,,Expand Window Vertically"; + "kwin"."Window Lower" = "none,,Lower Window"; "kwin"."Window Maximize" = "Meta+PgUp"; - "kwin"."Window Maximize Horizontal" = []; - "kwin"."Window Maximize Vertical" = []; + "kwin"."Window Maximize Horizontal" = "none,,Maximize Window Horizontally"; + "kwin"."Window Maximize Vertical" = "none,,Maximize Window Vertically"; "kwin"."Window Minimize" = "Meta+PgDown"; - "kwin"."Window Move" = []; - "kwin"."Window Move Center" = []; - "kwin"."Window No Border" = []; - "kwin"."Window On All Desktops" = []; + "kwin"."Window Move" = "none,,Move Window"; + "kwin"."Window Move Center" = "none,,Move Window to the Center"; + "kwin"."Window No Border" = "none,,Toggle Window Titlebar and Frame"; + "kwin"."Window On All Desktops" = "none,,Keep Window on All Desktops"; "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; - "kwin"."Window One Screen Down" = []; - "kwin"."Window One Screen Up" = []; - "kwin"."Window One Screen to the Left" = []; - "kwin"."Window One Screen to the Right" = []; + "kwin"."Window One Screen Down" = "none,,Move Window One Screen Down"; + "kwin"."Window One Screen Up" = "none,,Move Window One Screen Up"; + "kwin"."Window One Screen to the Left" = "none,,Move Window One Screen to the Left"; + "kwin"."Window One Screen to the Right" = "none,,Move Window One Screen to the Right"; "kwin"."Window Operations Menu" = "Alt+F3"; - "kwin"."Window Pack Down" = []; - "kwin"."Window Pack Left" = []; - "kwin"."Window Pack Right" = []; - "kwin"."Window Pack Up" = []; + "kwin"."Window Pack Down" = "none,,Move Window Down"; + "kwin"."Window Pack Left" = "none,,Move Window Left"; + "kwin"."Window Pack Right" = "none,,Move Window Right"; + "kwin"."Window Pack Up" = "none,,Move Window Up"; "kwin"."Window Quick Tile Bottom" = "Meta+Down"; - "kwin"."Window Quick Tile Bottom Left" = []; - "kwin"."Window Quick Tile Bottom Right" = []; + "kwin"."Window Quick Tile Bottom Left" = "none,,Quick Tile Window to the Bottom Left"; + "kwin"."Window Quick Tile Bottom Right" = "none,,Quick Tile Window to the Bottom Right"; "kwin"."Window Quick Tile Left" = "Meta+Left"; "kwin"."Window Quick Tile Right" = "Meta+Right"; "kwin"."Window Quick Tile Top" = "Meta+Up"; - "kwin"."Window Quick Tile Top Left" = []; - "kwin"."Window Quick Tile Top Right" = []; - "kwin"."Window Raise" = []; - "kwin"."Window Resize" = []; - "kwin"."Window Shade" = []; - "kwin"."Window Shrink Horizontal" = []; - "kwin"."Window Shrink Vertical" = []; - "kwin"."Window to Desktop 1" = []; - "kwin"."Window to Desktop 10" = []; - "kwin"."Window to Desktop 11" = []; - "kwin"."Window to Desktop 12" = []; - "kwin"."Window to Desktop 13" = []; - "kwin"."Window to Desktop 14" = []; - "kwin"."Window to Desktop 15" = []; - "kwin"."Window to Desktop 16" = []; - "kwin"."Window to Desktop 17" = []; - "kwin"."Window to Desktop 18" = []; - "kwin"."Window to Desktop 19" = []; - "kwin"."Window to Desktop 2" = []; - "kwin"."Window to Desktop 20" = []; - "kwin"."Window to Desktop 3" = []; - "kwin"."Window to Desktop 4" = []; - "kwin"."Window to Desktop 5" = []; - "kwin"."Window to Desktop 6" = []; - "kwin"."Window to Desktop 7" = []; - "kwin"."Window to Desktop 8" = []; - "kwin"."Window to Desktop 9" = []; - "kwin"."Window to Next Desktop" = []; - "kwin"."Window to Next Screen" = "\\, Meta+Shift+Right\\, ,Meta+Shift+Right,Move Window to Next Screen"; - "kwin"."Window to Previous Desktop" = []; - "kwin"."Window to Previous Screen" = "\\, Meta+Shift+Left\\, ,Meta+Shift+Left,Move Window to Previous Screen"; - "kwin"."Window to Screen 0" = []; - "kwin"."Window to Screen 1" = []; - "kwin"."Window to Screen 2" = []; - "kwin"."Window to Screen 3" = []; - "kwin"."Window to Screen 4" = []; - "kwin"."Window to Screen 5" = []; - "kwin"."Window to Screen 6" = []; - "kwin"."Window to Screen 7" = []; - "kwin"."view_actual_size" = ",Meta+0,Zoom to Actual Size"; - "kwin"."view_zoom_in" = ["Meta++\\, Meta++" "Meta+=\\, Zoom In,Meta++" "Meta+=,Zoom In"]; + "kwin"."Window Quick Tile Top Left" = "none,,Quick Tile Window to the Top Left"; + "kwin"."Window Quick Tile Top Right" = "none,,Quick Tile Window to the Top Right"; + "kwin"."Window Raise" = "none,,Raise Window"; + "kwin"."Window Resize" = "none,,Resize Window"; + "kwin"."Window Shade" = "none,,Shade Window"; + "kwin"."Window Shrink Horizontal" = "none,,Shrink Window Horizontally"; + "kwin"."Window Shrink Vertical" = "none,,Shrink Window Vertically"; + "kwin"."Window to Desktop 1" = "none,,Window to Desktop 1"; + "kwin"."Window to Desktop 10" = "none,,Window to Desktop 10"; + "kwin"."Window to Desktop 11" = "none,,Window to Desktop 11"; + "kwin"."Window to Desktop 12" = "none,,Window to Desktop 12"; + "kwin"."Window to Desktop 13" = "none,,Window to Desktop 13"; + "kwin"."Window to Desktop 14" = "none,,Window to Desktop 14"; + "kwin"."Window to Desktop 15" = "none,,Window to Desktop 15"; + "kwin"."Window to Desktop 16" = "none,,Window to Desktop 16"; + "kwin"."Window to Desktop 17" = "none,,Window to Desktop 17"; + "kwin"."Window to Desktop 18" = "none,,Window to Desktop 18"; + "kwin"."Window to Desktop 19" = "none,,Window to Desktop 19"; + "kwin"."Window to Desktop 2" = "none,,Window to Desktop 2"; + "kwin"."Window to Desktop 20" = "none,,Window to Desktop 20"; + "kwin"."Window to Desktop 3" = "none,,Window to Desktop 3"; + "kwin"."Window to Desktop 4" = "none,,Window to Desktop 4"; + "kwin"."Window to Desktop 5" = "none,,Window to Desktop 5"; + "kwin"."Window to Desktop 6" = "none,,Window to Desktop 6"; + "kwin"."Window to Desktop 7" = "none,,Window to Desktop 7"; + "kwin"."Window to Desktop 8" = "none,,Window to Desktop 8"; + "kwin"."Window to Desktop 9" = "none,,Window to Desktop 9"; + "kwin"."Window to Next Desktop" = "none,,Window to Next Desktop"; + "kwin"."Window to Next Screen" = "Meta+Shift+Right"; + "kwin"."Window to Previous Desktop" = "none,,Window to Previous Desktop"; + "kwin"."Window to Previous Screen" = "Meta+Shift+Left"; + "kwin"."Window to Screen 0" = "none,,Move Window to Screen 0"; + "kwin"."Window to Screen 1" = "none,,Move Window to Screen 1"; + "kwin"."Window to Screen 2" = "none,,Move Window to Screen 2"; + "kwin"."Window to Screen 3" = "none,,Move Window to Screen 3"; + "kwin"."Window to Screen 4" = "none,,Move Window to Screen 4"; + "kwin"."Window to Screen 5" = "none,,Move Window to Screen 5"; + "kwin"."Window to Screen 6" = "none,,Move Window to Screen 6"; + "kwin"."Window to Screen 7" = "none,,Move Window to Screen 7"; + "kwin"."view_actual_size" = "\\, Meta+0\\, ,Meta+0,Zoom to Actual Size"; + "kwin"."view_zoom_in" = ["Meta++" "Meta+=,Meta++" "Meta+=,Zoom In"]; "kwin"."view_zoom_out" = "Meta+-"; - "mediacontrol"."mediavolumedown" = "\\, ,,Media volume down"; - "mediacontrol"."mediavolumeup" = []; + "mediacontrol"."mediavolumedown" = []; + "mediacontrol"."mediavolumeup" = "none,,Media volume up"; "mediacontrol"."nextmedia" = "Media Next"; "mediacontrol"."pausemedia" = "Media Pause"; - "mediacontrol"."playmedia" = []; + "mediacontrol"."playmedia" = "none,,Play media playback"; "mediacontrol"."playpausemedia" = "Media Play"; "mediacontrol"."previousmedia" = "Media Previous"; "mediacontrol"."stopmedia" = "Media Stop"; @@ -306,10 +303,10 @@ "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\\, ,Battery" "Meta+B,Switch Power Profile"]; - "plasmashell"."activate application launcher" = ["Meta" "" "Alt+F1\\, ,Meta" "Alt+F1,Activate Application Launcher"]; + "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B,Battery" "Meta+B,Switch Power Profile"]; + "plasmashell"."activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"]; "plasmashell"."activate task manager entry 1" = "Meta+1"; - "plasmashell"."activate task manager entry 10" = "\\, Meta+0\\, ,Meta+0,Activate Task Manager Entry 10"; + "plasmashell"."activate task manager entry 10" = ",Meta+0,Activate Task Manager Entry 10"; "plasmashell"."activate task manager entry 2" = "Meta+2"; "plasmashell"."activate task manager entry 3" = "Meta+3"; "plasmashell"."activate task manager entry 4" = "Meta+4"; @@ -318,23 +315,23 @@ "plasmashell"."activate task manager entry 7" = "Meta+7"; "plasmashell"."activate task manager entry 8" = "Meta+8"; "plasmashell"."activate task manager entry 9" = "Meta+9"; - "plasmashell"."clear-history" = []; + "plasmashell"."clear-history" = "none,,Clear Clipboard History"; "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; "plasmashell"."cycle-panels" = "Meta+Alt+P"; - "plasmashell"."cycleNextAction" = []; - "plasmashell"."cyclePrevAction" = []; + "plasmashell"."cycleNextAction" = "none,,Next History Item"; + "plasmashell"."cyclePrevAction" = "none,,Previous History Item"; "plasmashell"."edit_clipboard" = []; "plasmashell"."manage activities" = "Meta+Q"; - "plasmashell"."next activity" = ",none,Walk through activities"; + "plasmashell"."next activity" = "\\, \\, ,none,Walk through activities"; "plasmashell"."previous activity" = ",none,Walk through activities (Reverse)"; "plasmashell"."repeat_action" = "Meta+Ctrl+R"; "plasmashell"."show dashboard" = "Ctrl+F12"; - "plasmashell"."show-barcode" = []; + "plasmashell"."show-barcode" = "none,,Show Barcode…"; "plasmashell"."show-on-mouse-pos" = "Meta+V"; "plasmashell"."stop current activity" = "Meta+S"; - "plasmashell"."switch to next activity" = []; - "plasmashell"."switch to previous activity" = []; - "plasmashell"."toggle do not disturb" = []; + "plasmashell"."switch to next activity" = "none,,Switch to Next Activity"; + "plasmashell"."switch to previous activity" = "none,,Switch to Previous Activity"; + "plasmashell"."toggle do not disturb" = "none,,Toggle do not disturb"; "services/org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Ctrl+Shift+Space" "Search"]; "services/org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; "services/org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; @@ -375,7 +372,6 @@ "dolphinrc"."ExtractDialog"."1920x1080 screen: Height" = 540; "dolphinrc"."ExtractDialog"."1920x1080 screen: Width" = 1260; "dolphinrc"."ExtractDialog"."DirHistoryx5b$ex5d" = "/home/"; - "dolphinrc"."General"."ConfirmClosingTerminalRunningProgram" = false; "dolphinrc"."General"."RememberOpenedTabs" = false; "dolphinrc"."General"."ViewPropsTimestamp" = "2024,8,28,22,44,37.273"; "dolphinrc"."IconsMode"."PreviewSize" = 80; @@ -449,7 +445,7 @@ "katerc"."KTextEditor View"."Backspace Remove Composed Characters" = false; "katerc"."KTextEditor View"."Bookmark Menu Sorting" = 0; "katerc"."KTextEditor View"."Bracket Match Preview" = false; - "katerc"."KTextEditor View"."Chars To Enclose Selection" = "<>(){}\x5b\x5d'\""; + "katerc"."KTextEditor View"."Chars To Enclose Selection" = "<>(){}x5bx5d'\""; "katerc"."KTextEditor View"."Default Mark Type" = 1; "katerc"."KTextEditor View"."Dynamic Word Wrap" = true; "katerc"."KTextEditor View"."Dynamic Word Wrap Align Indent" = 80; @@ -524,6 +520,8 @@ "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; "kdeglobals"."General"."LastUsedCustomAccentColor" = "184,117,220"; + "kdeglobals"."General"."TerminalApplication" = "foot"; + "kdeglobals"."General"."TerminalService" = "org.codeberg.dnkl.foot.desktop"; "kdeglobals"."General"."XftAntialias" = true; "kdeglobals"."General"."XftHintStyle" = "hintslight"; "kdeglobals"."General"."XftSubPixel" = "rgb"; @@ -1139,23 +1137,19 @@ "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; "plasmanotifyrc"."Applications/firefox"."Seen" = true; + "plasmanotifyrc"."Applications/floorp"."Seen" = true; "plasmanotifyrc"."Applications/org.qbittorrent.qBittorrent"."Seen" = true; + "plasmanotifyrc"."Applications/vesktop"."Seen" = true; "plasmanotifyrc"."Applications/webcord"."Seen" = true; "plasmarc"."Wallpapers"."usersWallpapers" = ""; + "spectaclerc"."Annotations"."annotationToolType" = 9; + "spectaclerc"."ImageSave"."lastImageSaveLocation" = "file:///home/lillian/Pictures/Screenshots/Screenshot_20241017_154815.png"; "spectaclerc"."ImageSave"."translatedScreenshotsFolder" = "Screenshots"; "spectaclerc"."VideoSave"."translatedScreencastsFolder" = "Screencasts"; "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; }; dataFile = { "dolphin/view_properties/global/.directory"."Settings"."HiddenFilesShown" = true; - "kate/anonymous.katesession"."Document 0"."Bookmarks" = ""; - "kate/anonymous.katesession"."Document 0"."Encoding" = "UTF-8"; - "kate/anonymous.katesession"."Document 0"."Highlighting" = "None"; - "kate/anonymous.katesession"."Document 0"."Highlighting Set By User" = false; - "kate/anonymous.katesession"."Document 0"."Indentation Mode" = "normal"; - "kate/anonymous.katesession"."Document 0"."Mode" = "Normal"; - "kate/anonymous.katesession"."Document 0"."Mode Set By User" = false; - "kate/anonymous.katesession"."Document 0"."URL" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; "kate/anonymous.katesession"."Kate Plugins"."cmaketoolsplugin" = false; "kate/anonymous.katesession"."Kate Plugins"."compilerexplorer" = false; "kate/anonymous.katesession"."Kate Plugins"."eslintplugin" = false; @@ -1187,26 +1181,25 @@ "kate/anonymous.katesession"."Kate Plugins"."rainbowparens" = false; "kate/anonymous.katesession"."Kate Plugins"."tabswitcherplugin" = true; "kate/anonymous.katesession"."Kate Plugins"."textfilterplugin" = true; - "kate/anonymous.katesession"."MainWindow0"."1920x1080 screen: Window-Maximized" = true; "kate/anonymous.katesession"."MainWindow0"."2 screens: Window-Maximized" = true; "kate/anonymous.katesession"."MainWindow0"."Active ViewSpace" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-H-Splitter" = "0,1874,0"; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-H-Splitter" = "0,2514,0"; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Bar-0-TvList" = "kate_private_plugin_katefiletreeplugin,kateproject,kateprojectgit,lspclient_symbol_outline"; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-LastSize" = 200; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Splitter" = 929; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Splitter" = 1287; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Bar-0-TvList" = ""; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-LastSize" = 200; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Splitter" = 929; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Splitter" = 1287; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Bar-0-TvList" = ""; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-LastSize" = 200; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Splitter" = 1874; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Splitter" = 2514; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Bar-0-TvList" = "output,diagnostics,kate_plugin_katesearch,kateprojectinfo,kate_private_plugin_katekonsoleplugin"; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-LastSize" = 200; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Splitter" = 1634; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Splitter" = 2560; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Style" = 2; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Visible" = true; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Position" = 3; @@ -1236,34 +1229,19 @@ "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Position" = 3; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Show-Button-In-Sidebar" = true; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-V-Splitter" = "0,927,0"; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-V-Splitter" = "0,1285,0"; "kate/anonymous.katesession"."MainWindow0"."MenuBar" = "Disabled"; "kate/anonymous.katesession"."MainWindow0"."ToolBarsMovable" = "Disabled"; - "kate/anonymous.katesession"."MainWindow0 Settings"."1920x1080 screen: Window-Maximized" = true; "kate/anonymous.katesession"."MainWindow0 Settings"."2 screens: Window-Maximized" = true; "kate/anonymous.katesession"."MainWindow0 Settings"."MenuBar" = "Disabled"; "kate/anonymous.katesession"."MainWindow0 Settings"."ToolBarsMovable" = "Disabled"; "kate/anonymous.katesession"."MainWindow0 Settings"."WindowState" = 10; "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Children" = "MainWindow0-ViewSpace 0"; "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Orientation" = 1; - "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Sizes" = 1874; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Active View" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Count" = 1; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Documents" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."View 0" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."CursorColumn" = 33; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."CursorLine" = 350; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."Dynamic Word Wrap" = true; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."JumpList" = ""; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."TextFolding" = "{\"checksum\":\"74be57c9991161c81bdaf706a15a5e808c32f8ba\",\"ranges\":[]}"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."ViMarks" = ""; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."CursorColumn" = 0; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."CursorLine" = 0; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."Dynamic Word Wrap" = true; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."JumpList" = ""; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."TextFolding" = "{\"checksum\":\"f5613e44db950aa2dd0b0ddcb25af701642f2f7b\",\"ranges\":\x5b\x5d}"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."ViMarks" = ""; - "kate/anonymous.katesession"."Open Documents"."Count" = 1; + "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Sizes" = 2514; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Count" = 0; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Documents" = ""; + "kate/anonymous.katesession"."Open Documents"."Count" = 0; "kate/anonymous.katesession"."Open MainWindows"."Count" = 1; "kate/anonymous.katesession"."Plugin:kateprojectplugin:"."projects" = ""; "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."BinaryFiles" = false; diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index c71456a..ce503f7 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -29,7 +29,7 @@ programs.mangohud = { enable = true; - enableSessionWide = true; + # enableSessionWide = true; }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index f0a5c0d..232f5d7 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -52,7 +52,7 @@ home.packages = with pkgs; [ #Chat: - webcord-vencord + vesktop #Gaming: prismlauncher diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 4a6ced0..799caca 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -31,5 +31,10 @@ zsh bat btop + broot + lazygit + navi + yazi ]; + programs.navi.enable = true; } diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index ab4b3f3..76304ef 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -3,13 +3,33 @@ lib, pkgs, ... -}: { +}: let + yazi = + pkgs.writeText "open_in_helix_from_yazi.zsh" + '' + #! ~/.nix-profile/bin/zsh + files=(''${(fqq)"$( yazi --chooser-file=/dev/stdout | cat )"}) + zellij action toggle-floating-panes + zellij action write 27 # send escape-key + zellij action write-chars ":open $files" + zellij action write 13 # send enter-key + zellij action toggle-floating-panes + zellij action close-pane + ''; +in { programs.helix = { enable = true; defaultEditor = true; settings = { # theme = "catppuccin_macchiato"; # Don't need this because the module themes it for us + keys.normal.backspace = { + b = ":sh zellij run -f -n 'build code' -- direnv exec . just build"; + r = ":sh zellij run -f -n 'run code' -- direnv exec . just run"; + t = ":sh zellij run -f -n 'test code' -- direnv exec . just test"; + g = ":sh zellij run -fc -n 'lazygit' -- lazygit"; + f = ":sh zellij run --floating -n 'yazi picker' -- zsh ~/.config/helix/open_in_helix_from_yazi.zsh "; + }; editor = { line-number = "relative"; lsp.display-messages = true; @@ -158,4 +178,11 @@ target = ".config/helix/external-snippets.toml"; }; }; + + home.file = { + "yazi" = { + source = "${yazi}"; + target = ".config/helix/open_in_helix_from_yazi.zsh"; + }; + }; } diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index cc38d8f..a3108ff 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -67,10 +67,11 @@ "zsh-navigation-tools" ]; }; - # stuff for zoxide & tre + # Extra commands that take more complex forms initExtra = '' eval "$(zoxide init --cmd cd zsh)" tre() { command tre "$@" -e && source "/tmp/tre_aliases_$USER" 2>/dev/null; } + zhx() { command zellij action new-tab --layout $HOME/.config/zellij/layouts/helix.kdl; } ''; }; } diff --git a/justfile b/justfile new file mode 100644 index 0000000..b0aad0e --- /dev/null +++ b/justfile @@ -0,0 +1,11 @@ +build: + sudo nixos-rebuild switch --flake .# --show-trace + +run: + nix-repl -f flake:nixpkgs + +test: + sudo nix flake check --show-trace + +update: + nix flake update diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 9b79122..998fdde 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -84,6 +84,7 @@ }; }; + virtualisation.waydroid.enable = true; networking.hostName = "GLaDOS"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion diff --git a/nixos/server/package-configs/nextcloud/default.nix b/nixos/server/package-configs/nextcloud/default.nix index 483401b..a3ed25a 100644 --- a/nixos/server/package-configs/nextcloud/default.nix +++ b/nixos/server/package-configs/nextcloud/default.nix @@ -49,7 +49,7 @@ enable = true; hostName = "nextcloud.gladtherescake.eu"; - package = pkgs.nextcloud29; + package = pkgs.nextcloud30; # Use HTTPS for links https = true; diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 1138ad2..a845b75 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -43,12 +43,14 @@ "https://nix-community.cachix.org" "https://nixpkgs-unfree.cachix.org" "https://0uptime.cachix.org" + "https://attic.kennel.juneis.dog/conduit" ]; trusted-public-keys = [ "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" "0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE=" + "conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk=" ]; }; }; diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 307e099..6f28f40 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -36,6 +36,7 @@ helix home-manager htop + just killall oh-my-zsh rsync @@ -53,6 +54,7 @@ fonts = { packages = with pkgs; [ + noto-fonts-emoji-blob-bin cantarell-fonts dejavu_fonts fira-code @@ -66,6 +68,7 @@ twemoji-color-font font-awesome atkinson-hyperlegible + fira-code-nerdfont ]; enableDefaultPackages = false; };