From a3ae63605a4a9f52ab24867dbf088c01eea2c36d Mon Sep 17 00:00:00 2001 From: Krzysztof Saczuk Date: Fri, 1 Nov 2024 16:54:32 +0100 Subject: [PATCH] refactor(flake): switch to `unstable` branch for entire nixos system --- configuration.nix | 7 ++--- flake.lock | 44 ++++++++-------------------- flake.nix | 24 ++++++--------- lib/default.nix | 9 +++--- lib/desktop.nix | 3 +- lib/hosts.nix | 3 +- lib/overlays.nix | 12 ++------ lib/scripts.nix | 3 +- modules/desktop/apps.nix | 7 ++--- modules/desktop/apps/_1password.nix | 9 ++---- modules/desktop/apps/gtk.nix | 5 ++-- modules/desktop/apps/nh.nix | 7 +---- modules/desktop/apps/qt.nix | 4 +-- modules/desktop/apps/thunderbird.nix | 2 -- modules/desktop/apps/vesktop.nix | 1 - modules/desktop/gaming/mihoyo.nix | 6 +++- modules/desktop/wm/hyprland.nix | 2 +- modules/dev/ide.nix | 7 ++--- modules/dev/nostale.nix | 1 + modules/dev/tools.nix | 5 ++-- modules/dev/vscode.nix | 4 +-- modules/hardware/amdgpu.nix | 5 ++-- modules/hardware/sound.nix | 1 - modules/hardware/yubikey.nix | 6 ++-- modules/services/gnome-keyring.nix | 2 +- modules/shell/eza.nix | 2 +- overlays/_1password.nix | 9 +++--- overlays/httpie-desktop.nix | 7 ++--- overlays/imhex.nix | 9 +++--- overlays/swaync.nix | 7 ++--- 30 files changed, 80 insertions(+), 133 deletions(-) diff --git a/configuration.nix b/configuration.nix index dd29bbe..2f38ceb 100644 --- a/configuration.nix +++ b/configuration.nix @@ -27,14 +27,11 @@ with lib.my; { experimental-features = nix-command flakes !include ${config.sops.templates."nix/access_tokens.conf".path} ''; - package = pkgs.nixFlakes; + package = pkgs.nixVersions.latest; nixPath = ["nixpkgs=${inputs.nixpkgs}"]; }; - nixpkgs.config = { - allowBroken = false; - allowUnfree = true; - }; + nixpkgs.pkgs = pkgs; # System time time.timeZone = "Europe/Warsaw"; diff --git a/flake.lock b/flake.lock index 857c225..aa66d4a 100644 --- a/flake.lock +++ b/flake.lock @@ -10,16 +10,15 @@ ] }, "locked": { - "lastModified": 1728524497, - "narHash": "sha256-hphRisziRbK6xISe0D771O87CmUOtGe0QPkQSuFR9pU=", + "lastModified": 1728524457, + "narHash": "sha256-R+GJ3H1PvRUHLm45muY1KEezhfgIl8l7HJ36DySZMu0=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "d4461dbcc36171e33a1615755342b27c1184df74", + "rev": "5611dd61df02e0bc5d62bb3f5388821d8854faff", "type": "github" }, "original": { "owner": "ezKEa", - "ref": "release-24.05", "repo": "aagl-gtk-on-nix", "type": "github" } @@ -158,16 +157,15 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1730450782, + "narHash": "sha256-0AfApF8aexgB6o34qqLW2cCX4LaWJajBVdU6ddiWZBM=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "8ca921e5a806b5b6171add542defe7bdac79d189", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -209,16 +207,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729691686, - "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.05", + "ref": "nixos-unstable", "type": "indirect" } }, @@ -249,21 +247,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "nostale-dev-env": { "inputs": { "flake-parts": "flake-parts", @@ -275,11 +258,11 @@ ] }, "locked": { - "lastModified": 1729181556, - "narHash": "sha256-178Wm1WCgjnKFASAMBkcZ1smNGZFKqjKo66NzwYoUWc=", + "lastModified": 1730470283, + "narHash": "sha256-2eRQprhBgzMt7yonixrYWpVkg60tKVxuK2dZNWGYqbw=", "owner": "zakuciael", "repo": "nostale-dev-env", - "rev": "0a677220eb5642f331277a88af3265202e33e133", + "rev": "ec8a258fb49b1c4ebaea410b5e10d67f3bccda4f", "type": "github" }, "original": { @@ -323,7 +306,6 @@ "nix-colors": "nix-colors", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable", "nostale-dev-env": "nostale-dev-env", "rofi-jetbrains": "rofi-jetbrains", "sops-nix": "sops-nix", diff --git a/flake.nix b/flake.nix index a4f6cda..6efc5b7 100644 --- a/flake.nix +++ b/flake.nix @@ -2,15 +2,14 @@ description = "A Super-Duper Invincible Shining Sparkly Magic NixOS Config"; # Credits: Genshin Impact inputs = { - nixpkgs.url = "nixpkgs/nixos-24.05"; - nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; + nixpkgs.url = "nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; flake-utils.url = "github:numtide/flake-utils"; flake-compat.url = "github:edolstra/flake-compat"; nix-colors.url = "github:misterio77/nix-colors"; catppuccin.url = "github:catppuccin/nix"; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; distro-grub-themes = { @@ -34,7 +33,7 @@ inputs.flake-utils.follows = "flake-utils"; }; aagl = { - url = "github:ezKEa/aagl-gtk-on-nix/release-24.05"; + url = "github:ezKEa/aagl-gtk-on-nix"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-compat.follows = "flake-compat"; }; @@ -56,16 +55,11 @@ pkgs = import inputs.nixpkgs { inherit system; - config.allowUnfree = true; - - overlays = lib.my.overlays.pkgs; - }; - - unstable = import inputs.nixpkgs-unstable { - inherit system; - config.allowUnfree = true; + config = { + allowUnfree = true; + }; - overlays = lib.my.overlays.unstable; + overlays = lib.my.overlays.pkgs ++ lib.singleton (inputs.aagl.overlays.default); }; inputs = @@ -97,7 +91,7 @@ lib = nixpkgs.lib.extend (self: super: { hm = home-manager.lib.hm; my = import ./lib { - inherit lib pkgs unstable inputs username system; + inherit lib pkgs inputs username system; }; }); in { @@ -110,6 +104,6 @@ devShells.${system}.default = pkgs.callPackage ./shell.nix {}; - inherit pkgs unstable inputs lib; + inherit pkgs inputs lib; }; } diff --git a/lib/default.nix b/lib/default.nix index 8dfcb91..0859e11 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,7 +1,6 @@ { lib, pkgs, - unstable, inputs, username, system, @@ -12,11 +11,11 @@ defs = import ./defs.nix {inherit lib;}; dotfiles = mapper.mapDirToAttrs ./../dotfiles; - scripts = import ./scripts.nix {inherit lib pkgs unstable inputs username dotfiles;}; + scripts = import ./scripts.nix {inherit lib pkgs inputs username dotfiles;}; in { inherit utils mapper defs; - hosts = import ./hosts.nix {inherit lib pkgs unstable inputs username dotfiles scripts;}; - desktop = import ./desktop.nix {inherit lib pkgs unstable inputs username dotfiles scripts;}; - overlays = import ./overlays.nix {inherit lib pkgs unstable inputs system;}; + hosts = import ./hosts.nix {inherit lib pkgs inputs username dotfiles scripts;}; + desktop = import ./desktop.nix {inherit lib pkgs inputs username dotfiles scripts;}; + overlays = import ./overlays.nix {inherit lib pkgs inputs system;}; } diff --git a/lib/desktop.nix b/lib/desktop.nix index 067da21..bd67e1a 100644 --- a/lib/desktop.nix +++ b/lib/desktop.nix @@ -1,7 +1,6 @@ { lib, pkgs, - unstable, inputs, username, dotfiles, @@ -12,7 +11,7 @@ with lib; with lib.my; let mkDesktopApp = config: name: desktop: import ./../modules/desktop/apps/${name}.nix { - inherit config lib pkgs unstable inputs username dotfiles scripts desktop; + inherit config lib pkgs inputs username dotfiles scripts desktop; colorScheme = assert assertMsg (config.home-manager.users.${username}.colorScheme.author != "") "You need to select a nix-colors theme to use this ${name} config"; diff --git a/lib/hosts.nix b/lib/hosts.nix index d960531..83d11d8 100644 --- a/lib/hosts.nix +++ b/lib/hosts.nix @@ -1,7 +1,6 @@ { lib, pkgs, - unstable, inputs, username, dotfiles, @@ -14,7 +13,7 @@ with lib.my; { inherit (pkgs) system; specialArgs = { - inherit lib pkgs unstable inputs username dotfiles scripts; + inherit lib pkgs inputs username dotfiles scripts; hostname = name; }; diff --git a/lib/overlays.nix b/lib/overlays.nix index 6e7abb7..595944e 100644 --- a/lib/overlays.nix +++ b/lib/overlays.nix @@ -1,7 +1,6 @@ { lib, pkgs, - unstable, inputs, system, ... @@ -10,7 +9,7 @@ with lib; with lib.my; let overlays = builtins.map - (file: import file {inherit lib pkgs unstable inputs system;}) + (file: import file {inherit lib pkgs inputs system;}) (utils.recursiveReadDir ./../overlays {suffixes = ["nix"];}); privatePkgsOverlays = let suffix = "default.nix"; @@ -25,13 +24,6 @@ with lib.my; let } )) (utils.recursiveReadDir ./../pkgs {suffixes = [suffix];}); - getOverlaysFromAttr = attr: - flatten ( - builtins.filter - (overlay: overlay != null) - (builtins.map (config: attrByPath [attr] null config) overlays) - ); in { - pkgs = privatePkgsOverlays ++ (getOverlaysFromAttr "pkgs"); - unstable = getOverlaysFromAttr "unstable"; + pkgs = privatePkgsOverlays ++ flatten (builtins.filter (overlay: overlay != null) overlays); } diff --git a/lib/scripts.nix b/lib/scripts.nix index 58561a6..adc2c39 100644 --- a/lib/scripts.nix +++ b/lib/scripts.nix @@ -1,7 +1,6 @@ { lib, pkgs, - unstable, inputs, username, dotfiles, @@ -12,7 +11,7 @@ with lib.my; let mkScripts = config: builtins.filter (value: hasAttrByPath ["package"] value) ( builtins.map - (file: import file {inherit config lib pkgs unstable inputs username dotfiles;}) + (file: import file {inherit config lib pkgs inputs username dotfiles;}) (utils.recursiveReadDir ./../scripts {suffixes = ["nix"];}) ); in { diff --git a/modules/desktop/apps.nix b/modules/desktop/apps.nix index f86728b..c15c677 100644 --- a/modules/desktop/apps.nix +++ b/modules/desktop/apps.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - unstable, inputs, username, ... @@ -34,19 +33,19 @@ in { google-chrome # Files - cinnamon.nemo + nemo libsForQt5.ark # Music, Videos, Photos, etc. spotify - gnome.eog + eog gnome-text-editor vlc qalculate-gtk # Other font-manager - unstable.ytmdesktop + ytmdesktop ]; }; }; diff --git a/modules/desktop/apps/_1password.nix b/modules/desktop/apps/_1password.nix index 247ce17..7b26322 100644 --- a/modules/desktop/apps/_1password.nix +++ b/modules/desktop/apps/_1password.nix @@ -2,8 +2,6 @@ config, lib, pkgs, - unstable, - inputs, username, desktop, ... @@ -24,12 +22,12 @@ in { programs = { _1password = { enable = true; - package = unstable._1password-beta; + package = pkgs._1password-cli-beta; }; _1password-gui = { enable = true; polkitPolicyOwners = [username]; - package = unstable._1password-gui-beta; + package = pkgs._1password-gui-beta; }; fish.interactiveShellInit = '' @@ -95,8 +93,7 @@ in { "center, class:(${class})" "monitor ${monitor}, class:(${class})" # "stayfocused,class:^(${class})$" - # "forceinput,class:^(${class})$" # FIXME: Not working on flake Hyprland - # "windowdance,class:^(${class})$" # FIXME: Not working on flake Hyprland + "allowsinput on,class:^(${class})$" "noblur,class:^(${class})$" "noinitialfocus,class:^(${class})$" "dimaround,class:^(${class})$" diff --git a/modules/desktop/apps/gtk.nix b/modules/desktop/apps/gtk.nix index e262f0b..ea237bf 100644 --- a/modules/desktop/apps/gtk.nix +++ b/modules/desktop/apps/gtk.nix @@ -1,6 +1,5 @@ { pkgs, - unstable, username, ... }: { @@ -8,7 +7,7 @@ home-manager.users.${username} = rec { home = { - packages = with pkgs; [gnome.dconf-editor]; + packages = with pkgs; [dconf-editor]; sessionVariables = { XCURSOR_PATH = "${gtk.cursorTheme.package}/share/icons"; @@ -25,7 +24,7 @@ }; iconTheme = { name = "WhiteSur-dark"; - package = unstable.whitesur-icon-theme.override { + package = pkgs.whitesur-icon-theme.override { boldPanelIcons = true; alternativeIcons = true; themeVariants = ["default"]; diff --git a/modules/desktop/apps/nh.nix b/modules/desktop/apps/nh.nix index ba96e41..e84bdb2 100644 --- a/modules/desktop/apps/nh.nix +++ b/modules/desktop/apps/nh.nix @@ -1,12 +1,7 @@ -{ - lib, - unstable, - ... -}: +{lib, ...}: with lib; { programs.nh = { enable = true; - package = unstable.nh; clean = { enable = true; dates = "daily"; diff --git a/modules/desktop/apps/qt.nix b/modules/desktop/apps/qt.nix index 0977b72..cbc4efe 100644 --- a/modules/desktop/apps/qt.nix +++ b/modules/desktop/apps/qt.nix @@ -12,10 +12,10 @@ mkdir -p $out/doc - name= ./install.sh --opaque + name= ./install.sh -w opaque mkdir -p $out/share/sddm/themes - cp -a sddm/WhiteSur $out/share/sddm/themes/ + sddm/install.sh runHook postInstall ''; diff --git a/modules/desktop/apps/thunderbird.nix b/modules/desktop/apps/thunderbird.nix index 166e752..288016c 100644 --- a/modules/desktop/apps/thunderbird.nix +++ b/modules/desktop/apps/thunderbird.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - unstable, username, ... }: @@ -206,7 +205,6 @@ in { home-manager.users.${username} = { programs.thunderbird = { enable = true; - package = unstable.thunderbird; profiles = { "default" = { isDefault = true; diff --git a/modules/desktop/apps/vesktop.nix b/modules/desktop/apps/vesktop.nix index 473cbd5..853c863 100644 --- a/modules/desktop/apps/vesktop.nix +++ b/modules/desktop/apps/vesktop.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - unstable, username, desktop, ... diff --git a/modules/desktop/gaming/mihoyo.nix b/modules/desktop/gaming/mihoyo.nix index e392bc8..fe02b2d 100644 --- a/modules/desktop/gaming/mihoyo.nix +++ b/modules/desktop/gaming/mihoyo.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + inputs, username, ... }: @@ -87,6 +88,9 @@ in { }; }; - programs.anime-game-launcher.enable = true; + programs.anime-game-launcher = { + enable = true; + package = inputs.aagl.packages.anime-game-launcher; + }; }; } diff --git a/modules/desktop/wm/hyprland.nix b/modules/desktop/wm/hyprland.nix index 166b9c6..1b428b8 100644 --- a/modules/desktop/wm/hyprland.nix +++ b/modules/desktop/wm/hyprland.nix @@ -157,7 +157,7 @@ in "$mod, KP_Subtract, exec, ${getExe scriptPackages.elgato-mic-fix}" "SHIFT CTRL, space, exec, ${getExe scriptPackages.rofi-launcher} drun" "SHIFT CTRL, R, exec, ${getExe scriptPackages.rofi-launcher} jetbrains" - "SHIFT CTRL, E, exec, ${getExe pkgs.cinnamon.nemo}" + "SHIFT CTRL, E, exec, ${getExe pkgs.nemo}" "SHIFT CTRL, Q, exec, ${getExe scriptPackages.rofi-powermenu}" ]; diff --git a/modules/dev/ide.nix b/modules/dev/ide.nix index 78a0d97..534db5e 100644 --- a/modules/dev/ide.nix +++ b/modules/dev/ide.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - unstable, username, ... }: @@ -10,7 +9,7 @@ with lib; with lib.my; let cfg = config.modules.dev.ides; - goland = unstable.jetbrains.goland.overrideAttrs (attrs: { + goland = pkgs.jetbrains.goland.overrideAttrs (attrs: { postFixup = (attrs.postFixup or "") + optionalString pkgs.stdenv.isLinux '' @@ -18,7 +17,7 @@ with lib.my; let rm $out/goland/plugins/go-plugin/lib/dlv/linux/dlv fi - ln -s ${unstable.delve}/bin/dlv $out/goland/plugins/go-plugin/lib/dlv/linux/dlv + ln -s ${pkgs.delve}/bin/dlv $out/goland/plugins/go-plugin/lib/dlv/linux/dlv ''; }); @@ -27,7 +26,7 @@ with lib.my; let name = value.pname; inherit value; }) - (with unstable.jetbrains; [ + (with pkgs.jetbrains; [ clion datagrip dataspell diff --git a/modules/dev/nostale.nix b/modules/dev/nostale.nix index 628b188..291acc1 100644 --- a/modules/dev/nostale.nix +++ b/modules/dev/nostale.nix @@ -21,6 +21,7 @@ in { config = mkIf (cfg.enable) { home-manager.users.${username} = { home.packages = with inputs.nostale-dev-env.packages; [ + # FIXME: One of those can't be built DevTaleGUI proton nos-downloader diff --git a/modules/dev/tools.nix b/modules/dev/tools.nix index 23c4a81..2c785c6 100644 --- a/modules/dev/tools.nix +++ b/modules/dev/tools.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - unstable, username, ... }: @@ -18,12 +17,12 @@ in { home-manager.users.${username} = { home.packages = with pkgs; [ # Git - unstable.graphite-cli + graphite-cli gh # Reverse Engineering ghidra-bin - unstable.imhex + imhex # MongoDB mongosh diff --git a/modules/dev/vscode.nix b/modules/dev/vscode.nix index b6748e1..70eebae 100644 --- a/modules/dev/vscode.nix +++ b/modules/dev/vscode.nix @@ -1,7 +1,7 @@ { config, lib, - unstable, + pkgs, username, ... }: @@ -17,7 +17,7 @@ in { home-manager.users.${username} = { home.packages = if (cfg.enable) - then [unstable.vscode] + then [pkgs.vscode] else []; services.vscode-server.enable = cfg.server; }; diff --git a/modules/hardware/amdgpu.nix b/modules/hardware/amdgpu.nix index 7860f71..b49d052 100644 --- a/modules/hardware/amdgpu.nix +++ b/modules/hardware/amdgpu.nix @@ -17,10 +17,9 @@ in { hardware = { enableRedistributableFirmware = true; - opengl = { + graphics = { enable = true; - driSupport = true; - driSupport32Bit = true; + enable32Bit = true; }; }; }; diff --git a/modules/hardware/sound.nix b/modules/hardware/sound.nix index 5526c72..df20022 100644 --- a/modules/hardware/sound.nix +++ b/modules/hardware/sound.nix @@ -22,7 +22,6 @@ in { config = mkIf (cfg.enable) { home-manager.users.${username}.home.packages = with pkgs; [pavucontrol]; - sound.enable = true; security.rtkit.enable = true; hardware.pulseaudio = rec { diff --git a/modules/hardware/yubikey.nix b/modules/hardware/yubikey.nix index c670472..036e3c4 100644 --- a/modules/hardware/yubikey.nix +++ b/modules/hardware/yubikey.nix @@ -27,8 +27,10 @@ in { security.pam = { u2f = { enable = true; - cue = true; - interactive = cfg.interactive; + settings = { + cue = true; + interactive = cfg.interactive; + }; control = "sufficient"; }; diff --git a/modules/services/gnome-keyring.nix b/modules/services/gnome-keyring.nix index 396e4c8..6c6495f 100644 --- a/modules/services/gnome-keyring.nix +++ b/modules/services/gnome-keyring.nix @@ -30,7 +30,7 @@ in { Service = { Type = "simple"; StandardError = "journal"; - ExecStart = ''${pkgs.gnome.gnome-keyring}/bin/gnome-keyring-daemon --start --components="pkcs11,secrets"''; + ExecStart = ''${pkgs.gnome-keyring}/bin/gnome-keyring-daemon --start --components="pkcs11,secrets"''; Restart = "on-failure"; }; Install = { diff --git a/modules/shell/eza.nix b/modules/shell/eza.nix index 2b275ef..12bff90 100644 --- a/modules/shell/eza.nix +++ b/modules/shell/eza.nix @@ -17,7 +17,7 @@ in { programs.eza = { enable = true; git = config.modules.dev.git.enable; - icons = true; + icons = "auto"; }; }; }; diff --git a/overlays/_1password.nix b/overlays/_1password.nix index c013d83..7539136 100644 --- a/overlays/_1password.nix +++ b/overlays/_1password.nix @@ -1,7 +1,7 @@ {lib, ...}: -with lib; { - unstable = singleton (final: prev: { - _1password-beta = prev._1password.overrideAttrs (prevAttrs: let +with lib; + singleton (final: prev: { + _1password-cli-beta = prev._1password-cli.overrideAttrs (prevAttrs: let inherit (prev) stdenv fetchurl fetchzip; inherit (stdenv.hostPlatform) system; @@ -35,5 +35,4 @@ with lib; { then sources.${system} else throw "Source for ${pname} is not available for ${system}"; }); - }); -} + }) diff --git a/overlays/httpie-desktop.nix b/overlays/httpie-desktop.nix index 8535cf7..b0faf45 100644 --- a/overlays/httpie-desktop.nix +++ b/overlays/httpie-desktop.nix @@ -1,6 +1,6 @@ {lib, ...}: -with lib; { - pkgs = singleton (final: prev: { +with lib; + singleton (final: prev: { httpie-desktop = let inherit (prev) fetchurl appimageTools; @@ -37,5 +37,4 @@ with lib; { platforms = ["x86_64-linux"]; }; }; - }); -} + }) diff --git a/overlays/imhex.nix b/overlays/imhex.nix index c64d684..7d75d45 100644 --- a/overlays/imhex.nix +++ b/overlays/imhex.nix @@ -1,7 +1,7 @@ {lib, ...}: -with lib; { - # Adds fixes for https://github.com/NixOS/nixpkgs/issues/309532 - unstable = singleton (final: prev: { +with lib; # Adds fixes for https://github.com/NixOS/nixpkgs/issues/309532 + + singleton (final: prev: { # TODO: Remove when this https://github.com/NixOS/nixpkgs/pull/323501 is merged to upstream imhex = prev.imhex.overrideAttrs (prevAttrs: let inherit (prev) fetchFromGitHub; @@ -82,5 +82,4 @@ with lib; { rsync -av --exclude="*_schema.json" ${patterns_src}/{constants,encodings,includes,magic,patterns} $out/share/imhex ''; }); - }); -} + }) diff --git a/overlays/swaync.nix b/overlays/swaync.nix index e0a42c9..92baab2 100644 --- a/overlays/swaync.nix +++ b/overlays/swaync.nix @@ -1,6 +1,6 @@ {lib, ...}: -with lib; { - pkgs = singleton (final: prev: { +with lib; + singleton (final: prev: { # More up to date version of this https://github.com/ErikReider/SwayNotificationCenter/pull/262 swaynotificationcenter = prev.swaynotificationcenter.overrideAttrs (prevAttrs: { src = final.fetchFromGitHub { @@ -10,5 +10,4 @@ with lib; { hash = "sha256-I77SYSQZkhNWgCm1WMPJULYiqQEdH4g0zWhCX547CNs="; }; }); - }); -} + })