feat: flakify, gnome3
chore: nix fmt refactor: split out more home-manager programs feat: migrate shell as flake devShell feat: initial flake structure with colmena feat: migrate elias-e525 to colmena feat: migrate steveej-t14 with colmena feat: configure chromium extensions chore: remove all overlays and package overrides chore: delete some of _archive feat: migrate vmd102066 feat: migrate sj-vps-htz0
This commit is contained in:
parent
4fcddef112
commit
33e0c3f4c6
79 changed files with 1797 additions and 1578 deletions
|
@ -1,10 +1,11 @@
|
|||
{pkgs, ...}: let
|
||||
in {
|
||||
# TODO: re-enable this with the appropriate version
|
||||
{pkgs, ...}: {
|
||||
# TODO: re-enable this with the appropriate version?
|
||||
# programs.home-manager.enable = true;
|
||||
# programs.home-manager.path = https://github.com/rycee/home-manager/archive/445c0b1482c38172a9f8294ee16a7ca7462388e5.tar.gz;
|
||||
|
||||
nixpkgs.overlays = builtins.attrValues (import ../../overlays);
|
||||
imports = [
|
||||
../programs/zsh.nix
|
||||
];
|
||||
|
||||
nixpkgs.config = {
|
||||
allowBroken = false;
|
||||
|
@ -25,14 +26,14 @@ in {
|
|||
];
|
||||
};
|
||||
|
||||
xdg.enable = true;
|
||||
|
||||
programs.direnv.enable = true;
|
||||
services.lorri.enable = true;
|
||||
|
||||
home.sessionVariables = {
|
||||
NIXPKGS_ALLOW_UNFREE = "1";
|
||||
# Don't create .pyc files.
|
||||
PYTHONDONTWRITEBYTECODE = "1";
|
||||
};
|
||||
home.sessionVariables.NIXPKGS_ALLOW_UNFREE = "1";
|
||||
# Don't create .pyc files.
|
||||
home.sessionVariables.PYTHONDONTWRITEBYTECODE = "1";
|
||||
|
||||
programs.command-not-found.enable = true;
|
||||
programs.fzf.enable = true;
|
||||
|
@ -40,10 +41,9 @@ in {
|
|||
home.packages =
|
||||
[]
|
||||
++ (with pkgs; [
|
||||
# git helpers
|
||||
git-crypt
|
||||
|
||||
htop
|
||||
vcsh
|
||||
|
||||
# Authentication
|
||||
cacert
|
||||
openssl
|
||||
|
@ -52,6 +52,29 @@ in {
|
|||
just
|
||||
ripgrep
|
||||
du-dust
|
||||
|
||||
elfutils
|
||||
exfat
|
||||
file
|
||||
tree
|
||||
pwgen
|
||||
proot
|
||||
|
||||
parted
|
||||
pv
|
||||
tmux
|
||||
wget
|
||||
curl
|
||||
|
||||
# git helpers
|
||||
git-crypt
|
||||
gitFull
|
||||
pastebinit
|
||||
gist
|
||||
mr
|
||||
|
||||
usbutils
|
||||
pciutils
|
||||
]);
|
||||
|
||||
home.stateVersion = "22.05";
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
{pkgs, ...}: let
|
||||
passwords = import ../../variables/passwords.crypt.nix;
|
||||
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
inherit (import ../lib.nix {}) mkSimpleTrayService;
|
||||
|
||||
audio = pkgs.writeShellScript "audio" ''
|
||||
|
@ -250,13 +252,6 @@
|
|||
print("new window: ", window)
|
||||
'';
|
||||
in {
|
||||
systemd.user = {
|
||||
startServices = true;
|
||||
services = {};
|
||||
};
|
||||
|
||||
# systemd.user.sockets.gpg-agent.Socket.Accept = true;
|
||||
|
||||
services = {
|
||||
gnome-keyring.enable = true;
|
||||
blueman-applet.enable = true;
|
||||
|
@ -266,93 +261,9 @@ in {
|
|||
lockCmd = "${screenLockCommand}";
|
||||
};
|
||||
network-manager-applet.enable = true;
|
||||
syncthing.enable = true;
|
||||
gpg-agent = {
|
||||
enable = true;
|
||||
enableScDaemon = true;
|
||||
enableSshSupport = true;
|
||||
grabKeyboardAndMouse = true;
|
||||
pinentryFlavor = "gtk2";
|
||||
extraConfig = "";
|
||||
|
||||
defaultCacheTtl = 0;
|
||||
maxCacheTtl = 0;
|
||||
};
|
||||
flameshot.enable = true;
|
||||
pasystray.enable = true;
|
||||
cbatticon.enable = true;
|
||||
redshift = {
|
||||
enable = true;
|
||||
inherit (passwords.location.stefan) longitude latitude;
|
||||
temperature = {
|
||||
day = 6700;
|
||||
night = 3700;
|
||||
};
|
||||
tray = true;
|
||||
settings = {
|
||||
redshift = {
|
||||
brightness-day = 1.0;
|
||||
brightness-night = 0.8;
|
||||
adjustment-method = "randr";
|
||||
};
|
||||
};
|
||||
};
|
||||
espanso = {
|
||||
enable = true;
|
||||
settings = {
|
||||
matches = let
|
||||
playerctl = ''
|
||||
${pkgs.coreutils}/bin/env DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$(${pkgs.coreutils}/bin/id -u)/bus" ${pkgs.playerctl}/bin/playerctl'';
|
||||
in [
|
||||
{
|
||||
trigger = ":vpos";
|
||||
replace = "{{output}}";
|
||||
vars = [
|
||||
{
|
||||
name = "output";
|
||||
type = "script";
|
||||
params = {
|
||||
args = [
|
||||
(pkgs.writeScript "espanso" ''
|
||||
#! ${pkgs.python3}/bin/python
|
||||
import subprocess, os, math, datetime
|
||||
|
||||
id=str(os.getuid())
|
||||
result=subprocess.run(args=["${pkgs.playerctl}/bin/playerctl", "position"], env={"DBUS_SESSION_BUS_ADDRESS": "unix:path=/run/user/"+id+"/bus"},capture_output=True)
|
||||
result.check_returncode()
|
||||
|
||||
position_secs = math.trunc(float(result.stdout))
|
||||
position_human = datetime.timedelta(seconds=position_secs)
|
||||
print("%s - %s" % (position_human, position_secs))
|
||||
'')
|
||||
];
|
||||
};
|
||||
}
|
||||
];
|
||||
}
|
||||
{
|
||||
trigger = ":vtit";
|
||||
replace = "{{output}}";
|
||||
vars = [
|
||||
{
|
||||
name = "output";
|
||||
type = "script";
|
||||
params = {
|
||||
args = [
|
||||
(pkgs.writeShellScript "espanso"
|
||||
"${playerctl} metadata title")
|
||||
];
|
||||
};
|
||||
}
|
||||
];
|
||||
}
|
||||
{
|
||||
trigger = ":dunno";
|
||||
replace = "¯\\_(ツ)_/¯";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
home.pointerCursor = {
|
||||
|
@ -364,7 +275,7 @@ in {
|
|||
};
|
||||
|
||||
xsession = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
windowManager.command = "${pkgs.qtile}/bin/qtile start -c ${qtileConfig}";
|
||||
initExtra = "${initScreen}";
|
||||
};
|
||||
|
@ -373,8 +284,6 @@ in {
|
|||
# X Tools/Libraries
|
||||
lightdm
|
||||
networkmanagerapplet
|
||||
autorandr
|
||||
arandr
|
||||
gnome-icon-theme
|
||||
gnome.gnome-themes-extra
|
||||
gnome.adwaita-icon-theme
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue