Committed after system build
diff --git a/scripts/update-home b/scripts/update-home
index 5c3967d..1171288 100755
--- a/scripts/update-home
+++ b/scripts/update-home
@@ -1,6 +1,6 @@
#!/bin/sh
cd "$(dirname ${BASH_SOURCE[0]})/.."
-nix build .#homeManagerConfigurations.minion.activationPackage --impure
+nix build .#homeManagerConfigurations.minion.activationPackage $1 --impure
./result/activate
scripts/commit home
diff --git a/system/configuration.nix b/system/configuration.nix
index d8619d4..fc84f90 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -21,21 +21,6 @@
'';
};
- # Overlay the overlays
- nixpkgs.overlays = [
- (self: super: {
- # Fix polkit
- polkit = super.polkit.overrideAttrs (oldAttrs: {
- patches = oldAttrs.patches ++ [
- (super.fetchpatch {
- url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/716a273ce0af467968057f3e107156182bd290b0.patch";
- sha256 = "sha256-hOJJhUmxXm87W1ZU9Y1NJ8GCyKvPjbIVtCHlhRGlN8k=";
- })
- ];
- });
- })
- ];
-
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
@@ -91,6 +76,8 @@
xdg-desktop-portal-gtk
];
gtkUsePortal = true;
+ wlr.enable = true;
+
};
};
@@ -149,7 +136,6 @@
keybase-gui
kbfs
bluez
- cachix
];
# environment.systemPackages = [
diff --git a/system/packaging-configuration.nix b/system/packaging-configuration.nix
index 893804d..7613f6b 100644
--- a/system/packaging-configuration.nix
+++ b/system/packaging-configuration.nix
@@ -5,6 +5,4 @@
options.nix.nixPath.default ++
# Append our nixpkgs-overlays.
[ "nixpkgs-overlays=/etc/nixos/overlays/" ];
-
- imports = [ ./cachix.nix ];
}
diff --git a/users/minion/home.nix b/users/minion/home.nix
index c14130b..89a4936 100644
--- a/users/minion/home.nix
+++ b/users/minion/home.nix
@@ -1,10 +1,13 @@
{ config, pkgs, nixpkgs, ... }:
-
-{
+let
+ username = "minion";
+ homedir = "/home/${username}";
+ confdir = "${homedir}/Nix/home";
+in {
# Home Manager needs a bit of information about you and the
# paths it should manage.
- home.username = "minion";
- home.homeDirectory = "/home/minion";
+ home.username = username;
+ home.homeDirectory = homedir;
programs.vscode.enable = true;
programs.vscode.package = pkgs.vscode-fhs;
@@ -19,6 +22,8 @@
pinentryFlavor = "qt";
};
+ nixpkgs.overlays = [ (import "${confdir}/overlays/anytype.nix") ];
+
nixpkgs.config.packageOverrides = pkgs: {
nur = import (builtins.fetchTarball {
url = "https://github.com/nix-community/NUR/archive/e78eb8016f2b1b20298367804085d6d147557ba0.tar.gz";
@@ -41,6 +46,7 @@
file
nur.repos.kira-bruneau.rofi-wayland
rofimoji
+ anytype
];
programs.git = {