Compare commits

..

No commits in common. "0434d3e98fec16566009710518832c99d613842c" and "675753b901770adfa8a35880edcd5800724eaf71" have entirely different histories.

15 changed files with 99 additions and 126 deletions

View file

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

View file

@ -13,6 +13,13 @@
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];
@ -39,13 +46,6 @@
''; '';
}; };
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];
});
}
);
}) })
]; ];
} }

View file

@ -11,6 +11,7 @@
./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

View file

@ -13,11 +13,10 @@ 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 Normal file
View file

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

View file

@ -58,23 +58,3 @@ function tmpedit() {
chmod +w "$1" chmod +w "$1"
$EDITOR "$1" $EDITOR "$1"
} }
function venv() {
local dir="$(pwd)"
while [[ "$dir" != "/" ]]; do
if [[ -d "$dir/venv" && -f "$dir/venv/bin/activate" ]]; then
if [[ -v VIRTUAL_ENV ]]; then
if [[ "$VIRTUAL_ENV" != "$dir/venv" ]]; then
deactivate
else
echo "already active"
return
fi
fi
. "$dir/venv/bin/activate"
echo "activated $(realpath --relative-to . "$dir/venv")"
return
fi
dir="$(dirname "$dir")"
done
echo "not found"
}

View file

@ -1,4 +1,9 @@
{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 = [
@ -25,6 +30,7 @@ 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";
} }

View file

@ -1,29 +0,0 @@
# Page size
PageSize=5
# Enable emoji in hint
EnableEmoji=True
# Enable emoji in quickphrase
EnableQuickPhraseEmoji=True
# Choose key modifier
Choose Modifier=Alt
# Enable hint by default
EnableHintByDefault=False
# Trigger hint mode
Hint Trigger=
# Trigger hint mode for one time
One Time Hint Trigger=
# Use new compose behavior
UseNewComposeBehavior=True
# Type special characters with long press
EnableLongPress=False
[PrevCandidate]
0=Shift+Tab
[NextCandidate]
0=Tab
[LongPressBlocklist]
0=konsole
1=org.kde.konsole

View file

@ -1,3 +0,0 @@
# Hidden Notifications
HiddenNotifications=

View file

@ -7,13 +7,7 @@ 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
@ -34,7 +28,7 @@ ToolBarsMovable=Disabled
ToolButtonStyle=IconOnly ToolButtonStyle=IconOnly
[PreviewSettings] [PreviewSettings]
Plugins=appimagethumbnail,com,audiothumbnail,blenderthumbnail,comicbookthumbnail,cursorthumbnail,djvuthumbnail,ebookthumbnail,exrthumbnail,fontthumbnail,imagethumbnail,jpegthumbnail,kraorathumbnail,windowsexethumbnail,windowsimagethumbnail,mobithumbnail,opendocumentthumbnail,gsthumbnail,rawthumbnail,svgthumbnail,ffmpegthumbs Plugins=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

View file

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

View file

@ -0,0 +1,24 @@
[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 #!/bin/sh
export QT_QPA_PLATFORMTHEME="kde" export QT_QPA_PLATFORMTHEME="qt6ct"
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

View file

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

View file

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