From b1762e840424e8df414d369b991822d1f457fc9d Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Mon, 29 Aug 2022 23:46:02 +0300 Subject: [PATCH] nix: add flake to build system --- .gitattributes | 1 + .gitignore | 2 -- flake.lock | 27 +++++++++++++++++++++++++++ flake.nix | 16 ++++++++++++++++ secrets.nix | Bin 0 -> 1619 bytes shell.nix | 1 + system/configuration.nix | 3 --- 7 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 .gitattributes create mode 100644 flake.lock create mode 100644 flake.nix create mode 100644 secrets.nix diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..f0bd4f3 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +secrets.nix filter=git-crypt diff=git-crypt diff --git a/.gitignore b/.gitignore index 6108db7..e410d2a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -/secrets.nix - /wallpapers/*.jpg diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..8645efa --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1661628722, + "narHash": "sha256-oR/7NhG7pPkACToUtaaT6hH+rONE2z5/4NzjoUwEZt8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "324c8aaf25b2f2027af7798e5582ce3040a793b6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..0ebaf1c --- /dev/null +++ b/flake.nix @@ -0,0 +1,16 @@ +{ + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + }; + + + outputs = { self, nixpkgs }: { + nixosConfigurations.systemHome = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ./system/configuration.nix + ./system/machine/home + ]; + }; + }; +} diff --git a/secrets.nix b/secrets.nix new file mode 100644 index 0000000000000000000000000000000000000000..b14ae77bc9a045284653f900414dc4b0f3ee35f4 GIT binary patch literal 1619 zcmV-Z2CVr2M@dveQdv+`0N}Qztt1pu9j&pS8aW43g<0jsD!gqfN#p$RSozZKcbHV- za;&5z4Xe~wUr7rVddg*7eOPt8qya%$LIv6On`iUaaE~7FLPI0n6(lm|f00jn9XR?b zC@Ov=oMsU#VyalF+7ShE(j7u`p0tVR6BX-Y-!R~}sVN%2yb@5q?yod#iVGlh)+o%;`H+NaC2&%6!NN2DHAc2n;|3lg->ihR4pL z-i!X(;=}bo!r+;)E^?K2TpL&2iC@Z+%2$Z;^}S>LxEE+8|0>T*Y*?{eLwv?#L8G=X zY`2_OXYf2-E>UQ`Q`VUl1l}Y}C7H4zTqx52R+K9c=R;6ZAp_|~IUkIQ^!2G-=TVe9BafpldoVmd5Af)e{m(?i^2O}(c zaa|yp3_*n(%l8f3sa}U-JE4@N{J_)3H}-6Tz@VTXouW#WGIBMQ@Vh($dEZPo{?yIz zCZ>%QH{C_27O-QURkyDgsM7C6%E*aneg?9qMMByl&SLT0YC(x2tssV-rAzRH;rm%r z{`zJNevQ`7;CXR|s~pX8x#ztI!^Z6K@0p#B7UIF#rm!n_ABN^hEXW%Rbj8sbBkq7N zdjDQY`DRY(wh&r&F{E0@@LK8PNWghK)y*?w~0JLz2aYiQnkpv|z&rmvjWV>6bj zZgA{lFmfDl2wdna@d%GRVvKMQnJt8RB>ylHoc^7K4bkH+Z`2v=2G8eOZH3LrC5x*Z zd+eBq^&Yw*5nRwoo4t33neP$m6s6MQFOuI-*l?aAg6B=;#&?Q+zZ`I9|3)>93pMs#fq7Xzi=$l-|)cxW>nJ zZpuQ8nh1j(a!{)8Lu@E4-7!ti6H$;WZ;O9+R^Bz#hAI|_bWERKYzNN8_vX*ei^8fu z)^L_CHYp%N_D>~b9Wm*a~^DJz||@p+(*jqW-F z8oG`TCFVnQI8$X24SJJMyFIRJ@rfzBeC!%W>5HSM_nJ@@h(rNlkaa22~O&G)6(G z3OcJ5ihl3JKp_5Ydz5!KHu=&laPs06!e|<|&r>o(YTV-742s<-;xSr^1$>u8HA%Bh z-*MoFM<=A!QM+lyDnbbwm%RkL?P-b0hBo$-!iRem*92T~RHhO&z!V&?ssBQuWwu0j zNmMhr)+-pkzEe);6y4|7ODZ{72^GR|t|#3y6aVLt$jAKQ?$5~?cK<2od2u)fV1EZF zgH0aY3%dYuA7=1=19EnmmWue9i;Y;`MO%d?^scJxn-?798ty6-+QIxj69xnHd~`(9 zv*-@We+OX{uc7APafvYu}nxj!uPMedNd_C!lx#9atU3Wc`qx zMTTTqh~WJ(Y7|zZhwZy4=?|uS(Lol^W-}WXE|@Mb)%hWUH!7J<`XnksH#FVthyae} R+0UssRo)B0(M6G+d<-3EA5H)O literal 0 HcmV?d00001 diff --git a/shell.nix b/shell.nix index e76593a..1033079 100644 --- a/shell.nix +++ b/shell.nix @@ -3,5 +3,6 @@ pkgs.mkShell { nativeBuildInputs = with pkgs; [ stylua + git-crypt ]; } diff --git a/system/configuration.nix b/system/configuration.nix index 6af4467..003a3fb 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -8,8 +8,6 @@ let secrets = import ../secrets.nix; in { - imports = [ ./machine/home ]; - networking = { networkmanager.enable = true; @@ -150,4 +148,3 @@ in system.stateVersion = "22.11"; # Did you read the comment? } -