From de45aa148e727a21c6e140cb92798f66a39498fd Mon Sep 17 00:00:00 2001 From: jolheiser Date: Thu, 31 Aug 2023 23:09:18 -0500 Subject: [PATCH] chore: re-organize Signed-off-by: jolheiser --- .git-age.yaml | 2 +- .gitattributes | 2 +- apps/firefox/work.nix | Bin 1865 -> 0 bytes apps/{ => gui}/default.nix | 10 +-- apps/{ => gui}/firefox.nix | 0 apps/gui/firefox/work.nix | Bin 0 -> 1865 bytes apps/{ => gui}/gtk.nix | 0 apps/{ => gui}/spotifyd.nix | 0 apps/{ => gui}/tiny.nix | 0 apps/{ => gui}/wezterm.nix | 0 apps/{ => gui}/wezterm/wezterm.lua | 0 apps/{ => nogui}/bat.nix | 0 apps/{ => nogui}/bottom.nix | 0 apps/{common.nix => nogui/default.nix} | 10 ++- apps/{ => nogui}/exa.nix | 0 apps/{ => nogui}/fzf.nix | 0 apps/{ => nogui}/git.nix | 0 apps/{ => nogui}/go.nix | 0 apps/{ => nogui}/gpg.nix | 0 apps/{ => nogui}/helix.nix | 0 apps/{ => nogui}/jq.nix | 0 apps/{ => nogui}/lazygit.nix | 0 apps/{ => nogui}/nushell.nix | 0 apps/{ => nogui}/nushell/config.nu | 0 apps/{ => nogui}/nushell/env.nu | 0 apps/{ => nogui}/nushell/jolheiser.nu | 0 apps/{ => nogui}/nushell/ohmyposh.nu | 0 apps/{ => nogui}/nushell/zoxide.nu | 0 apps/{ => nogui}/oh-my-posh.nix | 0 apps/{ => nogui}/ohmyposh/config.json | 0 apps/{ => nogui}/ssh.nix | 0 apps/{ => nogui}/xdg.nix | 0 apps/{ => nogui}/zoxide.nix | 0 flake.nix | 58 ++++++++---------- machines/chai/default.nix | 2 +- .../common/{sound.nix => gui/default.nix} | 12 +++- machines/common/{ => nogui}/default.nix | 2 - machines/common/xserver.nix | 9 --- machines/dragonwell/default.nix | 26 +------- machines/matcha/default.nix | 2 +- 40 files changed, 54 insertions(+), 81 deletions(-) delete mode 100644 apps/firefox/work.nix rename apps/{ => gui}/default.nix (81%) rename apps/{ => gui}/firefox.nix (100%) create mode 100644 apps/gui/firefox/work.nix rename apps/{ => gui}/gtk.nix (100%) rename apps/{ => gui}/spotifyd.nix (100%) rename apps/{ => gui}/tiny.nix (100%) rename apps/{ => gui}/wezterm.nix (100%) rename apps/{ => gui}/wezterm/wezterm.lua (100%) rename apps/{ => nogui}/bat.nix (100%) rename apps/{ => nogui}/bottom.nix (100%) rename apps/{common.nix => nogui/default.nix} (83%) rename apps/{ => nogui}/exa.nix (100%) rename apps/{ => nogui}/fzf.nix (100%) rename apps/{ => nogui}/git.nix (100%) rename apps/{ => nogui}/go.nix (100%) rename apps/{ => nogui}/gpg.nix (100%) rename apps/{ => nogui}/helix.nix (100%) rename apps/{ => nogui}/jq.nix (100%) rename apps/{ => nogui}/lazygit.nix (100%) rename apps/{ => nogui}/nushell.nix (100%) rename apps/{ => nogui}/nushell/config.nu (100%) rename apps/{ => nogui}/nushell/env.nu (100%) rename apps/{ => nogui}/nushell/jolheiser.nu (100%) rename apps/{ => nogui}/nushell/ohmyposh.nu (100%) rename apps/{ => nogui}/nushell/zoxide.nu (100%) rename apps/{ => nogui}/oh-my-posh.nix (100%) rename apps/{ => nogui}/ohmyposh/config.json (100%) rename apps/{ => nogui}/ssh.nix (100%) rename apps/{ => nogui}/xdg.nix (100%) rename apps/{ => nogui}/zoxide.nix (100%) rename machines/common/{sound.nix => gui/default.nix} (50%) rename machines/common/{ => nogui}/default.nix (96%) delete mode 100644 machines/common/xserver.nix diff --git a/.git-age.yaml b/.git-age.yaml index 0219812..acdb861 100644 --- a/.git-age.yaml +++ b/.git-age.yaml @@ -1,2 +1,2 @@ -"apps/firefox/work.nix": +"apps/gui/firefox/work.nix": - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 diff --git a/.gitattributes b/.gitattributes index ba29335..69d4ba9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -apps/firefox/work.nix filter=git-age diff=git-age +apps/gui/firefox/work.nix filter=git-age diff=git-age diff --git a/apps/firefox/work.nix b/apps/firefox/work.nix deleted file mode 100644 index 7e20945db2e3d418b38f9fdd874574b8f3ec2e07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1865 zcmV-P2e$ZOXJsvAZewzJaCB*JZZ2Xh3O+#y9NHI}0a8YqF zc5^E;b5=EHIWKE=Y-cfdHFkJGaxe-lEiE8ob~k5MPe*Wea4TA2W=Ua1Rx4;qGju|3 zHAPlfGi6a?I5b#QOinp%baM(5wy+L#X#wlrt1%O*_3}3g%JQvk%$Xy>S__-4D`Vs^ zgp4#WtbHa>)-D2f?&wn(IP_I@Vjl~lF3$!Td25un77=p!fn4>>Iekl@g@!p>PE2`P zQqaK2%3zFr{E6SyPR`D8qysQoMnd;ijFN;#s*oBgAWiz#OIO(+TfC|ck8lp9`_uxq z8)l1l#3XYR-dF}PW=P7=E-_1?;qO)4Ckr};P@sW7U%|u)$LjB$HsgKWA5}z7@F`OS!76LkeeY9IGuw{&t1-qmV1q^o$3~^a-5=f??u!@-}li5^l6HW(sbw z5Yh{uU*Suwf_&EcCK%1xMMO;HHV@WOZ#CFt+10mOGx?i7oS7~^Lk?^I2e0(@Hrxqx zdE<_E>g>sssm~WB1V$~qvErrl*JGGUV{EzwE=by(WNd;%^M~lQxcjRSxKKOeQE&DZ zmQ%mU&&5@rN!AtcOK+#y3Y+{K`puvG*MT`YB510-1S_(LAX+1ct;*XS%%61NkQ_|6xcwA;6RI!;^u23 zA{PH+ZElBe$kMSO zO>-}gzF?#M|0BPHo9p$`fSO}X2x#lcs9gkEDhN`ze53F z*H;YXD7xq?^~vTP&h0``!AbLqX;RtvSbM(}z-fLqkDhg0xLZAnwYfsDpw>!~_@|hSgHP^KdMQr4$2z!sD*hXg(5% zxb%_@;9ULPCo9oCwz{*`B(RH?09_a*3q+V|+{FO|fO?jw<*mCk78VfHYL|l+e1Hyy{pe;~btc7ZYYa=yxZbMaNk_E3N%NmyAF}VAUHBNQ z5xlFTeA?B}#m)En%T^DmDxpxA$OaUS)ST*(9N#;}pXkph_obPd;zZ@NP#OQPvU!_M z8rN;&)Z$kbH<&|7_0KE-go0rstsC|I9q^~r8;op16|(%8k6+EVp?Z>$JDF~JD=c3{ zd^MNqz@I^%-r>}Kw-u1$)T~t0O}vTK63Cba;Wq+N_}m5V-P; zKR?5DPP>^uz$J*c4NR*ti9HP_^B4ih$tm0JSDSXw&f> z{rcTp>fxrimL`>)smDYA(14;WA*&V;tDOkfT!FFe;Axqg{}I1q_TjB-#(P^YLsVD+ z*>ufgbM7%Y+}eo1SDnt8P6)+wm4BIsnP6KG{G1}9INT0$CA=w|`}_sm`Bs%@;OQ^U z3oi6)^fsRPv2+Rq%)4&>v2Uhu^Q&xZnQFF|>(}Ab4@J8^$zi zZA*Dj*&Wi^iIDE;pl-!ZH7InH-V?NO>lc|PvaSE$p{}tXvRnH@Lsu?)+66kpz|4J{ z8F}1z<#A+M7QL@gm*z+89$_t4>n80QgbS0;wr7s z|KkG;s0+CBOyptXW|)V>Ca=kctU2^!WsMHdPlilmJs1IS_`GCyh#03ZrOSX#LhD}? zJJyu2C^KvKxT|(BB*CuS-O9mg5HC+BC@5q9?^c_s+XvQ#!!s4>A1(U8e&2cMSj58Q DlRKBj diff --git a/apps/default.nix b/apps/gui/default.nix similarity index 81% rename from apps/default.nix rename to apps/gui/default.nix index 08c7d47..1550be5 100644 --- a/apps/default.nix +++ b/apps/gui/default.nix @@ -1,9 +1,7 @@ {pkgs, ...}: { imports = [ - ./common.nix - + ../nogui ./firefox.nix - ./go.nix ./gtk.nix ./spotifyd.nix ./tiny.nix @@ -18,23 +16,21 @@ spotify-tui # LSPs - gopls lua-language-server marksman nodePackages.yaml-language-server # Formatters - alejandra + nodePackages.lua-fmt + python3Packages.black # IDEs jetbrains.goland # Personal NUR - nur.repos.jolheiser.git-age nur.repos.jolheiser.gomodinit nur.repos.jolheiser.imp nur.repos.jolheiser.kv - nur.repos.jolheiser.tclip nur.repos.jolheiser.tmpl ]; }; diff --git a/apps/firefox.nix b/apps/gui/firefox.nix similarity index 100% rename from apps/firefox.nix rename to apps/gui/firefox.nix diff --git a/apps/gui/firefox/work.nix b/apps/gui/firefox/work.nix new file mode 100644 index 0000000000000000000000000000000000000000..ef67b2449129b4a23087bf84314ff8914acc4b2d GIT binary patch literal 1865 zcmV-P2e$ZOXJsvAZewzJaCB*JZZ2Rz=Mq+tXLs1GzH+nQ}7S#)hta!NIDa7I{aSxZ`CNH7X5EiE8uY&LgOZ!>p7F?TmFayE8MMKoq~PcJ!o zNLExgR53$IdT~W;Ggo7EOE?N-3ImI}oON8fIhDk&pRZWYoD7y8b_C4WC7GPqgq923 zU}e>_B76j;sg>Syhv2u*%J2_zC@kATV-wmo*rw##VOjC)#1n~mz$qOYu<>i3niX;f z&Ml3HJjp>*qj3hX&)+_$X0sbuGwUunGV7VgO&Ap;9f=T+@If&OQYfE&5%rNiimV3D z=m0H19d~zG{EI|gR{)+FP7Y6onMikl>v#pDzynp~A_USo>72DQB0oJSO?UnOPTcE+ z%Pa77OZ%!bYg9Z5Z{;5Iy}M@7b9jEcbIs{qK1cxKaii_!wyVz;PE@?tYe z+6sQE>3K<-+Fm5CmK!YsvN9xlRXb>r^t>v&b;!3Q0BKNqZ7cl~=diJ2?KZ6Ec&P5u z6B8GnHcSbnmWb1zDWvK8jQO^RS&25noFd^Jf*fo7S|(>Md28@lG7jOhlxp^1;ZYAp z@{0x-BZ(@z|H8EAuq>G_Jl1MSa%=p4s*CgvtK4f4!LF=p!r7pZ+1x#T1A&ThH40$XFY-=Is%kJ1)elWQesYF^*~mZ8?|>og%iKxjLX_k8%;^%{smCz zD8{L31bp}=#1G%h?}rCZs5=B|kYbe4n)LJUX|eu2_~pKr366RTU8A1ir*rc(vA<0~ zi@7mF7d0f}DHSU5ls+4!W-}o8NBuituT%>}ugx$S7qC2?g*XA*nsLqkwcQ!T%&T1a zU{T;mJON#R^Hw~(O~e<}u;v5%DM$7;Cm{8F_lEz(t99(*e57EC!*UJ%6fgcmy}9&8 zwcWr`+-QcI)@HLvWSW2B2V?=RKuFN*2CsM~AFLW#Le8-mjZ8M_OhQ%YQ86>?zfjeX zRMI6Q1vrj22=mpY$!W)K4*m9&ve575pu8FKGc%#{9FJXf%z)IxhU?trgnU%rAHI}0 zu8Qf-!ZzSn7v$uzzv{LZuJn2Fo{!PbMEnNg2rP-{K_I%x$iNGpXn5`lhjG!@h)U*a0mFaW6j~+gi4BE6a9)D~h^ zJqk9kBrERZN$wJ8ppWL9)os-$F++f{eID(%Vu+K_7yf=;qgqWGIU&DeuZ zudpX&5Cl`)O%CnLwjuo0YsbWQ#tL96a+XMFM0P=|LtYon<2j2XzSZR1s&P8C(PdkP zWq+(lVZ*eEs6Y=MvblY8GrBQx!8+=Mi^g>sxJtqr#;>Wg(T=_@E_U-z14-Veuq-?-ztBs(v{&HGU1BBbY0 zEW_Y@B0S-cU7ipjIg)b8DHA!)7O|8slcZ3L!B#YJLeGoa#R6VmFJpA=o<2S~Jc?m( z;L_ZCiW1+ha0R@fH|`l7Sg=VkV{MCT^FKUugV6+(jz#Qox4x%~&!8S3+eJqBtZldnyKTm?bhCX{VoV1OgIxfN#eEg? z(AYP2*^-bX8Z De>{!K literal 0 HcmV?d00001 diff --git a/apps/gtk.nix b/apps/gui/gtk.nix similarity index 100% rename from apps/gtk.nix rename to apps/gui/gtk.nix diff --git a/apps/spotifyd.nix b/apps/gui/spotifyd.nix similarity index 100% rename from apps/spotifyd.nix rename to apps/gui/spotifyd.nix diff --git a/apps/tiny.nix b/apps/gui/tiny.nix similarity index 100% rename from apps/tiny.nix rename to apps/gui/tiny.nix diff --git a/apps/wezterm.nix b/apps/gui/wezterm.nix similarity index 100% rename from apps/wezterm.nix rename to apps/gui/wezterm.nix diff --git a/apps/wezterm/wezterm.lua b/apps/gui/wezterm/wezterm.lua similarity index 100% rename from apps/wezterm/wezterm.lua rename to apps/gui/wezterm/wezterm.lua diff --git a/apps/bat.nix b/apps/nogui/bat.nix similarity index 100% rename from apps/bat.nix rename to apps/nogui/bat.nix diff --git a/apps/bottom.nix b/apps/nogui/bottom.nix similarity index 100% rename from apps/bottom.nix rename to apps/nogui/bottom.nix diff --git a/apps/common.nix b/apps/nogui/default.nix similarity index 83% rename from apps/common.nix rename to apps/nogui/default.nix index aa971bd..0de7a0d 100644 --- a/apps/common.nix +++ b/apps/nogui/default.nix @@ -8,8 +8,9 @@ ./bottom.nix ./exa.nix ./fzf.nix - ./gpg.nix ./git.nix + ./go.nix + ./gpg.nix ./helix.nix ./jq.nix ./lazygit.nix @@ -29,12 +30,19 @@ fd just ripgrep + usql # LSPs + gopls nil # Formatters alejandra + gofumpt + + # Personal NUR + nur.repos.jolheiser.git-age + nur.repos.jolheiser.tclip ]; activation.report-changes = config.lib.dag.entryAnywhere '' ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff $oldGenPath $newGenPath diff --git a/apps/exa.nix b/apps/nogui/exa.nix similarity index 100% rename from apps/exa.nix rename to apps/nogui/exa.nix diff --git a/apps/fzf.nix b/apps/nogui/fzf.nix similarity index 100% rename from apps/fzf.nix rename to apps/nogui/fzf.nix diff --git a/apps/git.nix b/apps/nogui/git.nix similarity index 100% rename from apps/git.nix rename to apps/nogui/git.nix diff --git a/apps/go.nix b/apps/nogui/go.nix similarity index 100% rename from apps/go.nix rename to apps/nogui/go.nix diff --git a/apps/gpg.nix b/apps/nogui/gpg.nix similarity index 100% rename from apps/gpg.nix rename to apps/nogui/gpg.nix diff --git a/apps/helix.nix b/apps/nogui/helix.nix similarity index 100% rename from apps/helix.nix rename to apps/nogui/helix.nix diff --git a/apps/jq.nix b/apps/nogui/jq.nix similarity index 100% rename from apps/jq.nix rename to apps/nogui/jq.nix diff --git a/apps/lazygit.nix b/apps/nogui/lazygit.nix similarity index 100% rename from apps/lazygit.nix rename to apps/nogui/lazygit.nix diff --git a/apps/nushell.nix b/apps/nogui/nushell.nix similarity index 100% rename from apps/nushell.nix rename to apps/nogui/nushell.nix diff --git a/apps/nushell/config.nu b/apps/nogui/nushell/config.nu similarity index 100% rename from apps/nushell/config.nu rename to apps/nogui/nushell/config.nu diff --git a/apps/nushell/env.nu b/apps/nogui/nushell/env.nu similarity index 100% rename from apps/nushell/env.nu rename to apps/nogui/nushell/env.nu diff --git a/apps/nushell/jolheiser.nu b/apps/nogui/nushell/jolheiser.nu similarity index 100% rename from apps/nushell/jolheiser.nu rename to apps/nogui/nushell/jolheiser.nu diff --git a/apps/nushell/ohmyposh.nu b/apps/nogui/nushell/ohmyposh.nu similarity index 100% rename from apps/nushell/ohmyposh.nu rename to apps/nogui/nushell/ohmyposh.nu diff --git a/apps/nushell/zoxide.nu b/apps/nogui/nushell/zoxide.nu similarity index 100% rename from apps/nushell/zoxide.nu rename to apps/nogui/nushell/zoxide.nu diff --git a/apps/oh-my-posh.nix b/apps/nogui/oh-my-posh.nix similarity index 100% rename from apps/oh-my-posh.nix rename to apps/nogui/oh-my-posh.nix diff --git a/apps/ohmyposh/config.json b/apps/nogui/ohmyposh/config.json similarity index 100% rename from apps/ohmyposh/config.json rename to apps/nogui/ohmyposh/config.json diff --git a/apps/ssh.nix b/apps/nogui/ssh.nix similarity index 100% rename from apps/ssh.nix rename to apps/nogui/ssh.nix diff --git a/apps/xdg.nix b/apps/nogui/xdg.nix similarity index 100% rename from apps/xdg.nix rename to apps/nogui/xdg.nix diff --git a/apps/zoxide.nix b/apps/nogui/zoxide.nix similarity index 100% rename from apps/zoxide.nix rename to apps/nogui/zoxide.nix diff --git a/flake.nix b/flake.nix index 8d631b9..07a543e 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,7 @@ }; }; }; - commonConfig = {server ? false}: { + commonConfig = {gui ? true}: { config, pkgs, ... @@ -46,33 +46,26 @@ owner = username; }; in { - config = - { - nixpkgs.overlays = [overlays]; - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - users.${username}.imports = - if !server - then [./apps] - else [./apps/common.nix]; - extraSpecialArgs = { - flakePath = "/home/${username}/.config/nixpkgs"; - }; + config = { + nixpkgs.overlays = [overlays]; + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + users.${username}.imports = + if gui + then [./apps/gui] + else [./apps/nogui]; + extraSpecialArgs = { + flakePath = "/home/${username}/.config/nixpkgs"; }; - } - // ( - if !server - then { - age.secrets = { - ssh-config = userSecret ./secrets/shared/ssh-config.age; - ssh-config-work = userSecret ./secrets/shared/ssh-config-work.age; - spotify-pw = userSecret ./secrets/shared/spotify-pw.age; - irc-pw = userSecret ./secrets/shared/irc-pw.age; - }; - } - else {} - ); + }; + age.secrets = { + ssh-config = userSecret ./secrets/shared/ssh-config.age; + ssh-config-work = userSecret ./secrets/shared/ssh-config-work.age; + spotify-pw = userSecret ./secrets/shared/spotify-pw.age; + irc-pw = userSecret ./secrets/shared/irc-pw.age; + }; + }; }; username = "jolheiser"; in @@ -83,9 +76,8 @@ modules = [ home-manager.nixosModules.home-manager agenix.nixosModules.default - ./machines/common ./machines/chai - commonConfig + (commonConfig {}) ({pkgs, ...}: { config = { nixpkgs.overlays = [ @@ -95,7 +87,7 @@ ]; home-manager.users.${username}.programs = { git.package = pkgs.gitSVN; - firefox.profiles.default.bookmarks = [(import ./apps/firefox/work.nix)]; + firefox.profiles.default.bookmarks = [(import ./apps/gui/firefox/work.nix)]; }; age.secrets = { netrc = { @@ -118,17 +110,17 @@ modules = [ home-manager.nixosModules.home-manager agenix.nixosModules.default - ./machines/common ./machines/matcha - commonConfig + (commonConfig {}) ]; }; "dragonwell" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ home-manager.nixosModules.home-manager + agenix.nixosModules.default ./machines/dragonwell - (commonConfig {server = true;}) + (commonConfig {gui = false;}) ]; }; }; diff --git a/machines/chai/default.nix b/machines/chai/default.nix index ccbd57a..837f4b9 100644 --- a/machines/chai/default.nix +++ b/machines/chai/default.nix @@ -1,7 +1,7 @@ {pkgs, ...}: let username = "jolheiser"; in { - imports = [./hardware.nix ../common]; + imports = [./hardware.nix ../common/gui]; boot = { kernelPackages = pkgs.linuxPackages_latest; diff --git a/machines/common/sound.nix b/machines/common/gui/default.nix similarity index 50% rename from machines/common/sound.nix rename to machines/common/gui/default.nix index aa63060..c09fe13 100644 --- a/machines/common/sound.nix +++ b/machines/common/gui/default.nix @@ -1,4 +1,6 @@ -{ +{pkgs, ...}: { + imports = [../nogui]; + sound.enable = true; hardware.pulseaudio.enable = false; security = {rtkit.enable = true;}; @@ -9,4 +11,12 @@ alsa.enable = true; }; }; + + services.xserver = { + enable = true; + displayManager.lightdm.enable = true; + desktopManager.cinnamon.enable = true; + layout = "us"; + xkbVariant = ""; + }; } diff --git a/machines/common/default.nix b/machines/common/nogui/default.nix similarity index 96% rename from machines/common/default.nix rename to machines/common/nogui/default.nix index 7aadb45..e08ef1b 100644 --- a/machines/common/default.nix +++ b/machines/common/nogui/default.nix @@ -1,6 +1,4 @@ {pkgs, ...}: { - imports = [./sound.nix ./xserver.nix]; - console.colors = [ "1e1e2e" "585b70" diff --git a/machines/common/xserver.nix b/machines/common/xserver.nix deleted file mode 100644 index de0d030..0000000 --- a/machines/common/xserver.nix +++ /dev/null @@ -1,9 +0,0 @@ -{pkgs, ...}: { - services.xserver = { - enable = true; - displayManager.lightdm.enable = true; - desktopManager.cinnamon.enable = true; - layout = "us"; - xkbVariant = ""; - }; -} diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix index 589e707..c35fef6 100644 --- a/machines/dragonwell/default.nix +++ b/machines/dragonwell/default.nix @@ -1,26 +1,7 @@ {pkgs, ...}: let username = "jolheiser"; in { - imports = [./hardware.nix]; - - nixpkgs.config.allowUnfree = true; - - nix = { - gc.automatic = true; - package = pkgs.nixVersions.nix_2_15; - settings = { - experimental-features = ["flakes" "nix-command" "repl-flake"]; - auto-optimise-store = true; - warn-dirty = false; - }; - }; - - system.activationScripts.diff = { - supportsDryActivation = true; - text = '' - ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig" - ''; - }; + imports = [./hardware.nix ../common/nogui]; boot.tmp.cleanOnBoot = true; zramSwap.enable = true; @@ -32,10 +13,7 @@ in { }; services = { - openssh = { - enable = true; - }; - + openssh.enable = true; tailscale.enable = true; }; diff --git a/machines/matcha/default.nix b/machines/matcha/default.nix index 149312d..a73bd31 100644 --- a/machines/matcha/default.nix +++ b/machines/matcha/default.nix @@ -1,7 +1,7 @@ {pkgs, ...}: let username = "jolheiser"; in { - imports = [./hardware.nix ../common]; + imports = [./hardware.nix ../common/gui]; boot = { kernelPackages = pkgs.linuxPackages_latest;