summaryrefslogtreecommitdiff
path: root/modules/root/software
diff options
context:
space:
mode:
Diffstat (limited to 'modules/root/software')
-rw-r--r--modules/root/software/desktop.nix1
-rw-r--r--modules/root/software/development.nix7
-rw-r--r--modules/root/software/overlays.nix22
-rw-r--r--modules/root/software/utilities.nix1
4 files changed, 21 insertions, 10 deletions
diff --git a/modules/root/software/desktop.nix b/modules/root/software/desktop.nix
index b194029..dbcce1e 100644
--- a/modules/root/software/desktop.nix
+++ b/modules/root/software/desktop.nix
@@ -53,6 +53,7 @@
inkscape
] ++ pkgs.lib.optionals config.software.desktop.office.enable [
# Office
+ kdePackages.okular
libreoffice
pdfchain
thunderbird
diff --git a/modules/root/software/development.nix b/modules/root/software/development.nix
index 2a4dfba..af8a8a7 100644
--- a/modules/root/software/development.nix
+++ b/modules/root/software/development.nix
@@ -5,7 +5,7 @@
config = lib.mkIf config.software.development.enable {
environment.systemPackages = with pkgs; [
- adb-sync
+ #adb-sync
android-tools
gcc
git
@@ -14,5 +14,10 @@
lua
pkg-config
];
+
+ # Open 1313 for hugo serve
+ networking.firewall.allowedTCPPorts = [
+ 1313
+ ];
};
}
diff --git a/modules/root/software/overlays.nix b/modules/root/software/overlays.nix
index 670acfb..04ad398 100644
--- a/modules/root/software/overlays.nix
+++ b/modules/root/software/overlays.nix
@@ -2,15 +2,19 @@
nixpkgs.overlays = with pkgs; [
(final: prev: {
crazydiskinfo = (callPackage ./derivations/crazydiskinfo {});
- })
- (final: prev: {
- lowbat = (callPackage ./derivations/lowbat {});
- })
- (final: prev: {
- pavolctld = (callPackage ./derivations/pavolctld {});
- })
- (final: prev: {
- st = (callPackage ./derivations/st {});
+ lowbat = (callPackage ./derivations/lowbat {});
+ st = (callPackage ./derivations/st {});
+ workcentre-7800-series = (callPackage ./derivations/xerox-workcentre-7800-series-driver {});
+
+ # Use my vimv-rs until pr gets merged
+ vimv-rs = prev.vimv-rs.overrideAttrs (oldAttrs: {
+ src = fetchFromGitHub {
+ owner = "tjkeller-xyz";
+ repo = "vimv-rs";
+ rev = "5deb76fb81dd4acf3c4809087ff3a1d846ab4769";
+ sha256 = "sha256-XMn+5mIxSEHaR31ixMi6o7PSkN1iYjDT4aOiQkfEwpA=";
+ };
+ });
})
];
}
diff --git a/modules/root/software/utilities.nix b/modules/root/software/utilities.nix
index 9bd76a6..79285a1 100644
--- a/modules/root/software/utilities.nix
+++ b/modules/root/software/utilities.nix
@@ -25,6 +25,7 @@
testdisk
tmux
uhubctl
+ vimv-rs
wget
wireguard-tools
xxHash