voyager: update certs. Also update flake

base.nix

@@ -42,13 +42,16 @@
   environment.systemPackages = with pkgs; [
     bat
     bottom
+    eza
     git
     gnugrep
     gnutar
+    neofetch
+    python3
     ripgrep
     rsync
-    tree
-    eza
+    screen
+    unzip
     wget
   ];
 
@@ -62,7 +65,6 @@
 
     extraConfig = ''
       AllowTcpForwarding yes
-      X11Forwarding no
       AllowAgentForwarding yes
       AuthenticationMethods publickey
     '';

flake.lock

@@ -41,11 +41,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1703367386,
-        "narHash": "sha256-FMbm48UGrBfOWGt8+opuS+uLBLQlRfhiYXhHNcYMS5k=",
+        "lastModified": 1704980875,
+        "narHash": "sha256-IPZmMjk5f4TBbEpzUFBc3OC1W6OwDNEXk2w/0uVXX1o=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224",
+        "rev": "5f0ab0eedc6ede69beb8f45561ffefa54edc6e65",
         "type": "github"
       },
       "original": {
@@ -80,11 +80,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1703649338,
-        "narHash": "sha256-n2MkBotGgTQsfB+wH09R+otBwYCvGCsnHX7eUMGkKL0=",
+        "lastModified": 1704277720,
+        "narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "8a8321271f0835fae2cb195e1137cb381fdbcc8e",
+        "rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4",
         "type": "github"
       },
       "original": {
@@ -101,11 +101,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1703812100,
-        "narHash": "sha256-JN8qbWz6OPEEPwP+AmfAmlhPE19RqUqND6hGAeK2Od0=",
+        "lastModified": 1705108818,
+        "narHash": "sha256-V7zG8ihfhcopjaZbIvBl78icARrVPSrdeBpgyk3Aa5k=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "7d23e6f5635499a34d09950981cf42bb072f4fa2",
+        "rev": "9151fbf3086d10b5da436616175e71add449f0e1",
         "type": "github"
       },
       "original": {
@@ -147,11 +147,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1703351344,
-        "narHash": "sha256-9FEelzftkE9UaJ5nqxidaJJPEhe9TPhbypLHmc2Mysc=",
+        "lastModified": 1705033721,
+        "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7790e078f8979a9fcd543f9a47427eeaba38f268",
+        "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea",
         "type": "github"
       },
       "original": {
@@ -163,11 +163,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1703467016,
-        "narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=",
+        "lastModified": 1705183652,
+        "narHash": "sha256-rnfkyUH0x72oHfiSDhuCHDHg3gFgF+lF8zkkg5Zihsw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d02d818f22c777aa4e854efc3242ec451e5d462a",
+        "rev": "428544ae95eec077c7f823b422afae5f174dee4b",
         "type": "github"
       },
       "original": {
@@ -197,11 +197,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1703387502,
-        "narHash": "sha256-JnWuQmyanPtF8c5yAEFXVWzaIlMxA3EAZCh8XNvnVqE=",
+        "lastModified": 1705201153,
+        "narHash": "sha256-y0/a4IMDZrc7lAkR7Gcm5R3W2iCBiARHnYZe6vkmiNE=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "e523e89763ff45f0a6cf15bcb1092636b1da9ed3",
+        "rev": "70dd0d521f7849338e487a219c1a07c429a66d77",
         "type": "github"
       },
       "original": {
@@ -227,11 +227,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1703438236,
-        "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=",
+        "lastModified": 1705133751,
+        "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b",
+        "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d",
         "type": "github"
       },
       "original": {
@@ -243,17 +243,16 @@
     },
     "voyager-addons": {
       "locked": {
+        "dirtyRev": "238bcd33b3e2562fcf76f86348909990ddc3d6cc-dirty",
+        "dirtyShortRev": "238bcd3-dirty",
         "lastModified": 1704460893,
-        "narHash": "sha256-rK+GBsfkua1Ou4YHcpQciDOdeS3q23GfTit2SddgTv0=",
-        "ref": "refs/heads/main",
-        "rev": "238bcd33b3e2562fcf76f86348909990ddc3d6cc",
-        "revCount": 3,
+        "narHash": "sha256-lh5nuxULb6Y8rPIDRWnvUOVs7j3jsp4QqiXvEpJjMec=",
         "type": "git",
-        "url": "ssh://git@git.feal.no:2222/felixalb/voyager-addons.git"
+        "url": "file:///home/felixalb/voyager-addons"
       },
       "original": {
         "type": "git",
-        "url": "ssh://git@git.feal.no:2222/felixalb/voyager-addons.git"
+        "url": "file:///home/felixalb/voyager-addons"
       }
     }
   },

