diff --git a/flake.lock b/flake.lock index a13c21e7..0ad52872 100644 --- a/flake.lock +++ b/flake.lock @@ -18,22 +18,6 @@ "url": "https://git.chn.moe/chn/blog-public.git" } }, - "blurred-wallpaper": { - "flake": false, - "locked": { - "lastModified": 1746480265, - "narHash": "sha256-A1xKQy6ufGrW4yVGkYb8zBqRuQFFxtowCbao2GOP150=", - "owner": "bouteillerAlan", - "repo": "blurredwallpaper", - "rev": "6fa32cc6062c4852b9abb83f590314a2cab9b5ad", - "type": "github" - }, - "original": { - "owner": "bouteillerAlan", - "repo": "blurredwallpaper", - "type": "github" - } - }, "bscpkgs": { "inputs": { "nixpkgs": [ @@ -839,7 +823,6 @@ "root": { "inputs": { "blog": "blog", - "blurred-wallpaper": "blurred-wallpaper", "bscpkgs": "bscpkgs", "cachyos-lts": "cachyos-lts", "catppuccin": "catppuccin", @@ -875,7 +858,6 @@ "py4vasp": "py4vasp", "rsshub": "rsshub", "rycee": "rycee", - "shadowrz": "shadowrz", "sops-nix": "sops-nix", "sqlite-orm": "sqlite-orm", "stickerpicker": "stickerpicker", @@ -918,26 +900,6 @@ "type": "gitlab" } }, - "shadowrz": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1748056260, - "narHash": "sha256-bcUxYhdC/wCw20DeU3tHgdc80JLOAIsKUULH37fdU/M=", - "owner": "ShadowRZ", - "repo": "nur-packages", - "rev": "0c35cdecdf6ecec27c69810ca9f0346fca7c2ee8", - "type": "github" - }, - "original": { - "owner": "ShadowRZ", - "repo": "nur-packages", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index c82d9028..6009eb5d 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,6 @@ bscpkgs = { url = "github:CHN-beta/bscpkgs"; inputs.nixpkgs.follows = "nixpkgs"; }; cachyos-lts.url = "github:drakon64/nixos-cachyos-kernel"; nixvirt = { url = "github:CHN-beta/NixVirt"; inputs.nixpkgs.follows = "nixpkgs"; }; - shadowrz = { url = "github:ShadowRZ/nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; }; misskey = { url = "git+https://github.com/CHN-beta/misskey?submodules=1"; flake = false; }; rsshub = { url = "github:DIYgod/RSSHub"; flake = false; }; @@ -41,7 +40,6 @@ tgbot-cpp = { url = "github:reo7sp/tgbot-cpp"; flake = false; }; v-sim = { url = "gitlab:l_sim/v_sim/master"; flake = false; }; rycee = { url = "gitlab:rycee/nur-expressions"; flake = false; }; - blurred-wallpaper = { url = "github:bouteillerAlan/blurredwallpaper"; flake = false; }; lepton = { url = "github:black7375/Firefox-UI-Fix"; flake = false; }; mumax = { url = "github:CHN-beta/mumax"; flake = false; }; openxlsx = { url = "github:troldal/OpenXLSX"; flake = false; }; diff --git a/modules/packages/desktop.nix b/modules/packages/desktop.nix index 5474f175..bb6c8376 100644 --- a/modules/packages/desktop.nix +++ b/modules/packages/desktop.nix @@ -29,8 +29,6 @@ inputs: mpv nomacs simplescreenrecorder imagemagick gimp-with-plugins qcm waifu2x-converter-cpp blender paraview vlc obs-studio (inkscape-with-extensions.override { inkscapeExtensions = null; }) kdePackages.kcolorchooser kdePackages.kdenlive - # themes - klassy-qt6 localPackages.blurred-wallpaper # development adb-sync scrcpy dbeaver-bin aircrack-ng fprettify # password and key management diff --git a/modules/system/nixpkgs/buildNixpkgsConfig.nix b/modules/system/nixpkgs/buildNixpkgsConfig.nix index ae875690..78aa27c0 100644 --- a/modules/system/nixpkgs/buildNixpkgsConfig.nix +++ b/modules/system/nixpkgs/buildNixpkgsConfig.nix @@ -34,7 +34,6 @@ in platformConfig // overlays = [ inputs.topInputs.nur-xddxdd.overlays.inSubTree - inputs.topInputs.shadowrz.overlays.default inputs.topInputs.nix-vscode-extensions.overlays.default (final: prev: { diff --git a/modules/user/chn/default.nix b/modules/user/chn/default.nix index 809b1a96..d79971a1 100644 --- a/modules/user/chn/default.nix +++ b/modules/user/chn/default.nix @@ -57,7 +57,6 @@ inputs: ) ]; }; - gtk.iconTheme.name = "klassy"; }; }; }; diff --git a/modules/user/chn/plasma/konsole.nix b/modules/user/chn/plasma/konsole.nix deleted file mode 100644 index 97b0f62c..00000000 --- a/modules/user/chn/plasma/konsole.nix +++ /dev/null @@ -1,52 +0,0 @@ -inputs: -{ - config = inputs.lib.mkIf (inputs.config.nixos.packages.desktop != null) - { - home-manager.users.chn.config = - { - programs.plasma = - { - overrideConfig = true; - resetFiles = [ "konsolerc" ]; - configFile.konsolerc = - { - "Desktop Entry".DefaultProfile.value = "plasma-manager.profile"; - "MainWindow.Toolbar sessionToolbar".ToolButtonStyle.value = "IconOnly"; - }; - dataFile."konsole/plasma-manager.profile" = - { - Appearance = - { - AntiAliasFonts.value = true; - BoldIntense.value = true; - ColorScheme.value = "Breeze"; - Font.value = "FiraCode Nerd Font Mono,10,-1,5,50,0,0,0,0,0"; - UseFontLineChararacters.value = true; - WordModeAttr.value = false; - }; - "Cursor Options".CursorShape.value = 1; - General = - { - Name.value = "plasma-manager"; - Parent.value = "FALLBACK/"; - TerminalCenter.value = true; - TerminalMargin.value = 1; - }; - "Interaction Options" = - { - AutoCopySelectedText.value = true; - TrimLeadingSpacesInSelectedText.value = true; - TrimTrailingSpacesInSelectedText.value = true; - UnderlineFilesEnabled.value = true; - }; - Scrolling = { HistoryMode.value = 2; ReflowLines.value = false; }; - "Terminal Features".BlinkingCursorEnabled.value = true; - }; - }; - home.file.".local/share/konsole/Breeze.colorscheme".text = builtins.replaceStrings - [ "Opacity=1" ] [ "Opacity=0.8\nBlur=true" ] - (builtins.readFile "${inputs.pkgs.libsForQt5.konsole}/share/konsole/Breeze.colorscheme"); - }; - environment.persistence."/nix/rootfs/current".users.chn.directories = [ ".local/share/konsole" ]; - }; -} diff --git a/modules/user/chn/plasma/theme.nix b/modules/user/chn/plasma/theme.nix deleted file mode 100644 index c5eacf0f..00000000 --- a/modules/user/chn/plasma/theme.nix +++ /dev/null @@ -1,46 +0,0 @@ -inputs: -{ - config = inputs.lib.mkIf (builtins.elem inputs.config.nixos.model.type [ "desktop" "server" ]) - { - home-manager.users.chn.config = - { - programs.plasma = - { - workspace = - { - theme = "breeze-light"; - colorScheme = "BreezeLight"; - cursor.theme = "breeze_cursors"; - lookAndFeel = "org.kde.klassylighttraditional.desktop"; - # ~/.config/kdeglobals [Icons] - iconTheme = "klassy"; - }; - configFile = - { - kwinrc = - { - Effect-blur.BlurStrength.value = 10; - Effect-kwin4_effect_translucency.MoveResize.value = 75; - Effect-wobblywindows = - { - AdvancedMode.value = true; - Drag.value = 85; - Stiffness.value = 10; - WobblynessLevel.value = 1; - ResizeWobble.value = false; - }; - Plugins = - { - blurEnabled.value = true; - kwin4_effect_dimscreenEnabled.value = true; - kwin4_effect_translucencyEnabled.value = true; - padding.value = 4; - wobblywindowsEnabled.value = true; - }; - "org.kde.kdecoration2".theme.value = "Klassy"; - }; - }; - }; - }; - }; -} diff --git a/modules/user/chn/plasma/wallpaper.nix b/modules/user/chn/plasma/wallpaper.nix index 182be003..9e6699cf 100644 --- a/modules/user/chn/plasma/wallpaper.nix +++ b/modules/user/chn/plasma/wallpaper.nix @@ -1,21 +1,5 @@ inputs: { - config.home-manager.users.chn.config.programs.plasma.configFile = - let - inherit (inputs.topInputs) nixos-wallpaper; - wallpaper = - { - pc = "${nixos-wallpaper}/pixiv-117612023.png"; - }.${inputs.config.nixos.model.hostname} or "${nixos-wallpaper}/pixiv-96734339-x2.png"; - in - { - # "plasma-org.kde.plasma.desktop-appletsrc" = - # { - # "Containments/1".wallpaperplugin.value = "a2n.blur"; - # "Containments/1/Wallpaper/a2n.blur/General".Image.value = wallpaper; - # }; - kscreenlockerrc."Greeter/Wallpaper/org.kde.image/General" = - { Image.value = wallpaper; PreviewImage.value = wallpaper; }; - kdeglobals.General.accentColorFromWallpaper.value = true; - }; + config.home-manager.users.chn.config.programs.plasma.configFile.kdeglobals.General.accentColorFromWallpaper.value + = true; } diff --git a/packages/blurred-wallpaper.nix b/packages/blurred-wallpaper.nix deleted file mode 100644 index 9210c1dc..00000000 --- a/packages/blurred-wallpaper.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, src }: stdenv.mkDerivation -{ - name = "blurred-wallpaper"; - inherit src; - phases = [ "installPhase" ]; - installPhase = - '' - mkdir -p $out/share/plasma/wallpapers - cp -r $src/a2n.blur $out/share/plasma/wallpapers - ''; -} diff --git a/packages/default.nix b/packages/default.nix index abcba239..7b854ed8 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -34,7 +34,6 @@ inputs: rec }; cppcoro = inputs.pkgs.callPackage ./cppcoro { src = inputs.topInputs.cppcoro; }; date = inputs.pkgs.callPackage ./date.nix { src = inputs.topInputs.date; }; - blurred-wallpaper = inputs.pkgs.callPackage ./blurred-wallpaper.nix { src = inputs.topInputs.blurred-wallpaper; }; vasp = { gnu = inputs.pkgs.callPackage ./vasp/gnu