diff --git a/flake.lock b/flake.lock index 953b233..cc6c49b 100644 --- a/flake.lock +++ b/flake.lock @@ -856,29 +856,6 @@ "type": "gitlab" } }, - "plasma-manager": { - "inputs": { - "home-manager": [ - "home-manager" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1772361940, - "narHash": "sha256-B1Cz+ydL1iaOnGlwOFld/C8lBECPtzhiy/pP93/CuyY=", - "owner": "nix-community", - "repo": "plasma-manager", - "rev": "a4b33606111c9c5dcd10009042bb710307174f51", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "plasma-manager", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -920,7 +897,6 @@ "noctalia": "noctalia", "nur": "nur", "openmw": "openmw", - "plasma-manager": "plasma-manager", "tt-schemes": "tt-schemes" } }, diff --git a/flake.nix b/flake.nix index 43c12fd..e278b32 100644 --- a/flake.nix +++ b/flake.nix @@ -22,12 +22,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - plasma-manager = { - url = "github:nix-community/plasma-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.home-manager.follows = "home-manager"; - }; - niri = { url = "github:sckova/niri-flake/feat/blur"; inputs.nixpkgs.follows = "nixpkgs-unstable"; @@ -75,7 +69,6 @@ base16, tt-schemes, home-manager, - plasma-manager, niri, hyprland, noctalia, @@ -206,7 +199,6 @@ ./home/apps ./home/games ./home/hosts/${hostname} - # ./home/kde ./home/services ./home/terminal ./home/tiling @@ -220,7 +212,6 @@ scheme = "${tt-schemes}/base24/${config.colors.scheme}.yaml"; } ) - plasma-manager.homeModules.plasma-manager noctalia.homeModules.default nixvim.homeModules.nixvim ]; @@ -257,7 +248,6 @@ ./home ./home/hosts/${hostname}.nix home-manager.homeModules.home-manager - plasma-manager.homeModules.plasma-manager niri.homeModules.default noctalia.homeModules.noctalia nixvim.homeModules.nixvim diff --git a/home/apps/firefox.nix b/home/apps/firefox.nix index 368894f..38250db 100644 --- a/home/apps/firefox.nix +++ b/home/apps/firefox.nix @@ -104,7 +104,6 @@ "uBlock0@raymondhill.net".installation_mode = "allowed"; "gdpr@cavi.au.dk".installation_mode = "allowed"; "{5cce4ab5-3d47-41b9-af5e-8203eea05245}".installation_mode = "allowed"; - "plasma-browser-integration@kde.org".installation_mode = "allowed"; "jid1-MnnxcxisBPnSXQ@jetpack".installation_mode = "allowed"; "firefoxpwa@filips.si".installation_mode = "allowed"; "sponsorBlocker@ajay.app".installation_mode = "allowed"; @@ -142,7 +141,6 @@ force = true; packages = with pkgs.nur.repos.rycee.firefox-addons; [ ublock-origin - plasma-integration stylus violentmonkey consent-o-matic @@ -228,7 +226,6 @@ "jid1-mnnxcxisbpnsxq_jetpack-browser-action" "gdpr_cavi_au_dk-browser-action" "firefoxpwa_filips_si-browser-action" - "plasma-browser-integration_kde_org-browser-action" "canvasblocker_kkapsner_de-browser-action" "_5cce4ab5-3d47-41b9-af5e-8203eea05245_-browser-action" "_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action" @@ -252,7 +249,6 @@ seen = [ "gdpr_cavi_au_dk-browser-action" "firefoxpwa_filips_si-browser-action" - "plasma-browser-integration_kde_org-browser-action" "jid1-mnnxcxisbpnsxq_jetpack-browser-action" "canvasblocker_kkapsner_de-browser-action" "_5cce4ab5-3d47-41b9-af5e-8203eea05245_-browser-action" diff --git a/home/hosts/peach/default.nix b/home/hosts/peach/default.nix index dee4f54..9820702 100644 --- a/home/hosts/peach/default.nix +++ b/home/hosts/peach/default.nix @@ -36,25 +36,5 @@ y = 1440; }; }; - - plasma = lib.mkDefault { - input.touchpads = [ - { - name = "Apple MTP multi-touch"; - vendorId = "05ac"; - productId = "0352"; - disableWhileTyping = false; - enable = true; - tapToClick = false; - naturalScroll = true; - accelerationProfile = "default"; - } - ]; - - shortcuts = { - # this is really annoying on apple laptops - org_kde_powerdevil.Sleep = [ ]; - }; - }; }; } diff --git a/home/hosts/vm-generic/default.nix b/home/hosts/vm-generic/default.nix index e5488aa..6572e4a 100644 --- a/home/hosts/vm-generic/default.nix +++ b/home/hosts/vm-generic/default.nix @@ -8,101 +8,4 @@ scheme = "catppuccin-mocha"; accent = "base0B"; }; - - home.packages = with pkgs; [ ]; - - programs.plasma = { - panels = [ - # Application name, Global menu and Song information and playback controls at the top - { - location = "top"; - height = 37; - floating = false; - widgets = [ - { - applicationTitleBar = { - behavior = { - activeTaskSource = "activeTask"; - }; - layout = { - elements = [ "windowTitle" ]; - horizontalAlignment = "right"; - showDisabledElements = "deactivated"; - verticalAlignment = "center"; - }; - overrideForMaximized.enable = false; - windowTitle = { - font = { - bold = false; - fit = "fixedSize"; - size = 10; - }; - hideEmptyTitle = true; - margins = { - bottom = 5; - left = 10; - right = 0; - top = 5; - }; - source = "appName"; - }; - }; - } - "org.kde.plasma.appmenu" - "org.kde.plasma.panelspacer" - { - plasmusicToolbar = { - panelIcon = { - albumCover = { - useAsIcon = false; - radius = 8; - }; - icon = ""; - }; - playbackSource = "auto"; - musicControls.showPlaybackControls = false; - songText = { - displayInSeparateLines = true; - maximumWidth = 320; - scrolling = { - behavior = "alwaysScroll"; - speed = 3; - }; - }; - }; - } - "org.kde.plasma.marginsseparator" - { - systemTray.items = { - shown = [ - "org.kde.plasma.battery" - "org.kde.plasma.bluetooth" - "org.kde.plasma.networkmanagement" - "org.kde.plasma.brightness" - "org.kde.plasma.volume" - ]; - hidden = [ - "org.kde.plasma.clipboard" - "org.kde.plasma.manage-inputmethod" - "org.kde.plasma.cameraindicator" - "org.kde.plasma.keyboardlayout" - "org.kde.plasma.devicenotifier" - "org.kde.plasma.notifications" - "org.kde.plasma.weather" - "org.kde.plasma.printmanager" - "org.kde.plasma.keyboardindicator" - "org.kde.plasma.mediacontroller" - ]; - }; - } - { - digitalClock = { - calendar.firstDayOfWeek = "sunday"; - time.format = "12h"; - }; - } - ]; - } - ]; - }; } diff --git a/home/kde/default.nix b/home/kde/default.nix deleted file mode 100644 index 59153a0..0000000 --- a/home/kde/default.nix +++ /dev/null @@ -1,225 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -{ - programs.ghostwriter = { - enable = true; - font = { - family = config.userOptions.fontSans.name; - pointSize = config.userOptions.fontSans.size; - }; - }; - - programs.kate = { - enable = true; - editor = { - font = { - family = config.userOptions.fontMono.name; - pointSize = config.userOptions.fontMono.size; - }; - }; - }; - - programs.plasma = lib.mkDefault { - enable = true; - session = { - sessionRestore.restoreOpenApplicationsOnLogin = "startWithEmptySession"; - }; - - workspace = { - wallpaperPictureOfTheDay.provider = "bing"; - wallpaperFillMode = "preserveAspectCrop"; - }; - - kscreenlocker = { - appearance.wallpaperPictureOfTheDay.provider = "bing"; - }; - - window-rules = [ - { - description = "Global Changes"; - match = { - window-class = { - value = ""; - type = "substring"; - }; - window-types = [ "normal" ]; - }; - apply = { - opacityactive = { - value = 100; - apply = "force"; - }; - opacityinactive = { - value = 100; - apply = "force"; - }; - }; - } - { - description = "OpenMW"; - match = { - window-class = { - value = "openmw"; - type = "substring"; - }; - window-types = [ "normal" ]; - }; - apply = { - noborder = { - value = true; - apply = "force"; - }; - maximizehoriz = { - value = true; - apply = "force"; - }; - maximizevert = { - value = true; - apply = "force"; - }; - desktops = { - value = "Desktop_4"; - apply = "force"; - }; - }; - } - { - description = "Minecraft"; - match = { - window-class = { - value = "Minecraft*"; - type = "substring"; - }; - window-types = [ "normal" ]; - }; - apply = { - noborder = { - value = true; - apply = "initially"; - }; - maximizehoriz = { - value = true; - apply = "initially"; - }; - maximizevert = { - value = true; - apply = "initially"; - }; - desktops = { - value = "Desktop_4"; - apply = "initially"; - }; - }; - } - { - description = "Picture-in-Picture"; - match = { - window-class = { - value = ""; - type = "substring"; - }; - title = { - value = "(?i)picture[- ]in[- ]picture"; - type = "regex"; - }; - }; - apply = { - above = { - value = true; - apply = "force"; - }; - desktops = { - value = "\\0"; - apply = "force"; - }; - }; - } - { - description = "Steam (Distrobox)"; - match = { - window-class = { - value = "steamwebhelper"; - type = "substring"; - }; - window-types = [ "normal" ]; - }; - apply = { - desktopfile = { - value = "distrobox-steam"; - apply = "force"; - }; - }; - } - ]; - - kwin = { - nightLight = { - enable = true; - mode = "location"; - # Atlanta - location.latitude = "33.7501"; - location.longitude = "-84.3885"; - temperature.day = 6000; - temperature.night = 3500; - transitionTime = 60; - }; - virtualDesktops = { - names = [ - "1" - "2" - "3" - "4" - ]; - rows = 1; - }; - effects = { - # desktopSwitching = { - # animation = "slide"; - # navigationWrapping = true; - # }; - minimization = { - animation = "magiclamp"; - duration = 500; - }; - shakeCursor.enable = true; - snapHelper.enable = true; - }; - }; - - configFile = { - # KDE has an automatic light-dark that CURRENTLY - # isn't supported by plasma-manager. - # kdeglobals.KDE.AutomaticLookAndFeel = true; - # DefaultDarkLookAndFeel = "Catppuccin-Flavor-Accent"; - # DefaultLightLookAndFeel = "Catppuccin-Flavor-Accent"; - kwinrc.Round-Corners.ActiveOutlinePalette = 2; - kwinrc.Round-Corners.ActiveOutlineUseCustom = false; - kwinrc.Round-Corners.ActiveOutlineUsePalette = true; - kwinrc.Round-Corners.ActiveSecondOutlinePalette = 2; - kwinrc.Round-Corners.ActiveSecondOutlineUseCustom = false; - kwinrc.Round-Corners.ActiveSecondOutlineUsePalette = true; - kwinrc.Round-Corners.InactiveOutlinePalette = 3; - kwinrc.Round-Corners.InactiveOutlineUseCustom = false; - kwinrc.Round-Corners.InactiveOutlineUsePalette = true; - kwinrc.Round-Corners.InactiveSecondOutlinePalette = 3; - kwinrc.Round-Corners.InactiveSecondOutlineUseCustom = false; - kwinrc.Round-Corners.InactiveSecondOutlineUsePalette = true; - plasmaparc.General.AudioFeedback = false; - kdeglobals.Sounds.Enable = false; - kwinrc.Plugins.forceblurEnabled = false; - kwinrc.Effect-blurplus.BlurDecorations = true; - kwinrc.Effect-blurplus.BlurMatching = false; - kwinrc.Effect-blurplus.BlurMenus = true; - kwinrc.Effect-blurplus.BlurNonMatching = true; - kwinrc.Effect-blurplus.TopCornerRadius = 10; - kwinrc.Effect-blurplus.BottomCornerRadius = 10; - kwinrc.Effect-blurplus.NoiseStrength = 6; - kwinrc.Effect-blurplus.RefractionStrength = 10; - ksplashrc.KSplash.Engine = "KSplashQML"; - }; - }; -} diff --git a/home/services/default.nix b/home/services/default.nix index ed05a05..d3e47b8 100644 --- a/home/services/default.nix +++ b/home/services/default.nix @@ -11,10 +11,8 @@ ]; home.packages = with pkgs; [ - # kde and kde theming adwaita-icon-theme morewaita-icon-theme - # kde-rounded-corners ]; home.file = { diff --git a/home/terminal/fish.nix b/home/terminal/fish.nix index 494b516..733a01c 100644 --- a/home/terminal/fish.nix +++ b/home/terminal/fish.nix @@ -32,10 +32,6 @@ description = "Wrapper for nix-shell that runs fish by default"; body = builtins.readFile ./fish_functions/nix-shell.fish; }; - logout = { - description = "Log out of KDE Plasma"; - body = builtins.readFile ./fish_functions/logout.fish; - }; }; }; diff --git a/home/terminal/fish_functions/logout.fish b/home/terminal/fish_functions/logout.fish deleted file mode 100644 index 9dcc3e0..0000000 --- a/home/terminal/fish_functions/logout.fish +++ /dev/null @@ -1,5 +0,0 @@ -if status is-login - builtin exit -else - /run/current-system/sw/bin/qdbus org.kde.Shutdown /Shutdown org.kde.Shutdown.logout -end