diff --git a/flake.lock b/flake.lock index c89e0f5..3897e8c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,26 @@ { "nodes": { + "aerothemeplasma-nix": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1771215876, + "narHash": "sha256-aei7McII5+y4tROXfmOVyLbPO62sWttNkOKUlCSEIcg=", + "owner": "nyakase", + "repo": "aerothemeplasma-nix", + "rev": "b922785202501754c4503232aa5f172aeaef8b00", + "type": "github" + }, + "original": { + "owner": "nyakase", + "repo": "aerothemeplasma-nix", + "type": "github" + } + }, "apple-silicon": { "inputs": { "flake-compat": "flake-compat", @@ -151,6 +172,24 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -171,7 +210,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nur", @@ -293,7 +332,7 @@ "cachyos-kernel": "cachyos-kernel", "cachyos-kernel-patches": "cachyos-kernel-patches", "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" ] @@ -343,6 +382,21 @@ "type": "github" } }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1769598131, @@ -377,7 +431,7 @@ }, "nixvim": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "nixpkgs": [ "nixpkgs" ], @@ -419,7 +473,7 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "nixpkgs": [ "nixpkgs" ] @@ -479,6 +533,7 @@ }, "root": { "inputs": { + "aerothemeplasma-nix": "aerothemeplasma-nix", "apple-silicon": "apple-silicon", "base16": "base16", "base16-discord": "base16-discord", diff --git a/flake.nix b/flake.nix index feffaa3..4aba175 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,11 @@ inputs.home-manager.follows = "home-manager"; }; + aerothemeplasma-nix = { + url = "github:nyakase/aerothemeplasma-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + niri = { url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; @@ -97,6 +102,7 @@ base16-discord, home-manager, plasma-manager, + aerothemeplasma-nix, niri, noctalia, spicetify-nix, @@ -214,6 +220,7 @@ ./system/tailscale ./system/hosts/${hostname} ./hardware/${hostname} + aerothemeplasma-nix.nixosModules.aerothemeplasma-nix niri.nixosModules.niri home-manager.nixosModules.home-manager noctalia.nixosModules.default @@ -242,6 +249,7 @@ scheme = "${tt-schemes}/base24/${config.colors.scheme}.yaml"; } ) + aerothemeplasma-nix.homeModules.aerothemeplasma-nix plasma-manager.homeModules.plasma-manager noctalia.homeModules.default spicetify-nix.homeManagerModules.default diff --git a/home/default.nix b/home/default.nix index d49376d..7bc7bd8 100755 --- a/home/default.nix +++ b/home/default.nix @@ -89,21 +89,6 @@ }; }; - # programs.plasma = { - # workspace = { - # colorScheme = "Catppuccin${config.catppuccinUpper.flavor}${config.catppuccinUpper.accent}"; - # cursor.theme = "catppuccin-${config.catppuccin.flavor}-${config.catppuccin.accent}-cursors"; - # splashScreen.theme = "Catpppuccin-${config.catppuccinUpper.flavor}-${config.catppuccinUpper.accent}"; - # }; - - # configFile = { - # kdeglobals.KDE = { - # DefaultDarkLookAndFeel = "Catpppuccin-${config.catppuccinUpper.flavor}-${config.catppuccinUpper.accent}"; - # DefaultLightLookAndFeel = "Catpppuccin-Latte-${config.catppuccinUpper.accent}"; - # }; - # }; - # }; - # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage # when a new Home Manager release introduces backwards diff --git a/home/hosts/alien/default.nix b/home/hosts/alien/default.nix index ca2572a..513501e 100644 --- a/home/hosts/alien/default.nix +++ b/home/hosts/alien/default.nix @@ -1,6 +1,7 @@ { config, pkgs, + lib, pkgs-unstable, spicetify-nix, ... @@ -51,72 +52,4 @@ theme = spicePkgs.themes.catppuccin; colorScheme = "mocha"; }; - - programs.plasma = { - panels = [ - # Alternative global menu to fit the modified taskbar - { - location = "bottom"; - height = 40; - hiding = "dodgewindows"; - lengthMode = "fit"; - floating = true; - alignment = "right"; - widgets = [ - "org.kde.plasma.appmenu" - { - plasmusicToolbar = { - panelIcon = { - albumCover = { - useAsIcon = false; - radius = 8; - }; - icon = "view-media-track"; - }; - playbackSource = "auto"; - musicControls.showPlaybackControls = true; - songText = { - displayInSeparateLines = true; - maximumWidth = 640; - 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/hosts/peach/default.nix b/home/hosts/peach/default.nix index 029415a..1415982 100644 --- a/home/hosts/peach/default.nix +++ b/home/hosts/peach/default.nix @@ -1,7 +1,12 @@ -{ pkgs, config, ... }: +{ + pkgs, + config, + lib, + ... +}: { colors = { - scheme = "catppuccin-mocha"; + scheme = "catppuccin-latte"; accent = "base09"; }; @@ -24,7 +29,7 @@ density = "spacious"; }; - programs.plasma = { + programs.plasma = lib.mkDefault { input.touchpads = [ { name = "Apple MTP multi-touch"; @@ -42,97 +47,5 @@ # this is really annoying on apple laptops org_kde_powerdevil.Sleep = [ ]; }; - - panels = [ - # Application name, Global menu and Song information and playback controls at the top - { - location = "top"; - height = 42; # 37 for 200%, 42 for 175% - 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 = true; - radius = 2; - }; - }; - playbackSource = "auto"; - musicControls.showPlaybackControls = false; - songText = { - displayInSeparateLines = true; - maximumWidth = 250; - 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 index ce1437e..e383cf5 100644 --- a/home/kde/default.nix +++ b/home/kde/default.nix @@ -1,6 +1,7 @@ { config, pkgs, + lib, ... }: { @@ -22,21 +23,19 @@ }; }; - programs.plasma = { + aerothemeplasma = { enable = true; - overrideConfig = true; + plasma.enable = true; + fonts.enable = true; + }; + programs.plasma = lib.mkDefault { + enable = true; session = { sessionRestore.restoreOpenApplicationsOnLogin = "startWithEmptySession"; }; workspace = { - iconTheme = config.gtk.iconTheme.name; - windowDecorations = { - library = "org.kde.breeze"; - theme = "Breeze"; - }; - cursor.size = 24; wallpaperPictureOfTheDay.provider = "bing"; wallpaperFillMode = "preserveAspectCrop"; }; @@ -164,19 +163,6 @@ ]; kwin = { - titlebarButtons = { - left = [ - "on-all-desktops" - "keep-below-windows" - "keep-above-windows" - ]; - right = [ - "minimize" - "maximize" - "close" - ]; - }; - nightLight = { enable = true; mode = "location"; @@ -197,25 +183,16 @@ rows = 1; }; effects = { - desktopSwitching = { - animation = "slide"; - navigationWrapping = true; - }; - dimAdminMode.enable = true; - # dimInactive.enable = true; + # desktopSwitching = { + # animation = "slide"; + # navigationWrapping = true; + # }; minimization = { animation = "magiclamp"; duration = 500; }; shakeCursor.enable = true; snapHelper.enable = true; - # translucency.enable = true; - # windowOpenClose.animation = "fade"; - blur = { - enable = true; - noiseStrength = 8; - strength = 5; - }; }; }; @@ -250,38 +227,5 @@ kwinrc.Effect-blurplus.RefractionStrength = 10; ksplashrc.KSplash.Engine = "KSplashQML"; }; - - panels = [ - # Small dock at the bottom right - { - location = "bottom"; - height = 40; - hiding = "dodgewindows"; - lengthMode = "fit"; - floating = true; - alignment = "left"; - widgets = [ - { - kickoff = { - sortAlphabetically = true; - # icon = "nix-snowflake-white"; - }; - } - { - iconTasks = { - launchers = [ - "applications:firefox.desktop" - "applications:org.kde.dolphin.desktop" - "applications:vesktop.desktop" - "applications:kitty.desktop" - "applications:org.strawberrymusicplayer.strawberry.desktop" - "applications:writer.desktop" - ]; - }; - } - "org.kde.plasma.pager" - ]; - } - ]; }; } diff --git a/system/default.nix b/system/default.nix index 66c9a43..5f86afb 100755 --- a/system/default.nix +++ b/system/default.nix @@ -118,10 +118,23 @@ ]; }; + aerothemeplasma = { + enable = true; + plasma.enable = true; + fonts.enable = false; + plymouth.enable = false; + sddm.enable = true; + }; + services = { + # displayManager = { + # gdm.enable = true; + # defaultSession = "niri"; + # }; + desktopManager.plasma6.enable = true; displayManager = { - gdm.enable = true; - defaultSession = "niri"; + sddm.enable = true; + defaultSession = "aerothemeplasma"; }; libinput.enable = true;