update to plasma 6

This commit is contained in:
caandt 2025-03-16 19:02:48 -05:00
parent 675753b901
commit 322c7f5248
12 changed files with 74 additions and 99 deletions

View file

@ -26,11 +26,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1738453229,
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"lastModified": 1741352980,
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
"type": "github"
},
"original": {
@ -47,11 +47,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1740502997,
"narHash": "sha256-M+e//9CO9akq/pzEDQ0S9Uz1sFEk8yl1ayKtNqBV0Sc=",
"lastModified": 1742057558,
"narHash": "sha256-U5fzjZQR8JGhTZemD5AzJnVcMqUlJGYD1DJf/VFo3tw=",
"owner": "wamserma",
"repo": "flake-programs-sqlite",
"rev": "06bbfd83407a5a6d4de19560a0b18b2c3787f10c",
"rev": "1ccbd5d986fb64d79875b4f000caf0e38a857124",
"type": "github"
},
"original": {
@ -67,11 +67,11 @@
]
},
"locked": {
"lastModified": 1740494361,
"narHash": "sha256-Dd/GhJ9qKmUwuhgt/PAROG8J6YdU2ZjtJI9SQX5sVQI=",
"lastModified": 1741955947,
"narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "74f0a8546e3f2458c870cf90fc4b38ac1f498b17",
"rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4",
"type": "github"
},
"original": {
@ -88,11 +88,11 @@
]
},
"locked": {
"lastModified": 1740361404,
"narHash": "sha256-hKaJ6QDZuxcbwifzcfLyiK9nmlIx1uQqWQwJ45PBn88=",
"lastModified": 1742089599,
"narHash": "sha256-1yBAFE5yEGEjSWZ8BuPt9Yknq+cFwzW6Q86gs5rMkGI=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "1e6dc4b9895602f9459d6ff3a11b0cd144321207",
"rev": "bbf6f68ec16cead3c29d5ba33d5c52956dfaefdf",
"type": "github"
},
"original": {
@ -103,11 +103,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1740367490,
"narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
"lastModified": 1741851582,
"narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
"rev": "6607cf789e541e7873d40d3a8f7815ea92204f32",
"type": "github"
},
"original": {
@ -119,23 +119,26 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1738452942,
"narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
"lastModified": 1740877520,
"narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "147dee35aab2193b174e4c0868bd80ead5ce755c",
"type": "github"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1740339700,
"narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=",
"lastModified": 1741862977,
"narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195",
"rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0",
"type": "github"
},
"original": {
@ -155,11 +158,11 @@
"uv2nix": "uv2nix"
},
"locked": {
"lastModified": 1740333626,
"narHash": "sha256-OcwULIZcWOC1FNGa0SNGtyMyfbwTsBj17LBPpGOZL78=",
"lastModified": 1742076846,
"narHash": "sha256-Vw7RD++jekDz05aCaJPsqAgeoDd4xj5TCrIXpE4RZWk=",
"owner": "pwndbg",
"repo": "pwndbg",
"rev": "ef090ebf5eb75713b1f97c3d9aa3d7be636b0c3a",
"rev": "22c77b2badfae5e29db3d96e958d9925aa6f795e",
"type": "github"
},
"original": {
@ -184,11 +187,11 @@
]
},
"locked": {
"lastModified": 1737338290,
"narHash": "sha256-gnXlfFEHA+/jMH7R+7y3JxrI3WfOjgBhzzJNuFW70UU=",
"lastModified": 1740362541,
"narHash": "sha256-S8Mno07MspggOv/xIz5g8hB2b/C5HPiX8E+rXzKY+5U=",
"owner": "pyproject-nix",
"repo": "build-system-pkgs",
"rev": "e1487e5cefda0c7990bdd2e660bee20971680e45",
"rev": "e151741c848ba92331af91f4e47640a1fb82be19",
"type": "github"
},
"original": {
@ -205,11 +208,11 @@
]
},
"locked": {
"lastModified": 1738204167,
"narHash": "sha256-J5M2sj3x4ocM93shScT/3Z4XWHZhwwW1NyQK+C+8Mys=",
"lastModified": 1740921768,
"narHash": "sha256-4d27TdYoJ8B99b4kU7qESB4QVjiV9gPSuP2/MDqjDWo=",
"owner": "pyproject-nix",
"repo": "pyproject.nix",
"rev": "0d9f4b90cee1b5c5d6c142ef22de1e246e003ccc",
"rev": "ca5d23f044943a23cc4274b2d3dea45682dc025f",
"type": "github"
},
"original": {
@ -237,11 +240,11 @@
]
},
"locked": {
"lastModified": 1739262228,
"narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=",
"lastModified": 1741861888,
"narHash": "sha256-ynOgXAyToeE1UdLNfrUn/hL7MN0OpIS2BtNdLjpjPf0=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975",
"rev": "d016ce0365b87d848a57c12ffcfdc71da7a2b55f",
"type": "github"
},
"original": {
@ -277,11 +280,11 @@
]
},
"locked": {
"lastModified": 1738653454,
"narHash": "sha256-tAFX8mPZtZ+zVE/+bwPC3U+u5MxjpNP0gG24DG26jVs=",
"lastModified": 1740497536,
"narHash": "sha256-K+8wsVooqhaqyxuvew3+62mgOfRLJ7whv7woqPU3Ypo=",
"owner": "pyproject-nix",
"repo": "uv2nix",
"rev": "05b0c148bc53aebc6a906b6d0ac41dde5954cd47",
"rev": "d01fd3a141755ad5d5b93dd9fcbd76d6401f5bac",
"type": "github"
},
"original": {

View file

@ -13,13 +13,6 @@
maim = super.maim.overrideAttrs (old: {
buildInputs = old.buildInputs ++ [super.xorg.libXcursor];
env.NIX_LDFLAGS = "-lXcursor";
patches = [
(super.fetchpatch {
name = "maim-c++-17.patch";
url = "https://github.com/naelstrof/maim/commit/e7fe09b6734baeb59081b8805be542c92178cf0f.patch";
sha256 = "0z9zvrr8msfli88jmhxm5knysi385s48j2w7zpacc7qhf4c5zh8c";
})
];
});
ki = super.ki.overrideAttrs (old: {
patches = old.patches ++ [./ki.diff];
@ -46,6 +39,13 @@
'';
};
pwndbg = inputs.pwndbg.packages.${super.system}.pwndbg;
kdePackages = super.kdePackages.overrideScope (
kself: ksuper: {
polkit-kde-agent-1 = ksuper.polkit-kde-agent-1.overrideAttrs (old: {
buildInputs = old.buildInputs ++ [ksuper.kirigami ksuper.sonnet];
});
}
);
})
];
}

