diff --git a/flake.lock b/flake.lock index ee3b5c7..c52d4b1 100644 --- a/flake.lock +++ b/flake.lock @@ -149,6 +149,28 @@ "type": "github" } }, + "emacs-overlay_2": { + "inputs": { + "nixpkgs": [ + "mfi", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2" + }, + "locked": { + "lastModified": 1738574175, + "narHash": "sha256-5eAdRQf9tG9YQq4SUcvESFVGn1fpIABB9noTTjPYH7c=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "969abb7370a3957d80cbbca57f5ee8a66a0e73ac", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -264,6 +286,27 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "mfi", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1714641030, + "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nur", @@ -286,7 +329,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1694529238, @@ -522,11 +565,32 @@ "type": "github" } }, + "mfi": { + "inputs": { + "emacs-overlay": "emacs-overlay_2", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_5", + "systems": "systems_2" + }, + "locked": { + "lastModified": 1738585518, + "narHash": "sha256-NnmmWOpOlQ9bVHDz9qHYz8EARc9haoHKa2yaHRuY9/c=", + "ref": "refs/heads/main", + "rev": "29df32e717a1d4ece474f278ae7cb9ce4dd467e5", + "revCount": 50, + "type": "git", + "url": "file:///home/geko/Repos/magit-file-icons/" + }, + "original": { + "type": "git", + "url": "file:///home/geko/Repos/magit-file-icons/" + } + }, "nix-pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1737465171, @@ -561,7 +625,7 @@ "nixos-wsl": { "inputs": { "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1736095716, @@ -622,6 +686,22 @@ "type": "github" } }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1738435198, + "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unfree": { "inputs": { "nixpkgs": [ @@ -642,6 +722,22 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1736798957, + "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1738410390, @@ -691,6 +787,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1738410390, + "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1730768919, "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", @@ -706,7 +818,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1733384649, "narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=", @@ -722,7 +834,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1738410390, "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", @@ -738,7 +850,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1738142207, "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", @@ -754,26 +866,10 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1736798957, - "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_8", + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_9", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -830,10 +926,11 @@ "flake-parts": "flake-parts", "home-manager": "home-manager_2", "hyprland-contrib": "hyprland-contrib", + "mfi": "mfi", "nix-pre-commit-hooks": "nix-pre-commit-hooks", "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-unfree": "nixpkgs-unfree", "nur": "nur", "ranger-devicons": "ranger-devicons", @@ -841,7 +938,7 @@ "snowfall-lib": "snowfall-lib", "spicetify-nix": "spicetify-nix", "stylix": "stylix", - "systems": "systems_5" + "systems": "systems_6" } }, "snowfall-lib": { @@ -872,7 +969,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1738580832, @@ -900,8 +997,8 @@ "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_9", - "systems": "systems_4", + "nixpkgs": "nixpkgs_10", + "systems": "systems_5", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux", @@ -996,6 +1093,21 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 777a54c..095dfc3 100644 --- a/flake.nix +++ b/flake.nix @@ -41,6 +41,8 @@ emacs-lsp-booster.url = "github:slotThe/emacs-lsp-booster-flake"; emacs-lsp-booster.inputs.nixpkgs.follows = "nixpkgs"; + + mfi.url = "git+file:///home/geko/Repos/magit-file-icons/"; }; outputs = diff --git a/modules/nixos/programs/emacs/default.nix b/modules/nixos/programs/emacs/default.nix index ce75e57..aca759b 100644 --- a/modules/nixos/programs/emacs/default.nix +++ b/modules/nixos/programs/emacs/default.nix @@ -42,6 +42,7 @@ in pkgs.elementary.adwaita-dark-theme pkgs.elementary.anisochromatic pkgs.elementary.miasma-theme + inputs.mfi.packages.${pkgs.system}.default ]; }; earlyInitText = readFiles [ diff --git a/modules/nixos/programs/emacs/init.el b/modules/nixos/programs/emacs/init.el index 779ef45..84f3f2e 100644 --- a/modules/nixos/programs/emacs/init.el +++ b/modules/nixos/programs/emacs/init.el @@ -705,6 +705,7 @@ (setq ediff-window-setup-function 'ediff-setup-windows-plain) (use-package magit-file-icons + :ensure nil :after magit :config (magit-file-icons-mode))