feat: add manakish

2026-03-16 10:11:08 +01:00 · 2020-11-05 21:28:23 +01:00
parent 69c2f506ae
commit c638ef93f5
11 changed files with 122 additions and 25 deletions
--- a/.versions/retiolum.json
+++ b/.versions/retiolum.json
@@ -1,9 +1,9 @@
 {
  "url": "https://github.com/krebs/retiolum",
-  "rev": "4a7018fce29839877cfb7316e4ce976ba788b37c",
-  "date": "2020-11-03T20:02:13+01:00",
-  "path": "/nix/store/xms5535z225i2z90r6g7223357lyzxdb-retiolum",
-  "sha256": "1plyz15cbsvbr1h2p4n15vmjz1jrnin0ix2jzz2xn2ds0jglkdas",
+  "rev": "d2ecb0aa480546457241eb9da18bc09152eb9037",
+  "date": "2020-11-05T21:02:11+01:00",
+  "path": "/nix/store/j9h4fzlw3vnvab4d98zfxbdqhsfsxvzn-retiolum",
+  "sha256": "0v89416k2gahryy4lw9f4jw6pj2dz2f1sw1rg33zbpjy9fsycrd2",
  "fetchSubmodules": false,
  "deepClone": false,
  "leaveDotGit": false
--- a/configs/cloud.nix
+++ b/configs/cloud.nix
@@ -31,18 +31,18 @@
      devices = {
        homeros.id =
          "HSOL72W-MMN346W-C3WCWCH-OTRKJYG-MY2WWV6-P7JUHN7-5WYYYRV-ZMH4KAA";
-        rilke.id =
-          "NYNNHXP-7JMSTXG-SVNOPWD-RWXCCCL-CBOVBEI-X4QPLF4-NJA5G2P-RSGYRQQ";
        wilde.id =
          "R6DEBD7-G5RYDKN-VFA3HPO-WX4DNVI-373F7OQ-AW5MZTT-3L4BDVW-Y6ROEAF";
        heym.id =
          "HLQSG3D-WSKLA6S-MEYQ3EU-GDBGABE-PY53RQ6-SWQAP2I-Z5MVBVX-MYPJXAM";
+        manakish.id =
+          "AJVBWR2-VFFAGZF-7ZF5JAX-T63GMOG-NZ446WK-MC5E6WK-6X6Q2HE-QQA2JQ3";
      };
      folders =
        let syncthing-dir = "${config.users.users.me.home}/cloud/syncthing";
        in {
          "${syncthing-dir}/common".devices =
-            [ "homeros" "wilde" ];
+            [ "homeros" "wilde" "manakish" ];
          "${syncthing-dir}/library".devices = lib.attrNames devices;
          "${syncthing-dir}/mundoiu".devices = lib.attrNames devices;
          "${syncthing-dir}/music".devices = lib.attrNames devices;
--- a/configs/i3.nix
+++ b/configs/i3.nix
@@ -42,7 +42,7 @@ let
    emoji-file = pkgs.fetchurl {
      url =
        "https://raw.githubusercontent.com/LukeSmithxyz/voidrice/master/.local/share/larbs/emoji";
-      sha256 = "09m2rgb9d5jpiy8q4jz3dw36gkpb4ng2pl7xi7ppsrzzzdvq85qk";
+      sha256 = "03fv69ah8msh2j6i3lm4sdkckqq8jwn1kj43j98dh0xjpzazsy46";
    };
  in with pkgs;
  writers.writeDashBin "emoji-menu" ''
--- a/configs/mail.nix
+++ b/configs/mail.nix
@@ -7,7 +7,11 @@ let
    repo = "nixpkgs";
    rev = "7c2a362b58a1c2ba72d24aa3869da3b1a91d39e1";
    sha256 = "0gl4xndyahasa9dv5mi3x9w8s457wl2xh9lcldizcn1irjvkrzs4";
-  }) {};
+  }) {
+    overlays = [
+      (import <stockholm/krebs/5pkgs/haskell>)
+    ];
+  };
  much-pkg = nixpkgs-much.haskellPackages.callCabal2nix "much" <niveum/submodules/much> {};
  much = nixpkgs-much.haskell.lib.dontHaddock much-pkg;

