Compare commits

..

No commits in common. "74624151b90581f0999e39df2e696ccb0214772c" and "a07a96b3bdf94f713ebffaf94a2bb3e5ad022aa9" have entirely different histories.

21 changed files with 50 additions and 91 deletions

0
scripts/_diffr Executable file → Normal file
View file

0
scripts/_sway_idle_toggle Executable file → Normal file
View file

0
scripts/bmenu Executable file → Normal file
View file

0
scripts/br Executable file → Normal file
View file

View file

@ -1,32 +1,34 @@
( (
final: prev: final: prev:
with prev;
let let
lib = prev.lib; import_script = (_: path: import (path) { inherit pkgs lib; });
create_script = (
importScript = (_: path: import (path) { inherit (final) pkgs lib; });
wrapScript =
name: text: runtimeInputs: name: text: runtimeInputs:
final.runCommand name let
{ script_body = pkgs.writeTextFile {
nativeBuildInputs = [ final.makeWrapper ]; inherit name;
meta.mainProgram = name; executable = true;
} text = ''
'' ${builtins.readFile text}
mkdir -p $out/bin '';
cp ${text} $out/bin/${name} };
wrapProgram $out/bin/${name} \ in
--suffix PATH : ${lib.makeBinPath runtimeInputs} (pkgs.writeShellApplication {
''; inherit name runtimeInputs;
createScripts = lib.mapAttrs (name: deps: wrapScript name ./${name} deps); text = ''exec ${script_body} "$@"'';
checkPhase = "";
})
);
create_scripts = lib.mapAttrs (name: deps: create_script name ./${name} deps);
myPass = final.pass.withExtensions (ex: with ex; [ pass-otp ]); pass = pkgs.pass.withExtensions (ex: with ex; [ pass-otp ]);
in in
with final; create_scripts {
createScripts {
br = [ ]; br = [ ];
bmenu = [ bmenu = [
bemenu final.bemenu
dhist final.dhist
fish fish
j4-dmenu-desktop j4-dmenu-desktop
jq jq
@ -42,21 +44,21 @@
fish fish
]; ];
_diffr = [ diffr ]; _diffr = [ diffr ];
_thunar-terminal = [ terminal ]; _thunar-terminal = [ final.terminal ];
_sway_idle_toggle = [ swayidle ]; _sway_idle_toggle = [ final.swayidle ];
kak-pager = [ kak-pager = [
fish fish
_diffr final._diffr
]; ];
kak-man-pager = [ kak-pager ]; kak-man-pager = [ final.kak-pager ];
helix-pager = [ helix-pager = [
fish fish
_diffr final._diffr
]; ];
helix-man-pager = [ helix-pager ]; helix-man-pager = [ final.helix-pager ];
musmenu = [ musmenu = [
mpc-cli mpc-cli
wdmenu final.wdmenu
trash-cli trash-cli
xdg-user-dirs xdg-user-dirs
libnotify libnotify
@ -69,12 +71,11 @@
pass-export = [ pass-export = [
pass2csv pass2csv
gnupg gnupg
sd
]; ];
wpass = [ wpass = [
wdmenu final.wdmenu
fd fd
myPass pass
sd sd
wl-clipboard wl-clipboard
wtype wtype
@ -95,7 +96,7 @@
pulse_sink = [ pulse_sink = [
pulseaudio pulseaudio
pamixer pamixer
wdmenu final.wdmenu
]; ];
color_picker = [ color_picker = [
grim grim
@ -107,13 +108,13 @@
dzadd = [ dzadd = [
procps procps
libnotify libnotify
wdmenu final.wdmenu
jq jq
mpv mpv
pqiv pqiv
python3Packages.deemix python3Packages.deemix
mpc-cli mpc-cli
mpdDup final.mpdDup
]; ];
mpdDup = [ mpdDup = [
mpc-cli mpc-cli
@ -127,15 +128,15 @@
auto_connect_gamepad = [ auto_connect_gamepad = [
bluez bluez
coreutils coreutils
gnugrep final.gnugrep
]; ];
powerplay-led-idle = [ powerplay-led-idle = [
bash final.bash
libinput libinput
libratbag libratbag
]; ];
} }
// lib.mapAttrs importScript { // lib.mapAttrs import_script {
wdmenu = ./wdmenu.nix; wdmenu = ./wdmenu.nix;
wlauncher = ./wlauncher.nix; wlauncher = ./wlauncher.nix;
_gpg-unlock = ./_gpg-unlock.nix; _gpg-unlock = ./_gpg-unlock.nix;

0
scripts/helix-pager Executable file → Normal file
View file

0
scripts/kak-pager Executable file → Normal file
View file

View file

@ -8,6 +8,3 @@ pass2csv "$PASSWORD_STORE_DIR" "$HOME/passwords.csv" \
-f User '(user|login)(:\s*)?' \ -f User '(user|login)(:\s*)?' \
-f TOTP 'otpauth(:)?' \ -f TOTP 'otpauth(:)?' \
-f URL 'url(:\s*)?' -f URL 'url(:\s*)?'
# Fix TOTP format for keepass
sd '"//totp/.*?secret=(.*?)(&.*?)?"' '"$1"' "$HOME/passwords.csv"

0
scripts/playerctl-status Executable file → Normal file
View file

View file

@ -4,7 +4,7 @@ set -e
# Constants # Constants
SECONDS_UNTIL_FADE=$(( 1 * 60)) SECONDS_UNTIL_FADE=$(( 1 * 60))
SECONDS_UNTIL_OFF=$(( 6 * 60)) SECONDS_UNTIL_OFF=$(( 5 * 60))
COLOR_ON=ff0000 COLOR_ON=ff0000
COLOR_FADE=880000 COLOR_FADE=880000

0
scripts/pulse_sink Executable file → Normal file
View file

0
scripts/screenshotsh Executable file → Normal file
View file

0
scripts/showkeys Executable file → Normal file
View file

0
scripts/terminal Executable file → Normal file
View file

0
scripts/wl-copy-file Executable file → Normal file
View file

0
scripts/wpass Executable file → Normal file
View file

View file

@ -124,53 +124,10 @@ in
"devtools.chrome.enabled" = true; "devtools.chrome.enabled" = true;
"devtools.debugger.remote-enabled" = true; "devtools.debugger.remote-enabled" = true;
}; };
userChrome = userChrome = lib.mkIf (desktop == "sway") ''
if desktop == "sway" then #titlebar { display: none !important; }
'' #sidebar-header { display: none !important; }
#titlebar { display: none !important; } '';
#sidebar-header { display: none !important; }
''
else
''
/* Element | chrome://browser/content/browser.xhtml */
#navigator-toolbox {
display: grid;
grid-template-columns: 1fr 50px;
overflow: hidden;
}
/* Element | chrome://browser/content/browser.xhtml */
#nav-bar {
flex: 1;
width: 100%;
grid-column: 1 / 3;
grid-row: 1;
z-index: 0;
padding-right: 29px !important;
}
/* Element | chrome://browser/content/browser.xhtml */
.toolbar-items {
display: none;
}
/* Element | chrome://browser/content/browser.xhtml */
#TabsToolbar {
max-width: 50px;
}
/* Element | chrome://browser/content/browser.xhtml */
#titlebar {
max-width: 50px;
grid-area: 1 / 2;
z-index: 10;
}
'';
}; };
}; };
}; };