View file

@ -11,7 +11,6 @@
./display.nix
./locale.nix
./mnt.nix
./plasma.nix
./security.nix
./virt.nix
./yubikey.nix

View file

@ -13,10 +13,11 @@ lib.mkIf config.u.has.graphical {
enable = true;
luaModules = [pkgs.luaPackages.vicious];
};
desktopManager.plasma5.enable = true;
autoRepeatDelay = 200;
autoRepeatInterval = 30;
};
services.desktopManager.plasma6.enable = true;
programs.partition-manager.enable = true;
services.libinput = {
enable = true;
mouse.accelProfile = "flat";

View file

@ -1,13 +0,0 @@
{
config,
lib,
pkgs,
...
}:
lib.mkIf config.u.has.graphical {
programs.partition-manager = {
enable = true;
package = pkgs.libsForQt5.partitionmanager;
};
services.udisks2.enable = true;
}

View file

@ -1,9 +1,4 @@
{
config,
pkgs,
lib,
...
}: let
{config, ...}: let
ln = config.u.lib.ln "${config.u.confPath}/user/config";
in {
imports = [
@ -30,7 +25,6 @@ in {
xdg.configFile.picom.source = ./picom;
xdg.configFile.pwninit.source = ./pwninit;
xdg.configFile.python.source = ./python;
xdg.configFile.qt5ct.source = ./qt5ct;
xdg.configFile.readline.source = ./readline;
xdg.configFile.sx.source = ln "sx";
}

View file

@ -7,7 +7,13 @@ ShowAddToPlaces=false
HiddenFilesShown=true
LimitFoldersPanelToHome=false
[DetailsMode]
HighlightEntireRow=false
SidePadding=0
[General]
AutoExpandFolders=true
GlobalViewProps=false
RememberOpenedTabs=false
ShowFullPath=true
ShowFullPathInTitlebar=true
@ -28,7 +34,7 @@ ToolBarsMovable=Disabled
ToolButtonStyle=IconOnly
[PreviewSettings]
Plugins=audiothumbnail,blenderthumbnail,comicbookthumbnail,cursorthumbnail,djvuthumbnail,ebookthumbnail,exrthumbnail,fontthumbnail,imagethumbnail,jpegthumbnail,kraorathumbnail,windowsexethumbnail,windowsimagethumbnail,mobithumbnail,opendocumentthumbnail,gsthumbnail,rawthumbnail,svgthumbnail,ffmpegthumbs
Plugins=appimagethumbnail,com,audiothumbnail,blenderthumbnail,comicbookthumbnail,cursorthumbnail,djvuthumbnail,ebookthumbnail,exrthumbnail,fontthumbnail,imagethumbnail,jpegthumbnail,kraorathumbnail,windowsexethumbnail,windowsimagethumbnail,mobithumbnail,opendocumentthumbnail,gsthumbnail,rawthumbnail,svgthumbnail,ffmpegthumbs
[Search]
Location=Everywhere

View file

@ -1,2 +1,13 @@
[General]
TerminalApplication=alacritty
[Icons]
Theme=Papirus
[KDE]
ShowDeleteCommand=false
SingleClick=true
[PreviewSettings]
EnableRemoteFolderThumbnail=false
MaximumRemoteSize=0

View file

@ -1,24 +0,0 @@
[Appearance]
custom_palette=false
icon_theme=Papirus
standard_dialogs=kde
style=Lightly
[Fonts]
fixed="Monospace,10,-1,5,50,0,0,0,0,0"
general="Sans Serif,10,-1,5,50,0,0,0,0,0"
[Interface]
activate_item_on_single_click=2
buttonbox_layout=0
cursor_flash_time=1000
dialog_buttons_have_icons=1
double_click_interval=400
gui_effects=@Invalid()
keyboard_scheme=2
menus_have_icons=true
show_shortcuts_in_context_menus=true
stylesheets=@Invalid()
toolbutton_style=4
underline_shortcut=1
wheel_scroll_lines=3

View file

@ -1,6 +1,6 @@
#!/bin/sh
export QT_QPA_PLATFORMTHEME="qt6ct"
export QT_QPA_PLATFORMTHEME="kde"
export GTK_IM_MODULE=fctix
export QT_IM_MODULE=fcitx
export XMODIFIERS=@im=fcitx

View file

@ -43,10 +43,9 @@
screenkey
safeeyes
snixembed
libsForQt5.kolourpaint
libsForQt5.filelight
kdePackages.kolourpaint
kdePackages.filelight
papirus-icon-theme
lightly-boehs
pavucontrol
qpwgraph
qbittorrent

View file

@ -7,8 +7,7 @@
lib.mkIf config.u.has.graphical {
qt = {
enable = true;
platformTheme.name = "qtct";
style.name = "breeze";
platformTheme.name = "kde6";
style.package = pkgs.kdePackages.breeze;
};
gtk = {