@@ -116,6 +120,7 @@ in {
    in lib.listToAttrs (map muchsyncConfig [
      "wilde"
      "homeros"
+      "manakish"
    ]);

    programs.msmtp.enable = true;
--- a/configs/packages/writing.nix
+++ b/configs/packages/writing.nix
@@ -19,11 +19,11 @@ let
    })
    (zoteroStyle {
      name = "din-1505-2";
-      sha256 = "150kbnxl1r4g1s40khdavv5s6ah10ws135r9k883f6srk78sz6zi";
+      sha256 = "1pvy1b7qm13mnph7z365rrz1j082bl2y8ih73rhzd0zd6dz1jyjq";
    })
    (zoteroStyle {
      name = "apa";
-      sha256 = "1rg41mblmqifba1azb6481dwxhsbl606kf6ysqkqd786f9l9dcf8";
+      sha256 = "1878vxp0y0h05yzaghnd51n981623mxskw3lsdyzmffqhihvv111";
    })
  ];

--- a/configs/watson.nix
+++ b/configs/watson.nix
@@ -1,9 +1,4 @@
 { config, pkgs, ... }:
 {
  environment.systemPackages = [ pkgs.watson ];
-
-  system.activationScripts.watsonFiles = ''
-    install -d ${config.users.users.me.home}/.config/watson/
-    ln -sf ${config.users.users.me.home}/cloud/Dropbox/watson-frames.json ${config.users.users.me.home}/.config/watson/frames
-  '';
 }
--- a/deploy.nix
+++ b/deploy.nix
@@ -60,4 +60,9 @@ in {
    name = "makanek";
    address = "makanek.r";
  });
+  manakish = writeDeploy "deploy-manakish" (regularSystem {
+    path = systems/manakish;
+    name = "manakish";
+    address = "192.168.178.29";
+  });
 }
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -33,7 +33,7 @@
    name = "Kierán Meinhardt";
    sshKeys = pkgs: pkgs.lib.strings.splitString "\n" (pkgs.lib.strings.fileContents (pkgs.fetchurl {
      url = "https://github.com/kmein.keys";
-      sha256 = "0875igsyr889sgwigm992bgmks6na6mynl8iiprvv3fdwxk3c2gr";
+      sha256 = "00dj3i23im3a1fbgm5kbaqyw757n0pc1mdg7ljky57a33kp25day";
    }));
  };