View file

@ -34,7 +34,7 @@ lib.mkIf (config.my.desktop == "gnome") {
foliate foliate
amberol amberol
pitivi pitivi
keepassxc gnome-passwordsafe
libsForQt5.qt5ct libsForQt5.qt5ct
libsForQt5.qtstyleplugin-kvantum libsForQt5.qtstyleplugin-kvantum
@ -42,6 +42,10 @@ lib.mkIf (config.my.desktop == "gnome") {
qt6Packages.qtstyleplugin-kvantum qt6Packages.qtstyleplugin-kvantum
]; ];
home.sessionVariables = {
QT_QPA_PLATFORMTHEME = "qt5ct";
};
services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3; services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
xdg.defaultApplications = { xdg.defaultApplications = {

View file

@ -42,7 +42,6 @@
./xdg-dirs.nix ./xdg-dirs.nix
inputs.nix-index-database.hmModules.nix-index inputs.nix-index-database.hmModules.nix-index
../settings ../settings
./powerplay-led-idle.nix
]; ];
my = import ./variables.nix; my = import ./variables.nix;

View file

@ -23,6 +23,7 @@ in
./swayidle.nix ./swayidle.nix
./swaylock.nix ./swaylock.nix
./theme.nix ./theme.nix
./powerplay-led-idle.nix
]; ];
config = lib.mkIf (config.my.desktop == "sway") { config = lib.mkIf (config.my.desktop == "sway") {
services.mako.enable = true; services.mako.enable = true;

View file

@ -11,7 +11,7 @@
Restart = "on-failure"; Restart = "on-failure";
}; };
Install = { Install = {
WantedBy = [ "graphical-session.target" ]; WantedBy = [ "sway-session.target" ];
}; };
}; };
} }