caandt/nix-conf
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

update to plasma 6

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

81
flake.lock
View file

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

14
overlays/default.nix
View file

@ -13,13 +13,6 @@
maim = super.maim.overrideAttrs (old: { maim = super.maim.overrideAttrs (old: {
buildInputs = old.buildInputs ++ [super.xorg.libXcursor]; buildInputs = old.buildInputs ++ [super.xorg.libXcursor];
env.NIX_LDFLAGS = "-lXcursor"; 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: { ki = super.ki.overrideAttrs (old: {
patches = old.patches ++ [./ki.diff]; patches = old.patches ++ [./ki.diff];
@ -46,6 +39,13 @@
''; '';
}; };
pwndbg = inputs.pwndbg.packages.${super.system}.pwndbg; 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];
});
}
);
}) })
]; ];
} }

1
system/default.nix
View file

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

3
system/display.nix
View file

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

13
system/plasma.nix
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;
}

8
user/config/default.nix
View file

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

8
user/config/kde/dolphinrc
View file

@ -7,7 +7,13 @@ ShowAddToPlaces=false
HiddenFilesShown=true HiddenFilesShown=true
LimitFoldersPanelToHome=false LimitFoldersPanelToHome=false
[DetailsMode]
HighlightEntireRow=false
SidePadding=0
[General] [General]
AutoExpandFolders=true
GlobalViewProps=false
RememberOpenedTabs=false RememberOpenedTabs=false
ShowFullPath=true ShowFullPath=true
ShowFullPathInTitlebar=true ShowFullPathInTitlebar=true
@ -28,7 +34,7 @@ ToolBarsMovable=Disabled
ToolButtonStyle=IconOnly ToolButtonStyle=IconOnly
[PreviewSettings] [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] [Search]
Location=Everywhere Location=Everywhere

11
user/config/kde/kdeglobals
View file

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

24
user/config/qt5ct/qt5ct.conf
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

2
user/config/sx/sxrc
View file

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

5
user/packages.nix
View file

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

3
user/theme.nix
View file

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