--- a/packages/gfs-fonts.nix
+++ b/packages/gfs-fonts.nix
@@ -17,22 +17,21 @@ in symlinkJoin {
    GFS_Baskerville = "07gx5b9b43zv74d2lay37sajd4ba2wqn3b7xzvyhn265ds9x7cxk";
    GFS_Bodoni = "0jhl0728ikzha1krm01sk52nz3jzibidwmyvgidg61d87l8nbf2p";
    GFS_Bodoni_Classic = "06jw2irskn75s50mgwkx08rzwqi82gpc6lgjsimsi8p81566gfrh";
-    GFS_Complutum =
-      "1q7dxs2z3yrgchd2pz9h72mjrk62kdc2mmqw8kg9q76k28f8n3p0"; # -> GFSPolyglot.otf
+    GFS_Complutum = "1q7dxs2z3yrgchd2pz9h72mjrk62kdc2mmqw8kg9q76k28f8n3p0"; # -> GFSPolyglot.otf
    GFS_Decker = "016v1j5n9ph4i2cpmlk26pcxhp3q2fjwlaryppd5akl84dfkpncl";
    GFS_Didot = "0ysvrp527wm0wxfp6wmlgmxfx7ysr5mwpmjmqp1h605cy44jblfm";
    GFS_Didot_Classic = "0n5awqksvday3l3d85yhwmbmfj9bcpxivy4wpd4zrkgl7b85af2c";
-    GFS_Didot_Display = "0gg5xb8jic646gz9p05ry62nk7w0k546fxp5p4vvnawmckql2dj1";
+    GFS_Didot_Display = "0n2di2zyc76w6f8mc6hfilc2ir6igks7ldjp9fkw1gjp06330fi7";
    GFS_Elpis = "02l7wd3nbn1kpv7ghxh19k4dbvd49ijyxd6gq83gcr9vlmxcq2s2";
    GFS_Gazis = "0x9iwj6pinaykrds0iw6552hf256d0dr41sipdb1jnnlr2d3bf9w";
    GFS_Goschen = "1jvbn33wzq2yj0aygwy9pd2msg3wkmdp0npjzazadrmfjpnpkcy9";
    GFS_NeoHellenic = "1ixm2frdc6i5lbn9h0h4gdsvsw2k4hny75q8ig4kgs28ac3dbzq3";
-    GFS_Olga = "0f05ng02na84x9x6yhskxqwxwyabjisyl8a0k3fiah60i620p39d";
-    GFS_Orpheus = "1rvjpvk1fx55vyp3dyxcbww1a24rm7xv5faqs735yf6lqzpkqnax";
-    GFS_Orpheus_Classic = "0d2yzwg6albmgl1d0xhsfrmxj79r42wp712rpry567nv1ry42k0a";
-    GFS_Orpheus_Sans = "1rdlm2kmkvi4y3ii68ik8k3w3183vvb3q2pnk04lbb0ggg9w5jdb";
+    GFS_Olga = "1qaxaw3ngnbr1gb1xyk5f2z647zklg6sl3bqwi28l47j9mp0f8aj";
+    GFS_Orpheus = "18n6fag4pyr8jdwnsz0vixf47jz4ym8mjmppc1w3k7v27cg1z9dz";
+    GFS_Orpheus_Classic = "1rqy1kf7slw56zfhbv264yzarjisnqbqydj4f7hghiknhnmdakps";
+    GFS_Orpheus_Sans = "02rh7z8c3h3xyfi52rn47z4finizx636d05bg5g23v0l0mqs6nkg";
    GFS_Philostratos = "0zh3d0cn6b2fjbwnvmg379z20zh7w626w2bnj19xcazjvqkwhzx1";
-    GFS_Porson = "0r3snwgxkdx7h34sg3s0hr8fac3rnpllq62bk44m266hj6a80a5k";
+    GFS_Porson = "0c2axagkm6wxv8na2q11k6c5dmgkwx5hn9sh9qy82gbips9blnda";
    GFS_Pyrsos = "0y0dv7y3n01bbhhnczflx1zcc7by56cffmr2xqixj2rd1nvchx0j";
    GFS_Solomos = "1mpx9mw566awvfjdfx5sbz3wz5gbnjjw56gz30mk1lw06vxf0dxz";
    GFS_Theokritos = "0haasx819x8c8yvna6pqywgi4060av2570jm34cddnz1fgnhv1b8";
--- a/systems/manakish/configuration.nix
+++ b/systems/manakish/configuration.nix
@@ -0,0 +1,54 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, ... }:
+{
+  imports = [ # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+    <niveum/configs/default.nix>
+    {
+      boot.extraModulePackages = with config.boot.kernelPackages; [
+        tp_smapi
+        acpi_call
+      ];
+      boot.kernelModules = [ "tp_smapi" "acpi_call" ];
+      environment.systemPackages = [ pkgs.tpacpi-bat ];
+
+      services.tlp = {
+        enable = true;
+        settings = {
+          START_CHARGE_THRESH_BAT0 = 80;
+          STOP_CHARGE_THRESH_BAT0 = 95;
+        };
+      };
+    }
+  ];
+
+
+  niveum = {
+    batteryName = "BAT0";
+    wirelessInterface = "wlp3s0";
+    promptColours.success = "cyan";
+  };
+
+  networking.useDHCP = false;
+  networking.interfaces = {
+    enp0s25.useDHCP = true;
+    wlp3s0.useDHCP = true;
+    wwp0s20u4i6.useDHCP = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    git vim
+  ];
+
+  networking.retiolum = {
+    ipv4 = "10.243.2.85";
+    ipv6 = "42:0:3c46:ac99:ae36:cb8:c551:ba27";
+  };
+
+  networking.hostName = "manakish";
+
+  system.stateVersion = "20.09"; # Did you read the comment?
+}
--- a/systems/manakish/hardware-configuration.nix
+++ b/systems/manakish/hardware-configuration.nix
@@ -0,0 +1,39 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/ff47c479-e6d4-4cd6-93f1-9685f4018bc6";
+      fsType = "ext4";
+    };
+
+  boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/493cb228-c292-4f71-9f38-dcb3e96dec47";
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/D4AC-91B0";
+      fsType = "vfat";
+    };
+
+  swapDevices = [ ];
+
+  boot.loader.grub = {
+    enable = true;
+    version = 2;
+    efiSupport = true;
+    efiInstallAsRemovable = true;
+    device = "/dev/sda";
+  };
+
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+}