Merge remote-tracking branch 'origin/main'

os/common.nix

@@ -25,10 +25,8 @@
   environment.systemPackages = with pkgs; [
     wget
     kexec-tools
-    openvpn
-
-    # Needed for all the fetchFromGit in this repo on nixos-rebuild
-    git
+    neovim # So we have a working editor in rescue mode
+    git # Needed for all the fetchFromGit in this repo on nixos-rebuild
   ];
 
   nixpkgs.config.allowUnfree = true;
@@ -39,6 +37,7 @@
     ccache.enable = true;
     # TODO Not enough, see https://nixos.wiki/wiki/CCache.
     # Might want to see if it's worth using on NixOS
+    less.lessopen = null; # Don't use lessopen
     gnupg.agent.enable = true;
 
     # Let users mount disks

os/desktop.nix

@@ -3,16 +3,18 @@
   config = lib.mkIf config.frogeye.desktop.xorg {
     # Enable the X11 windowing system
 
-    services.xserver = {
-      enable = true;
-      windowManager.i3.enable = true;
-      displayManager.defaultSession = "none+i3";
+    services = {
+      blueman.enable = true;
+      xserver = {
+        enable = true;
+        windowManager.i3.enable = true;
+        displayManager.defaultSession = "none+i3";
 
-      # Keyboard layout
-      extraLayouts.qwerty-fr = {
-        description = "QWERTY-fr";
-        languages = [ "fr" ];
-        symbolsFile = "${pkgs.stdenv.mkDerivation {
+        # Keyboard layout
+        extraLayouts.qwerty-fr = {
+          description = "QWERTY-fr";
+          languages = [ "fr" ];
+          symbolsFile = "${pkgs.stdenv.mkDerivation {
           name = "qwerty-fr-keypad";
           src = builtins.fetchGit {
             url = "https://github.com/qwerty-fr/qwerty-fr.git";
@@ -27,13 +29,17 @@
             runHook postInstall
           '';
       }}/linux/us_qwerty-fr";
+        };
+        layout = "qwerty-fr";
       };
-      layout = "qwerty-fr";
     };
 
-    # Enable sound
+    # Enable sound & bluetooth
     sound.enable = true;
-    hardware.pulseaudio.enable = true;
+    hardware = {
+        bluetooth.enable = true;
+        pulseaudio.enable = true;
+    };
 
     # UPST
     # TODO Find a way to override packages either at NixOS level or HM level depending on what is used

os/geoffrey.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, lib, config, ... }:
 {
   imports = [
     <home-manager/nixos>
@@ -34,6 +34,12 @@
     useGlobalPkgs = true;
   };
 
+  specialisation = {
+    dark.configuration.frogeye.polarity = "dark";
+    light.configuration.frogeye.polarity = "light";
+  };
+
+
   # Because everything is encrypted and I'm the only user, this is fine.
   services.xserver.displayManager.autoLogin.user = "geoffrey";
 }

os/wireless/import.py

@@ -1,4 +1,6 @@
-#!/usr/bin/env python3
+#!/usr/bin/env nix-shell
+#! nix-shell -i python3
+#! nix-shell -p python3 python3Packages.pyaml
 
 """
 Exports Wi-Fi networks configuration stored in pass into a format readable by Nix.
@@ -19,7 +21,7 @@ import yaml
 
 # passpy doesn't handle encoding properly, so doing this with calls
 
-PASSWORD_STORE = os.path.expanduser("~/.password-store")
+PASSWORD_STORE = os.path.expanduser("~/.local/share/pass")
 SUBFOLDER = "wifi"
 SEPARATE_PASSWORDS = False
 # TODO Find a way to make then env file available at whatever time it is needed