This commit is contained in:
Erwin Boskma 2022-03-18 21:14:51 +01:00
parent 87e99d61cf
commit f5f5322622
Signed by: erwin
GPG key ID: 270B20D17394F7E5
13 changed files with 128 additions and 109 deletions

View file

@ -151,12 +151,12 @@
"rev": "bbef9ba8195a85022a5aa19a988872b6b7036836", "rev": "bbef9ba8195a85022a5aa19a988872b6b7036836",
"revCount": 21, "revCount": 21,
"type": "git", "type": "git",
"url": "ssh://git@git.datarift.nl/erwin/ha-now-playing.git" "url": "https://git.datarift.nl/erwin/ha-now-playing.git"
}, },
"original": { "original": {
"ref": "main", "ref": "main",
"type": "git", "type": "git",
"url": "ssh://git@git.datarift.nl/erwin/ha-now-playing.git" "url": "https://git.datarift.nl/erwin/ha-now-playing.git"
} }
}, },
"home-manager": { "home-manager": {
@ -319,12 +319,12 @@
"rev": "7c037fef4cdc5933a70694d8c743b5439c8354ea", "rev": "7c037fef4cdc5933a70694d8c743b5439c8354ea",
"revCount": 4, "revCount": 4,
"type": "git", "type": "git",
"url": "ssh://git@git.datarift.nl/erwin/pamedia-rs.git" "url": "https://git.datarift.nl/erwin/pamedia-rs.git"
}, },
"original": { "original": {
"ref": "main", "ref": "main",
"type": "git", "type": "git",
"url": "ssh://git@git.datarift.nl/erwin/pamedia-rs.git" "url": "https://git.datarift.nl/erwin/pamedia-rs.git"
} }
}, },
"pybind11-stubgen-src": { "pybind11-stubgen-src": {

View file

@ -54,7 +54,7 @@
}; };
ha-now-playing = { ha-now-playing = {
url = "git+ssh://git@git.datarift.nl/erwin/ha-now-playing.git?ref=main"; url = "git+https://git.datarift.nl/erwin/ha-now-playing.git?ref=main";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.utils.follows = "flake-utils"; inputs.utils.follows = "flake-utils";
inputs.naersk.follows = "naersk"; inputs.naersk.follows = "naersk";
@ -62,7 +62,7 @@
}; };
pamedia = { pamedia = {
url = "git+ssh://git@git.datarift.nl/erwin/pamedia-rs.git?ref=main"; url = "git+https://git.datarift.nl/erwin/pamedia-rs.git?ref=main";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.utils.follows = "flake-utils"; inputs.utils.follows = "flake-utils";
inputs.naersk.follows = "naersk"; inputs.naersk.follows = "naersk";

View file

@ -21,5 +21,11 @@ in {
# emacsPackage = pkgs.emacs-nox; # emacsPackage = pkgs.emacs-nox;
# doomPrivateDir = ./doom.d; # doomPrivateDir = ./doom.d;
# }; # };
home.packages = with pkgs; [
(texlive.combine {
inherit (texlive) scheme-small wrapfig ulem capt-of;
})
];
}; };
} }

View file

@ -24,20 +24,26 @@ with lib; let
nonDefaultDesktop = pkgs.makeDesktopItem { nonDefaultDesktop = pkgs.makeDesktopItem {
name = name =
"firefox-" "firefox-"
+ (if cfg.work + (
if cfg.work
then "private" then "private"
else "horus"); else "horus"
);
desktopName = desktopName =
"Firefox (" "Firefox ("
+ (if cfg.work + (
if cfg.work
then "Private" then "Private"
else "Horus") else "Horus"
)
+ ")"; + ")";
exec = exec =
"firefox -P " "firefox -P "
+ (if cfg.work + (
if cfg.work
then "private" then "private"
else "horus") else "horus"
)
+ " %u"; + " %u";
icon = "firefox"; icon = "firefox";
categories = ["GNOME" "GTK" "Network" "WebBrowser"]; categories = ["GNOME" "GTK" "Network" "WebBrowser"];

View file

@ -257,7 +257,7 @@ in {
xwayland = true; xwayland = true;
systemdIntegration = false; systemdIntegration = true;
}; };
home = { home = {

View file

@ -28,6 +28,7 @@ in {
denoland.vscode-deno denoland.vscode-deno
# dlasagno.rasi # dlasagno.rasi
# dprint.dprint # dprint.dprint
eamodio.gitlens
editorconfig.editorconfig editorconfig.editorconfig
esbenp.prettier-vscode esbenp.prettier-vscode
# EugenWiens.bitbake # EugenWiens.bitbake

View file

@ -23,7 +23,7 @@ let
pkgs.krops.writeCommand "deploy-${name}" { pkgs.krops.writeCommand "deploy-${name}" {
inherit command; inherit command;
source = source name; source = source name;
target = target; target = lib.mkTarget target;
}; };
in rec { in rec {
# Deployments # Deployments

View file

@ -60,6 +60,7 @@ in {
nix-template nix-template
nvd nvd
usbutils usbutils
zip
]; ];
services.udev = { services.udev = {

View file

@ -252,6 +252,7 @@ in {
dbus.packages = [pkgs.gcr]; dbus.packages = [pkgs.gcr];
avahi.publish.workstation = true; avahi.publish.workstation = true;
gvfs.enable = true; gvfs.enable = true;
pcscd.enable = true;
}; };
security = { security = {
@ -269,7 +270,8 @@ in {
pki.certificates = [(builtins.readFile ./horus-ca.pem)]; pki.certificates = [(builtins.readFile ./horus-ca.pem)];
}; };
environment.sessionVariables = { environment = {
sessionVariables = {
_JAVA_AWT_WM_NONREPARENTING = "1"; _JAVA_AWT_WM_NONREPARENTING = "1";
MOZ_ENABLE_WAYLAND = "1"; MOZ_ENABLE_WAYLAND = "1";
MOZ_DBUS_REMOTE = "1"; MOZ_DBUS_REMOTE = "1";
@ -282,8 +284,9 @@ in {
# NIXOS_OZONE_WL = "1"; # NIXOS_OZONE_WL = "1";
}; };
environment.etc = { etc = {
"X11/xkb".source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; "X11/xkb".source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
}; };
}; };
};
} }

View file

@ -11,7 +11,8 @@ in {
enable = mkEnableOption "enable greetd"; enable = mkEnableOption "enable greetd";
}; };
config = mkIf (cfg.enable) config =
mkIf (cfg.enable)
{ {
services.greetd = { services.greetd = {
enable = true; enable = true;

View file

@ -2,7 +2,8 @@ final: prev: rec {
rofi-wayland = prev.pkgs.callPackage ../pkgs/rofi-wayland {}; rofi-wayland = prev.pkgs.callPackage ../pkgs/rofi-wayland {};
nix-plugins = prev.pkgs.callPackage ../pkgs/nix-plugins {}; nix-plugins = prev.pkgs.callPackage ../pkgs/nix-plugins {};
lunarvim = prev.pkgs.callPackage ../pkgs/lunarvim {}; lunarvim = prev.pkgs.callPackage ../pkgs/lunarvim {};
backscrub = prev.pkgs.callPackage ../pkgs/backscrub backscrub =
prev.pkgs.callPackage ../pkgs/backscrub
{ {
inherit (prev.pkgs) gcc cmake opencv curl stdenv git tensorflow-lite flatbuffers; inherit (prev.pkgs) gcc cmake opencv curl stdenv git tensorflow-lite flatbuffers;
}; };