begin hjem migration, bump flake

This commit is contained in:
atagen 2025-08-08 17:00:13 +10:00
parent f188c7a092
commit 8d77e96d89
15 changed files with 260 additions and 218 deletions

View file

@ -4,7 +4,7 @@
...
}:
{
hm.home.packages = builtins.attrValues {
home.packages = builtins.attrValues {
inherit (pkgs)
avizo
playerctl

View file

@ -14,8 +14,4 @@
icon = ../assets/fb_msg.png;
};
};
hm.home.packages = [
pkgs.cinny-desktop
pkgs.zoom-us
];
}

View file

@ -2,63 +2,55 @@
pkgs,
...
}:
let
getPkgs = builtins.attrValues;
in
{
hm.home.packages =
getPkgs {
inherit (pkgs)
direnv
;
}
++ [
# from https://gist.github.com/mikeboiko/58ab730afd65bca0a125bc12b6f4670d
(pkgs.writeTextFile {
name = "rbw-helper";
text = ''
declare -A params
home.packages = [
pkgs.direnv
# from https://gist.github.com/mikeboiko/58ab730afd65bca0a125bc12b6f4670d
(pkgs.writeTextFile {
name = "rbw-helper";
text = ''
declare -A params
if [ "x$1" == "xget" ]; then
read line
while [ -n "$line" ]; do
key=$\{line%%=*}
value=$\{line#*=}
params[$key]=$value
read line
done
if [ "x$1" == "xget" ]; then
read line
while [ -n "$line" ]; do
key=$\{line%%=*}
value=$\{line#*=}
params[$key]=$value
read line
done
if [ "x$\{params['protocol']}" != "xhttps" ]; then
exit
fi
if [ "x$\{params['protocol']}" != "xhttps" ]; then
exit
fi
if [ -z "$\{params["host"]}" ]; then
exit
fi
if [ -z "$\{params["host"]}" ]; then
exit
fi
rbw ls > /dev/null 2>&1
if [ $? -ne 0 ]; then
echo "Please login to rbw to use git credential helper" > /dev/stderr
exit
fi
rbw ls > /dev/null 2>&1
if [ $? -ne 0 ]; then
echo "Please login to rbw to use git credential helper" > /dev/stderr
exit
fi
user=`rbw get --full $\{params["host"]} | grep "Username:" | cut -d' ' -f2-`
pass=`rbw get $\{params["host"]}`
user=`rbw get --full $\{params["host"]} | grep "Username:" | cut -d' ' -f2-`
pass=`rbw get $\{params["host"]}`
if [ "x$user" == "x" ] || [ "x$pass" == "x" ]; then
echo "Couldn't find host in rbw DB." > /dev/stderr
exit
fi
if [ "x$user" == "x" ] || [ "x$pass" == "x" ]; then
echo "Couldn't find host in rbw DB." > /dev/stderr
exit
fi
echo username=$user
echo password=$pass
fi
'';
executable = true;
destination = "/bin/git-credential-rw";
})
];
echo username=$user
echo password=$pass
fi
'';
executable = true;
destination = "/bin/git-credential-rw";
})
];
hm.programs.direnv = {
enable = true;

View file

@ -1,6 +1,6 @@
{ pkgs, ... }:
{
hm.home.packages = builtins.attrValues {
home.packages = builtins.attrValues {
inherit (pkgs)
libreoffice
thunderbird

View file

@ -1,6 +1,6 @@
{ pkgs, ... }:
{
hm.home.packages = builtins.attrValues {
home.packages = builtins.attrValues {
inherit (pkgs)
file-roller
nautilus

View file

@ -1,6 +1,6 @@
{ pkgs, ... }:
{
hm.home.packages = builtins.attrValues {
home.packages = builtins.attrValues {
inherit (pkgs)
mpv
imv

View file

@ -10,5 +10,5 @@
};
hm.programs.git.extraConfig.credential.helper = "rbw";
hm.home.packages = [ pkgs.bitwarden ];
home.packages = [ pkgs.bitwarden ];
}

View file

@ -6,7 +6,7 @@ in
# for quickshell
qt.enable = true;
hm.home.packages = [
home.packages = [
pkgs.gtk-engine-murrine
];
hm.fonts.fontconfig.enable = true;

View file

@ -6,7 +6,7 @@
...
}:
{
hm.home.packages =
home.packages =
let
inherit (config.rice) icons fonts cursor;
in
@ -15,6 +15,7 @@
++ [
cursor.package
];
rice = {
fonts =
let

View file

@ -1,4 +1,9 @@
{ config, ... }:
{
pkgs,
lib,
config,
...
}:
{
# hm.programs.kitty =
# let
@ -38,20 +43,19 @@
# };
# };
hm.programs.ghostty =
let
inherit (config) rice;
in
{
enable = true;
installBatSyntax = true;
enableFishIntegration = true;
clearDefaultKeybinds = false;
themes.rice =
home.packages = [ pkgs.ghostty ];
home.xdg.config.files = {
"ghostty/themes/rice" = {
generator =
(pkgs.formats.keyValue {
listsAsDuplicateKeys = true;
mkKeyValue = lib.generators.mkKeyValueDefault { } " = ";
}).generate
"ghostty-theme";
value =
let
inherit (rice.palette.shortHex) util;
inherit (rice.palette.hex) normal bright;
inherit (config.rice.palette.shortHex) util;
inherit (config.rice.palette.hex) normal bright;
in
{
foreground = util.fg;
@ -78,15 +82,31 @@
selection-foreground = util.fg_sel;
selection-background = util.bg_sel;
};
settings = {
theme = "rice";
font-size = rice.fonts.monospace.size;
font-family = rice.fonts.monospace.name;
window-decoration = "server";
gtk-titlebar = false;
gtk-single-instance = true;
linux-cgroup = "always";
gtk-wide-tabs = false;
};
};
"ghostty/config" = {
generator = lib.generators.toKeyValue { };
value =
let
inherit (config) rice;
in
{
theme = "rice";
font-size = rice.fonts.monospace.size;
font-family = rice.fonts.monospace.name;
window-decoration = "server";
gtk-titlebar = false;
gtk-single-instance = true;
linux-cgroup = "always";
gtk-wide-tabs = false;
};
};
};
# hm.programs.ghostty = {
# enable = true;
# package = null;
# installBatSyntax = true;
# enableFishIntegration = true;
# clearDefaultKeybinds = false;
# };
}