From 9e5aafde464d5a0e1a2bee97c9e42b1cdb1aa8ed Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Mon, 24 Feb 2025 18:14:11 -0500 Subject: [PATCH] emacs+; update inputs --- configurations/nixos/pureintent/default.nix | 3 + flake.lock | 177 +++----------------- flake.nix | 1 - modules/flake-parts/nixos-flake.nix | 1 + modules/home/darwin-only.nix | 2 +- 5 files changed, 28 insertions(+), 156 deletions(-) diff --git a/configurations/nixos/pureintent/default.nix b/configurations/nixos/pureintent/default.nix index a436c9f..7a00f41 100644 --- a/configurations/nixos/pureintent/default.nix +++ b/configurations/nixos/pureintent/default.nix @@ -21,6 +21,9 @@ in enable = true; package = pkgs.netdataCloud; }; + networking.firewall.allowedTCPPorts = [ + 5005 # vira + ]; programs.nix-ld.enable = true; # for vscode server diff --git a/flake.lock b/flake.lock index 20b48a1..1b06f27 100644 --- a/flake.lock +++ b/flake.lock @@ -122,27 +122,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735644329, - "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", - "owner": "numtide", - "repo": "devshell", - "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -166,11 +145,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1736881038, - "narHash": "sha256-i0GVHWoIqDcFB9JmEdd9T+qxrEx3ckBlPfTD/yLoNyg=", + "lastModified": 1740180936, + "narHash": "sha256-k+Y4WTe61og+kI0xtb4UgeK3slI4yaqFa/m/tvnt3a8=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "2bc052425ca45a41532be0648ebd976d1bd2e6c1", + "rev": "b55d988491858314e7fcbae8da962dea6ff3f5b7", "type": "github" }, "original": { @@ -189,11 +168,11 @@ ] }, "locked": { - "lastModified": 1736906787, - "narHash": "sha256-knFGlRhWrf5QzncmXDPIyXXQrd6HykRVXUIFD64rFrE=", + "lastModified": 1740364746, + "narHash": "sha256-i2lMhsP/hajcgxT+nxqKwTgRqswCQ9x76bpRSBC3/Q4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "33fcdafefd56847a1095050262aa89863fade3d2", + "rev": "7499231e05179138025dc0475e71f7e9de367ee1", "type": "github" }, "original": { @@ -233,20 +212,6 @@ "type": "github" } }, - "flake-compat_2": { - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "revCount": 69, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -378,32 +343,6 @@ } }, "git-hooks_2": { - "inputs": { - "flake-compat": [ - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore_2", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_3": { "flake": false, "locked": { "lastModified": 1737465171, @@ -456,28 +395,6 @@ "type": "github" } }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -506,32 +423,11 @@ ] }, "locked": { - "lastModified": 1740265252, - "narHash": "sha256-+LFsCsIUF/pJWL9S21m5NLcK5bgwRB4MwfV0Iu7tggY=", + "lastModified": 1740347597, + "narHash": "sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob+6M963bwVq74=", "owner": "nix-community", "repo": "home-manager", - "rev": "fb568d75cf6c81f30d49eeb73787e9b56454ba16", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738878603, - "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", + "rev": "12e26a74e5eb1a31e13daaa08858689e25ebd449", "type": "github" }, "original": { @@ -826,27 +722,6 @@ "type": "github" } }, - "nix-darwin_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738743987, - "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nix-doom-emacs-unstraightened": { "inputs": { "doomemacs": "doomemacs", @@ -857,11 +732,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1736930191, - "narHash": "sha256-/y79AZZFXM1aIM+bWz3iuTPOWEw0FBRY5dDNw3JWPgw=", + "lastModified": 1740386357, + "narHash": "sha256-xSbthVnTIkTfV6n4+oi+x8+GX9rPFHMbB6/VDVF/xmk=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "80cd0dd0c79c19d8c78df3c5b36d3e816bf2e67c", + "rev": "a83aca2922e1e8658ba8f7bbe6139013c86ea89a", "type": "github" }, "original": { @@ -877,11 +752,11 @@ ] }, "locked": { - "lastModified": 1739676768, - "narHash": "sha256-U1HQ7nzhJyVVXUgjU028UCkbLQLEIkg42+G7iIiBmlU=", + "lastModified": 1740281615, + "narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ae15068e79e22b76c344f0d7f8aed1bb1c5b0b63", + "rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023", "type": "github" }, "original": { @@ -1074,11 +949,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1739866667, - "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": { @@ -1120,24 +995,18 @@ }, "nixvim": { "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", - "git-hooks": "git-hooks_2", - "home-manager": "home-manager_3", - "nix-darwin": "nix-darwin_2", "nixpkgs": [ "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": [] + "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1739902813, - "narHash": "sha256-BgOQcKKz7VNvSHIbBllHisv32HvF3W3ALF9sdnC++V8=", + "lastModified": 1740413069, + "narHash": "sha256-DUentJypG+n1yuL60WBYM+SOfH4tFivKzuuJRQLCtF0=", "owner": "nix-community", "repo": "nixvim", - "rev": "0ab9947137cd034ec64eb5cd9ede94e53af21f50", + "rev": "4b0de83c39718e6fca0c80fdeae7c4a9b2cb6c10", "type": "github" }, "original": { @@ -1195,7 +1064,7 @@ "devour-flake": "devour-flake", "false": "false", "flake-parts": "flake-parts_3", - "git-hooks": "git-hooks_3", + "git-hooks": "git-hooks_2", "inspect": "inspect", "nix-systems-aarch64-darwin": "nix-systems-aarch64-darwin", "nix-systems-aarch64-linux": "nix-systems-aarch64-linux", diff --git a/flake.nix b/flake.nix index 9fddb71..db27f17 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,6 @@ # Neovim nixvim.url = "github:nix-community/nixvim"; nixvim.inputs.nixpkgs.follows = "nixpkgs"; - nixvim.inputs.treefmt-nix.follows = ""; # Don't care # Emacs nix-doom-emacs-unstraightened.url = "github:marienz/nix-doom-emacs-unstraightened"; nix-doom-emacs-unstraightened.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/flake-parts/nixos-flake.nix b/modules/flake-parts/nixos-flake.nix index a0addbf..7570164 100644 --- a/modules/flake-parts/nixos-flake.nix +++ b/modules/flake-parts/nixos-flake.nix @@ -18,6 +18,7 @@ "nix-index-database" "nixvim" "omnix" + "nix-doom-emacs-unstraightened" ]; }; }; diff --git a/modules/home/darwin-only.nix b/modules/home/darwin-only.nix index 5b470ca..2c409ca 100644 --- a/modules/home/darwin-only.nix +++ b/modules/home/darwin-only.nix @@ -2,6 +2,6 @@ imports = [ ./all/zsh.nix ./all/nushell.nix - # ./all/emacs.nix + ./all/emacs.nix ]; }