From e1afafff33579619494834a66da188f579d520b3 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Thu, 20 Feb 2020 10:48:07 +0100 Subject: [PATCH] Add oldtown --- .gitignore | 1 + configuration.nix | 5 ---- machines/oldtown/default.nix | 44 +++++++++++++++++++++++++++++++++ machines/oldtown/hardware.nix | 28 +++++++++++++++++++++ machines/oldtown/secret.nix | Bin 0 -> 2478 bytes machines/pentos/default.nix | 32 +++++++++++------------- profiles/graphical/default.nix | 5 +++- profiles/graphical/secret.nix | Bin 473 -> 474 bytes sample-configuration.nix | 5 ++++ 9 files changed, 97 insertions(+), 23 deletions(-) create mode 100644 .gitignore delete mode 100644 configuration.nix create mode 100644 machines/oldtown/default.nix create mode 100644 machines/oldtown/hardware.nix create mode 100644 machines/oldtown/secret.nix create mode 100644 sample-configuration.nix diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..ce3dce1e --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/configuration.nix diff --git a/configuration.nix b/configuration.nix deleted file mode 100644 index 3f68a53a..00000000 --- a/configuration.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: - -{ - imports = [ ./machines/pentos/default.nix ]; -} diff --git a/machines/oldtown/default.nix b/machines/oldtown/default.nix new file mode 100644 index 00000000..543f225a --- /dev/null +++ b/machines/oldtown/default.nix @@ -0,0 +1,44 @@ +{ config, pkgs, ... }: + +{ + imports = [ + + ./hardware.nix + ./secret.nix + ../../profiles/common/default.nix + ../../profiles/graphical/default.nix + ]; + + boot.loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; + + networking = { + hostName = "oldtown"; + wireless.enable = true; + interfaces = { + enp0s31f6.useDHCP = true; + wlp2s0.useDHCP = true; + }; + }; + + time.timeZone = "Europe/Brussels"; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "20.03"; + + home-manager.users.charlotte = { ... }: { + home.stateVersion = "20.03"; + }; + + # Machine-specific application settings + custom = { + git.email = "charlotte.vanpetegem@ugent.be"; + }; +} diff --git a/machines/oldtown/hardware.nix b/machines/oldtown/hardware.nix new file mode 100644 index 00000000..55379bb7 --- /dev/null +++ b/machines/oldtown/hardware.nix @@ -0,0 +1,28 @@ +{ config, lib, pkgs, ... }: + +{ + imports = [ ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ "i915" ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = []; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/e4b7eae2-546d-412b-9258-389315f4b835"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/A4C4-7B9F"; + fsType = "vfat"; + }; + + swapDevices = [ + { device = "/dev/disk/by-uuid/72c82e3c-ea61-488b-8b24-b3c27368a2ba"; } + ]; + + nix.maxJobs = lib.mkDefault 8; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + hardware.cpu.intel.updateMicrocode = true; +} diff --git a/machines/oldtown/secret.nix b/machines/oldtown/secret.nix new file mode 100644 index 0000000000000000000000000000000000000000..72ae63a43b9e2b1cb24b8a97f4487caf4a128bce GIT binary patch literal 2478 zcmZQ@_Y83kiVO&0h)$U`Us+;Llh}kf|F3dNFYfAT%uJSAZ+K=;{xS9`Ucp7yo*)13 zD*t&@C8dPH#BRg(Ydai1#7ks1h^{c0`CX*Ho%7;{w(39sm<48Dnz1A=%JtLBRjVGi zTr+y{<7y#S^yiQEe_lUdzjyKV3cX0*7vC0s4(K?dY^}on&DZ*ogYWSTcN3y>!|(At zxzA?0@-p9H#T$E0$=Uvtzmucwx7Gei_O+a&RAkza3T zbrl|Y#GM`DXtyTwxEs&xCk@v)&C9g@R#<%TE`EHd?r3buhlkT+(i_#c#kL1sUnr)`L{%_RrJuNF>lCZlj^?ZfSgMdYc z7z^JP&i%XR(Uz^Thf=QG_TB!2b>-LZKU)lJ1$W)z<&JphYGAs%Kxw=4M%I1X&%73D z{$ds9rn|;=tx5aUg->ndr#YXFKV1~5ZXEODjo{3n*DGD#Eb{p|(O~+73}Le~T$y`k zC9tmHGve8>``IJ$BTKKQp4BY374dA+^)M5cHaDuNTv&IqHIkKIeC>lKBgsyaOM$^F zUOejCc4yLe6Q+|U(^drj2+8wYG(*xW`SHa~-78n_XK_EU&HRh)l$}BRjfd_yotv6z zs=MXsyOWPQLM{Dv{fN4p+qaeHl10>&M{9g8y<96N^1VP_WqJL9fSqbyxBvAEY(Lun zg<&qo5uuMb|v%h!>Pxq{t z<$7viFx!R4_m3A9tzkCJzg)FyL9SEWxs_W#y0?ot{i$SltMf0knq76n?HAg@5iQM5 zp(*w%XRozh4F7h+VQ%6D4t`aiuFS%9@6SKex6J51b?COT^#!>ZJB>fMPYJ9z#q!|X z?B!2xE(v_ra{2N_nZJ|0);>8{6!4U1eTPOk(_Wnu{N-Ki72Zeo1ZC*^R2g0s*>hQR ztAk0<<7E+9X;=4IU08W#t-y}HKog6b8f*UCjlcLmA@udRKk1GdJJ;R6{qvAPzs~>t z4lh=<6`CwrqLuq>Rr_rFJ1=&b{$C{ZusC&(>LQip_EV<(YPxuwS-a^TH9ft@!fHgU^^lw(&3R^^H>g z%gidWAoR1O>N(la8v=Q^YcFgTDt;R8eCva1fcTM$s<4{Ca`FG?ULNjd*%4OQa#F8e zuW7n?d)riwBNir>H73ta&3d(gE7)|!K8~B;1AZTR<78NS+p&CtB=@|&n1D^Z<<=4= z6AgZNaY$@BRNHdF>-f`>tG00r?|=TcY_~O9_($f#CGEOyF9X#JAN0QbJId=R>$y+= zfWUX&vTZ*ZQ}izHfA!aAv1Z6!|5$-^>(Zs$FL8f;&K|Pj_^;mHC8xDoUFW}ky?!mT zN6?nZduFNr_O_S%{k+zE)|v!O-R+DbGgW@ee3Ca)RP4WGSHrrw=F$}rsp8Wsbqziw z>6H0QUKeZp`_t5z|J+j>gPyqwX{j8&uaSLw(xfHo9YM@lI_HX$g*X0LCDPCpcXMah z{bOrZO6$od;P)?7>+#O}&136^B+l&zk8uJ2SdPPO#ZnAnNPFwStQj{k}#>&(DsSx_W8Y zE??!h8jSw=Rjs-=d;GocWW+>WWQ=;h^YfEF=L5&?a z>2tHE+$)VynfI{9SL=tXjc4wy#qyy$=bxUP@7V(tJ1tdAQXy2Qg z(HP0Z<2zY)QLBS-4^}h zO7~P1U-AC=q!OUtG}F6MFeCGG!cF_=MvhIJWTUQq(2vUanlr0$RaAS@=A(TF&$n)N z{pxXIb4{C#8P5*3Pwj%)Y_XD&)2bVbR@n<3D{tngm0?|D*x;qLCj9;>DUqX}Hyrm= zoXP%sS-^&Q3}MdCPnzFe5ykFdBNEd6ab4os%5sx*kDoT8tcTB;zj|GH-MqUn<=@k? zn+3fqHcsS8HRBQslrPBNvuOTiiE9skPWRnA)r@)nk4e|XMUPEq7H2*hF0$9`$mN4C zcKcg6ZAnNyUio%fd3X5c=~A2pDsCZc8+k0(bH;0K;`nb+E%t9^@kC{hBjp@bR>xl? z?ppA#$0u&aj+5U5kEnSpc(2a6+kJIPUDu^OuY0X|7Q<3%wp+lH+a(-jv6E?yrns zmC(XSvCF^K{$6qTH8-E$sdqKc1dGE27joA8UDiCeRdD+h!O4yGA*(k&*=BmZYMnsG zzEkbI8QUusF`W=UlknWe=6`beyKU+$+M7e4M(u8R8@OnD*U{^d?{s(kT>L_#wRX~{ zEka>?+Pj03T5h*AdAB|@@mjK^YVq%q#2YX2ta9`jmN|c0_N}DVBxuuo(bAczr!x(f zFFdvBp3(fdL56Lrzk1HT(B7-8slLIHkNf?r9kR_wti)K&_t#bBZ;TT)Q!c8#vwJoeA49|*Jd%JwdtJKJZL;Ktyz53!qBMCZv|xR@7e znSNWlf^EUUIgJ13hnzfYBD3K5=|H7zU#(`{vRNU)c+65X=DCpXU%O{l|76FVKmTzW zn}bC$x8VzsOLw?(I2%?iJ{HPRdtz4iU2Bo1){S{Ksc&{J3_RPFw`xQAyj7X?cdCQ# zcBI&N&af7VxD$2nP0AYMsS|hQohW=Q7Pj%A1zUq{ezKzaJ+b6u)n6guG8Vp{-bR?7 zoANdBxaa5jeO>1TJtJ*Bt*6fxpAORJWMmQ2>JTns!#P$^wHMmO${He&5B!I9m@BQ@$=>DKjL2RuXA|w zAbtf?j5p)P$!`u{pZ<7L==ZC!Chfl)EWD?s|ZOS{`P Wj~7!j&N{h%{Sx-HbERRz3M&A97uzua literal 0 HcmV?d00001 diff --git a/machines/pentos/default.nix b/machines/pentos/default.nix index 6530cb73..1d4b4f6c 100644 --- a/machines/pentos/default.nix +++ b/machines/pentos/default.nix @@ -9,14 +9,19 @@ ../../profiles/graphical/default.nix ]; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + boot.loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; - networking.hostName = "pentos"; - networking.wireless.enable = true; - - networking.interfaces.enp0s31f6.useDHCP = true; - networking.interfaces.wlp0s20f3.useDHCP = true; + networking = { + hostName = "pentos"; + wireless.enable = true; + interfaces = { + enp0s31f6.useDHCP = true; + wlp0s20f3.useDHCP = true; + }; + }; time.timeZone = "Europe/Brussels"; @@ -26,21 +31,14 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "20.03"; # Did you read the comment? + system.stateVersion = "20.03"; - home-manager.users.charlotte = { pkgs, ... }: { - home = { - stateVersion = "20.03"; - }; + home-manager.users.charlotte = { ... }: { + home.stateVersion = "20.03"; }; # Machine-specific application settings custom = { git.email = "charlotte@vanpetegem.me"; }; - - system = { - autoUpgrade.enable = true; - }; - } diff --git a/profiles/graphical/default.nix b/profiles/graphical/default.nix index 1b98b94c..de6432e4 100644 --- a/profiles/graphical/default.nix +++ b/profiles/graphical/default.nix @@ -42,6 +42,10 @@ users.users.charlotte.extraGroups = [ "networkmanager" "video" "input" ]; + environment.systemPackages = with pkgs; [ eid-mw ]; + + system.autoUpgrade.enable = true; + home-manager.users.charlotte = { pkgs, ... }: { nixpkgs = { config = { @@ -51,7 +55,6 @@ home = { packages = with pkgs; [ chromium - eid-mw firefox hledger libreoffice diff --git a/profiles/graphical/secret.nix b/profiles/graphical/secret.nix index d3b1dc94c2ed505572639668f9236988c3d0400d..5496a97c45538f3f9a4e690b0fab7c71e00f8123 100644 GIT binary patch literal 474 zcmZQ@_Y83kiVO&0xOMR?huC7<*q6>S>Q6YX2UpfhTsvrBR3kSj`1-4zRz_D`dmaC> z)jSJr{;My$w>mrTLThqv>TIEnFIV&gG6Y(jdr%pDAh7xWmX@@O^=nhsCilEvsJP*K ze2lcMc7nwGol3Kp-k&-{!MM-taKZ5t))Nop3Ot;o)4&|T$*S<8S_OAk%f`*uFAcFu*pGfX<4UA|nqD}Al# z>{UA-U+|aZmK18{FWJFUJV)r5>Qwi|cJ_X?a<*dLVtZoW^e#@bXpj8)^;d0Ehy`=W z6kUn*E61AdJ+fwG@l(#Z9=`0O#wo?eCs;Mjry8r({%$?aeDc|Q=hn}WAuMH z{SfE;l#T0OwH&C}&(zR=V)d5?Q`1$`HOpqSE?Ra;BG94rZ9V7m^j%rI9xl1??3&Jx zrH7Vv3U_jU$Z$Q;<9zq n+Ak+29-YD>TBN(K%YWMUX_tlX&3qQD+@~0DJJnfUepMv^L=Ehp literal 473 zcmZQ@_Y83kiVO&05Z+H|2?cv1R`;vd1KQlw!t^L%hMSk~=L>^RFpJ%Z;{k&I> zLEQD0&~~Y))nBiNB$-rc-e9j!e>7!Qpv*+`qg*Pdxn}M=vTnB8>jsIRtQpc-IfL z^PAJKUaxWO?W?L~Nfrigqi?^p*sI3;ZO=-@lh0Mu{a(HLv}oUlMS_d&Zw=DUQ+8rl z@jLij`Sjg$#Fs?Ztas7Td6sil;o98I2Q9^2gbs@C5obN}s&!r3)JEk)YbKg5p136G zvGlUbt2BRYP&o7I=@0Ic{~xdzUh&y^@XEy2U%@kLO3ZdhX-M2!b!euh_OInL;~u{| z%a*f%<;#^zt1KV;f8v#O(mUd~;MFu9sdKk1v#s7)7JI&S{PaR6?By2@CbR1;ny*)E zIaKCwna@D$R>1S@Or{54?j1W?Z1r5F$KizIGD*qxqG_cW)%DW7$wC^Z4&ASCYgwn( z{7Nr%e(UxGNv}UY_THR(u;qZ@)5tdI8DZ-J+R}>Nr=J(MR(!Kl