rouven.seifert/nixos-config
1
1
Fork 0
mirror of https://git.sr.ht/~rouven/nixos-config synced 2024-11-15 05:13:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

beautified overlays

Browse source
This commit is contained in:
Rouven Seifert 2023-06-22 14:34:05 +02:00
parent 99432a7244
commit 2d190a8791
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
8 changed files with 51 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
flake.lock
View file

@ -170,11 +170,11 @@
]
},
"locked": {
"lastModified": 1687204608,
"narHash": "sha256-rZ0e0iAIQM7vlsMd2/pcGfymZzNBRawObFgqIpxE94c=",
"lastModified": 1687421788,
"narHash": "sha256-CgoHjiUBnru0bV4PE8z1R6ZD9KeWtuAaUkyYWYJmQUE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "f06a43dca05fb7f1aa44742bf861d9c827b45122",
"rev": "a4817894576f9cd01d784e60a0bfb143c81fc2be",
"type": "github"
},
"original": {
@ -471,11 +471,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1687058111,
"narHash": "sha256-xDSn/APfAdJinHV4reTfplX5XnLsJSGdVwHpmdgP9Mo=",
"lastModified": 1687398569,
"narHash": "sha256-e/umuIKFcFtZtWeX369Hbdt9r+GQ48moDmlTcyHWL28=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "1634d2da53f079e7f5924efa7a96511cd9596f81",
"rev": "2ff6973350682f8d16371f8c071a304b8067f192",
"type": "github"
},
"original": {

4
flake.nix
View file

@ -47,7 +47,6 @@
url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs =
@ -74,6 +73,8 @@
};
hydraJobs = self.packages;
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
overlays.default = import ./overlays;
nixosConfigurations = {
thinkpad = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
@ -89,6 +90,7 @@
impermanence.nixosModules.impermanence
lanzaboote.nixosModules.lanzaboote
{
nixpkgs.overlays = [ self.overlays.default ];
home-manager.extraSpecialArgs = attrs;
home-manager.users.rouven = {
imports = [

1
hosts/nuc/default.nix
View file

@ -22,7 +22,6 @@
};
services.btrfs.autoScrub.enable = true;
nix.settings = {
cores = 3;
auto-optimise-store = true;
};

4
hosts/thinkpad/default.nix
View file

@ -32,7 +32,7 @@
experimental-features = [ "nix-command" "flakes" ];
auto-optimise-store = true;
substituters = [
"ssh-ng://nuc.lan"
"ssh://nuc.lan"
];
trusted-public-keys = [
"nuc.lan:a9UkVw3AizAKCER1CfNGhx8UOMF4t4UGE3GJ9dmHwJc="
@ -47,7 +47,7 @@
hostName = "nuc.lan";
system = "x86_64-linux";
protocol = "ssh-ng";
maxJobs = 2;
maxJobs = 4;
speedFactor = 1;
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
mandatoryFeatures = [ ];

33
overlays/default.nix Normal file
View file

@ -0,0 +1,33 @@
_final: prev:
let
inherit (prev) callPackage;
in
{
wpa_supplicant_gui = prev.wpa_supplicant_gui.overrideAttrs
(old: {
# better desktop application name. "wpa_gui" kinda sucks
postInstall = old.postInstall + ''
substituteInPlace $out/share/applications/wpa_gui.desktop --replace "Name=wpa_gui" "Name=Manage Wifi"
'';
});
pcmanfm = prev.pcmanfm.overrideAttrs (_: {
# remove deskop preferences shortcut
postInstall = ''
rm $out/share/applications/pcmanfm-desktop-pref.desktop
'';
});
wdisplays = prev.wdisplays.overrideAttrs (_: {
# better desktop application name.
postInstall = ''
substituteInPlace $out/share/applications/network.cycles.wdisplays.desktop --replace "Name=wdisplays" "Name=Manage Displays"
'';
});
pww = callPackage ../pkgs/pww { };
jmri = callPackage ../pkgs/jmri { };
adguardian-term = callPackage ../pkgs/adguardian-term { };
}

10
users/rouven/modules/packages.nix
View file

@ -3,13 +3,7 @@
home.packages = with pkgs; [
# essentials
(wpa_supplicant_gui.overrideAttrs (prev: {
# better desktop application name. "wpa_gui" kinda sucks
postInstall = prev.postInstall + ''
substituteInPlace $out/share/applications/wpa_gui.desktop --replace "Name=wpa_gui" "Name=Manage Wifi"
'';
})) # manage wifi
wpa_supplicant_gui
pcmanfm
xdg-utils # used for xdg-open
snapper-gui
@ -62,7 +56,7 @@
rustfmt
clippy
gcc
self.packages.x86_64-linux.adguardian-term
adguardian-term
# libs
libyubikey

1
users/rouven/modules/sway/session.nix
View file

@ -5,6 +5,7 @@
wl-clipboard
swaynotificationcenter
playerctl
wdisplays
];
services.swayidle = {

8
users/rouven/modules/sway/waybar.nix
View file

@ -1,4 +1,4 @@
{ self, config, pkgs, lib, ... }:
{ config, pkgs, lib, ... }:
{
systemd.user.services.waybar.Service.Environment = "PATH=${pkgs.swaynotificationcenter}/bin";
programs.waybar = {
@ -55,7 +55,7 @@
format = " {}";
max-length = 80;
return-type = "json";
exec = "${lib.getExe self.packages.x86_64-linux.pww} -w spotifyd:title -p None 2> /dev/null";
exec = "${lib.getExe pkgs.pww} -w spotifyd:title -p None 2> /dev/null";
};
cpu = {
format = "{usage}% ";
@ -68,8 +68,8 @@
};
pulseaudio = {
format = "{volume}% {icon} {format_source}";
format-bluetooth = "{volume}% {icon} {format_source} ";
format-bluetooth-muted = " {icon} {format_source}";
format-bluetooth = "{volume}% {icon} {format_source} ";
format-bluetooth-muted = " {icon} {format_source}";
format-muted = "󰝟 {format_source}";
format-source = " {volume}% ";
format-source-muted = " ";