flake.nix

@@ -14,7 +14,8 @@
     matrix-synapse-next.url = "github:dali99/nixos-matrix-modules";
     nix-minecraft.url = "github:Infinidoge/nix-minecraft";
 
-    voyager-addons.url = "git+ssh://git@git.feal.no:2222/felixalb/voyager-addons.git";
+    # voyager-addons.url = "git+ssh://git@git.feal.no:2222/felixalb/voyager-addons.git";
+    voyager-addons.url = "git+file:///home/felixalb/voyager-addons";
 
     sops-nix.url = "github:Mic92/sops-nix";
     sops-nix.inputs.nixpkgs.follows = "nixpkgs";

hosts/edison/configuration.nix

@@ -15,8 +15,12 @@
     hostName = "edison";
     defaultGateway = "192.168.10.1";
 
-    # Networking / Wi-Fi is configured with NM for now. TODO
-    networkmanager.enable = true;
+    interfaces.enp4s0.useDHCP = false;
+    interfaces.enp4s0.ipv4.addresses = [
+      { address = "192.168.10.170"; prefixLength = 24; }
+    ];
+
+    hostId = "8e84b281";
   };
 
   console.keyMap = "us";
@@ -26,6 +30,8 @@
   environment.variables = { EDITOR = "vim"; };
   environment.systemPackages = with pkgs; [
     pavucontrol
+    gparted
+    unstable.hydrus
   ];
 
   programs.steam.enable = true;

hosts/edison/desktop.nix

@@ -8,6 +8,8 @@
     xkbVariant = "intl";
   };
 
+  services.openssh.settings.X11Forwarding = true;
+
   environment.systemPackages = with pkgs; [
     xfce.xfce4-pulseaudio-plugin
   ];
@@ -46,6 +48,7 @@
     openFirewall = true;
   };
 
+  security.polkit.enable = true;
   services.flatpak.enable = true;
   users.users."felixalb".packages = [ pkgs.flatpak ];
   xdg.portal = {

hosts/edison/hardware-configuration.nix

@@ -23,6 +23,11 @@
       fsType = "vfat";
     };
 
+  fileSystems."/data" =
+    { device = "/dev/disk/by-uuid/ebbdf34e-adec-4df3-bbed-20d80455f3f7";
+      fsType = "ext4";
+    };
+
   swapDevices =
     [ { device = "/dev/disk/by-uuid/d56040a0-3009-4899-95fa-1b82e60e32e4"; }
     ];
@@ -31,7 +36,7 @@
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
+  networking.useDHCP = lib.mkDefault false;
   # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
 

hosts/voyager/services/code-server.nix

@@ -1,19 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
- cfg = config.services.code-server;
-in {
-  services.code-server = {
-    enable = true;
-    host = "127.0.1.2";
-    port = 4444;
-  };
-  services.nginx.virtualHosts."code.home.feal.no" = {
-    forceSSL = true;
-    sslCertificateKey = "/etc/ssl-snakeoil/code_home_feal_no.key";
-    sslCertificate    = "/etc/ssl-snakeoil/code_home_feal_no.crt";
-    locations."/" = {
-      proxyPass = "http://${cfg.host}:${toString cfg.port}";
-      proxyWebsockets = true;
-    };
-  };
-}

hosts/voyager/services/snappymail.nix

@@ -7,7 +7,7 @@
     hostname = "mail.home.feal.no";
   };
   services.nginx.virtualHosts."${config.services.snappymail.hostname}" = let
-    certPath = "/etc/ssl-snakeoil/mail_home_feal_no";
+    certPath = "/etc/ssl-snakeoil/home.feal.no";
   in {
     addSSL = true;