From 2d190a879145b92538fc36760457333ad1cb45e0 Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Thu, 22 Jun 2023 14:34:05 +0200 Subject: [PATCH] beautified overlays --- flake.lock | 12 +++++----- flake.nix | 4 +++- hosts/nuc/default.nix | 1 - hosts/thinkpad/default.nix | 4 ++-- overlays/default.nix | 33 +++++++++++++++++++++++++++ users/rouven/modules/packages.nix | 10 ++------ users/rouven/modules/sway/session.nix | 1 + users/rouven/modules/sway/waybar.nix | 8 +++---- 8 files changed, 51 insertions(+), 22 deletions(-) create mode 100644 overlays/default.nix diff --git a/flake.lock b/flake.lock index e3ba096..c06624a 100644 --- a/flake.lock +++ b/flake.lock @@ -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": { diff --git a/flake.nix b/flake.nix index cd7ab93..b116fdd 100644 --- a/flake.nix +++ b/flake.nix @@ -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 = [ diff --git a/hosts/nuc/default.nix b/hosts/nuc/default.nix index 325919d..aa2a3e8 100644 --- a/hosts/nuc/default.nix +++ b/hosts/nuc/default.nix @@ -22,7 +22,6 @@ }; services.btrfs.autoScrub.enable = true; nix.settings = { - cores = 3; auto-optimise-store = true; }; diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index 841d529..4257d7d 100755 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -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 = [ ]; diff --git a/overlays/default.nix b/overlays/default.nix new file mode 100644 index 0000000..f0a0d6c --- /dev/null +++ b/overlays/default.nix @@ -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 { }; +} diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix index 071187b..431e033 100644 --- a/users/rouven/modules/packages.nix +++ b/users/rouven/modules/packages.nix @@ -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 diff --git a/users/rouven/modules/sway/session.nix b/users/rouven/modules/sway/session.nix index 516b9ef..89836d1 100644 --- a/users/rouven/modules/sway/session.nix +++ b/users/rouven/modules/sway/session.nix @@ -5,6 +5,7 @@ wl-clipboard swaynotificationcenter playerctl + wdisplays ]; services.swayidle = { diff --git a/users/rouven/modules/sway/waybar.nix b/users/rouven/modules/sway/waybar.nix index 9b718f2..ec6101e 100644 --- a/users/rouven/modules/sway/waybar.nix +++ b/users/rouven/modules/sway/waybar.nix @@ -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 = " ";