Rename system to lib

lib/nixos/configuration.nix

@@ -0,0 +1,284 @@
+{
+  inputs,
+  desktop ? false,
+  hostname,
+  pkgs,
+  system,
+}: let
+  configure-gtk = pkgs.writeTextFile {
+    name = "configure-gtk";
+    destination = "/bin/configure-gtk";
+    executable = true;
+    text = let
+      schema = pkgs.gsettings-desktop-schemas;
+      datadir = "${schema}/share/gsettings-schemas/${schema.name}";
+    in ''
+      export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS
+      gnome_schema=org.gnome.desktop.interface
+      gsettings set $gnome_schema gtk-theme 'Breeze Dark'
+    '';
+  };
+
+  username = "opdavies";
+in {
+  nixpkgs = {
+    config = {
+      allowUnfree = true;
+    };
+  };
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
+
+  systemd.extraConfig = ''
+    DefaultTimeoutStopSec=10s
+  '';
+
+  networking.hostName = hostname;
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Enable networking
+  networking.networkmanager.enable = true;
+
+  # Set your time zone.
+  time.timeZone = "Europe/London";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_GB.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "en_GB.UTF-8";
+    LC_IDENTIFICATION = "en_GB.UTF-8";
+    LC_MEASUREMENT = "en_GB.UTF-8";
+    LC_MONETARY = "en_GB.UTF-8";
+    LC_NAME = "en_GB.UTF-8";
+    LC_NUMERIC = "en_GB.UTF-8";
+    LC_PAPER = "en_GB.UTF-8";
+    LC_TELEPHONE = "en_GB.UTF-8";
+    LC_TIME = "en_GB.UTF-8";
+  };
+
+  # Enable the X11 windowing system.
+  services.xserver.enable = true;
+
+  services.xserver = {
+    xkb = {
+      layout = "gb";
+      variant = "";
+    };
+
+    displayManager = {
+      defaultSession = "none+i3";
+      lightdm.enable = true;
+    };
+
+    windowManager.i3 = {
+      enable = true;
+      extraPackages = with pkgs; [i3status i3lock i3blocks];
+    };
+  };
+
+  # Configure console keymap
+  console.keyMap = "uk";
+
+  services.avahi.enable = true;
+  services.avahi.nssmdns4 = true;
+  services.avahi.openFirewall = true;
+  services.printing.enable = true;
+
+  # Enable sound with pipewire.
+  sound.enable = true;
+  hardware.pulseaudio.enable = true;
+  security.rtkit.enable = true;
+  # services.pipewire = {
+  #   enable = true;
+  #   alsa.enable = true;
+  #   alsa.support32Bit = true;
+  #   pulse.enable = true;
+  #   # If you want to use JACK applications, uncomment this
+  #   #jack.enable = true;
+  #
+  #   # use the example session manager (no others are packaged yet so this is enabled by default,
+  #   # no need to redefine it in your config for now)
+  #   #media-session.enable = true;
+  # };
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  # services.xserver.libinput.enable = true;
+
+  users.users.${username} = {
+    isNormalUser = true;
+    description = "Oliver Davies";
+    extraGroups = ["docker" "networkmanager" "wheel"];
+    packages = with pkgs; [];
+  };
+
+  security.sudo.wheelNeedsPassword = false;
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs;
+    [
+      brightnessctl
+      configure-gtk
+      ffmpegthumbnailer
+      shotwell
+      xfce.thunar
+      xfce.thunar-volman
+      xfce.tumbler
+    ]
+    ++ pkgs.lib.optionals desktop [
+      acpi
+      arandr
+      dunst
+      libnotify
+      rclone
+      rclone-browser
+
+      # Games.
+      zeroad
+    ];
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
+
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+  services.openssh.enable = true;
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # 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 = "22.11"; # Did you read the comment?
+
+  virtualisation.docker.enable = true;
+
+  programs.zsh.enable = true;
+  programs.zsh.histSize = 5000;
+
+  users.defaultUserShell = "/etc/profiles/per-user/${username}/bin/zsh";
+
+  fonts = {
+    fontconfig = {
+      enable = true;
+      defaultFonts = {
+        monospace = ["JetBrainsMono Nerd Font Mono"];
+      };
+    };
+
+    packages = with pkgs; [
+      (nerdfonts.override {
+        fonts = [
+          "AnonymousPro"
+          "FiraCode"
+          "GeistMono"
+          "IntelOneMono"
+          "Iosevka"
+          "JetBrainsMono"
+          "Meslo"
+        ];
+      })
+    ];
+  };
+
+  zramSwap.enable = true;
+
+  nix = {
+    gc = {
+      automatic = true;
+      dates = "daily";
+      options = "--delete-older-than 7d";
+    };
+
+    optimise.automatic = true;
+
+    settings = {
+      auto-optimise-store = true;
+      experimental-features = ["nix-command" "flakes"];
+      warn-dirty = false;
+    };
+  };
+
+  # Make Caps lock work as an Escape key on press and Ctrl on hold.
+  services.interception-tools = let
+    dfkConfig = pkgs.writeText "dual-function-keys.yaml" ''
+      MAPPINGS:
+        - KEY: KEY_CAPSLOCK
+          TAP: KEY_ESC
+          HOLD: KEY_LEFTCTRL
+    '';
+  in {
+    enable = true;
+    plugins = pkgs.lib.mkForce [pkgs.interception-tools-plugins.dual-function-keys];
+    udevmonConfig = ''
+      - JOB: "${pkgs.interception-tools}/bin/intercept -g $DEVNODE | ${pkgs.interception-tools-plugins.dual-function-keys}/bin/dual-function-keys -c ${dfkConfig} | ${pkgs.interception-tools}/bin/uinput -d $DEVNODE"
+        DEVICE:
+          NAME: "AT Translated Set 2 keyboard"
+          EVENTS:
+            EV_KEY: [[KEY_CAPSLOCK, KEY_ESC, KEY_LEFTCTRL]]
+    '';
+  };
+
+  system.autoUpgrade = {
+    enable = true;
+    flake = inputs.self.outPath;
+    flags = [
+      "--update-input"
+      "nixpkgs"
+      "--no-write-lock-file"
+      "-L" # print build logs
+    ];
+    dates = "08:00";
+    randomizedDelaySec = "45min";
+  };
+
+  services.gvfs.enable = true;
+
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+    pinentryFlavor = "qt";
+  };
+
+  programs.firefox = {
+    enable = true;
+    languagePacks = ["en-GB"];
+    preferences = {
+      "intl.accept_languages" = "en-GB, en";
+      "intl.regional_prefs.use_os_locales" = true;
+    };
+  };
+
+  services.blueman.enable = true;
+
+  services.cron = {
+    enable = true;
+
+    systemCronJobs = [
+      "* * * * * opdavies /home/opdavies/.config/bin/notify-battery.sh"
+    ];
+  };
+
+  services.auto-cpufreq.enable = true;
+}

lib/nixos/default.nix

@@ -0,0 +1,29 @@
+{
+  inputs,
+  pkgs,
+  self,
+  system,
+  username,
+}: {
+  desktop ? false,
+  hostname,
+}: let
+  configuration = import ./configuration.nix {inherit desktop hostname inputs pkgs system;};
+  hardware-configuration = import ./hardware-configuration.nix;
+in
+  inputs.nixpkgs.lib.nixosSystem {
+    modules = [
+      inputs.home-manager.nixosModules.home-manager
+      {
+        home-manager = {
+          extraSpecialArgs = {inherit inputs desktop self username;};
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          users."${username}" = import ./home-manager;
+        };
+      }
+
+      configuration
+      hardware-configuration
+    ];
+  }

lib/nixos/hardware-configuration.nix

@@ -0,0 +1,44 @@
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
+
+  boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = ["kvm-intel"];
+  boot.kernelParams = ["i8042.reset"];
+  boot.extraModulePackages = [];
+
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+  hardware.enableAllFirmware = true;
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-label/nixos";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot/efi" = {
+    device = "/dev/disk/by-label/boot";
+    fsType = "vfat";
+  };
+
+  swapDevices = [{device = "/dev/disk/by-label/swap";}];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (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.interfaces.enp0s13f0u1.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  hardware.bluetooth.enable = true;
+  hardware.cpu.intel.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

lib/nixos/home-manager/default.nix

@@ -0,0 +1,50 @@
+{
+  config,
+  desktop,
+  inputs,
+  pkgs,
+  self,
+  username,
+  ...
+}: let
+  desktop-config = import ./desktop.nix {inherit config inputs pkgs username;};
+  shared-config = import ../../shared/home-manager.nix {inherit inputs pkgs self username;};
+  shared-packages = import ../../shared/home-manager-packages.nix {inherit inputs pkgs;};
+in {
+  imports =
+    if desktop
+    then [desktop-config shared-config]
+    else [shared-config];
+
+  home.packages =
+    shared-packages
+    ++ pkgs.lib.optionals desktop [
+      pkgs.discord
+      pkgs.gimp
+      pkgs.gscan2pdf
+      pkgs.kdenlive
+      pkgs.meslo-lg
+      pkgs.obs-studio
+      pkgs.okular
+      pkgs.pamixer
+      pkgs.pass
+      pkgs.pavucontrol
+      pkgs.pinentry
+      pkgs.slack
+      pkgs.via
+      pkgs.vlc
+      pkgs.xsel
+      pkgs.xcape
+      pkgs.zoom-us
+    ];
+
+  home.sessionVariables = {
+    EDITOR = "nvim";
+    LANG = "en_GB.UTF-8";
+    LC_ALL = "en_GB.UTF-8";
+    LC_CTYPE = "en_GB.UTF-8";
+    PATH = "$PATH:./vendor/bin:./node_modules/.bin";
+    PULUMI_SKIP_UPDATE_CHECK = "true";
+    RIPGREP_CONFIG_PATH = "$HOME/.config/ripgrep/config";
+  };
+}

lib/nixos/home-manager/desktop.nix

@@ -0,0 +1,43 @@
+{
+  config,
+  inputs,
+  pkgs,
+  username,
+}: {
+  imports = [
+    ./modules/alacritty.nix
+    ./modules/autorandr.nix
+    ./modules/espanso.nix
+    ./modules/i3.nix
+  ];
+
+  services.dunst = {
+    enable = true;
+
+    settings = {
+      global = {
+        follow = "keyboard";
+      };
+    };
+  };
+
+  services.copyq.enable = true;
+
+  services.flameshot = {
+    enable = true;
+
+    settings = {
+      General = {
+        disabledTrayIcon = false;
+        saveAfterCopy = true;
+        savePath = "/home/${username}/Pictures/Screenshots";
+        showHelp = false;
+        uiColor = "#60a5fa";
+      };
+    };
+  };
+
+  programs.feh.enable = true;
+
+  programs.rofi.enable = true;
+}

lib/nixos/home-manager/modules/alacritty.nix

@@ -0,0 +1,27 @@
+{
+  programs.alacritty = {
+    enable = true;
+
+    settings = {
+      window.opacity = 0.9;
+
+      window.padding = {
+        x = 15;
+        y = 15;
+      };
+
+      font = {
+        size = 12.0;
+
+        bold.style = "Regular";
+        normal.family = "GeistMono Nerd Font Mono";
+        # fc-list : family | sort | grep "Nerd Font"
+
+        offset.y = 12;
+        glyph_offset.y = 6;
+      };
+
+      shell = {program = "zsh";};
+    };
+  };
+}

lib/nixos/home-manager/modules/autorandr.nix

@@ -0,0 +1,43 @@
+{username, ...}: {
+  services.autorandr.enable = true;
+
+  xdg.configFile."autorandr/postswitch" = {
+    executable = true;
+    text = ''
+      #!/usr/bin/env bash
+
+      feh --randomize --bg-scale /home/${username}/Pictures/Wallpaper/*;
+    '';
+  };
+
+  programs.autorandr = {
+    enable = true;
+
+    profiles = let
+      laptop = "00ffffffffffff000daef21400000000161c0104a51f117802ee95a3544c99260f505400000001010101010101010101010101010101363680a0703820402e1e240035ad10000018000000fe004e3134304843472d4751320a20000000fe00434d4e0a202020202020202020000000fe004e3134304843472d4751320a2000bb";
+      monitor = "00ffffffffffff004c2d1710424e58432b1f0103803f24782ac8b5ad50449e250f5054bfef80714f810081c081809500a9c0b300010108e80030f2705a80b0588a0078682100001e000000fd00324b1e873c000a202020202020000000fc004c5532385235350a2020202020000000ff0048345a524130303132380a20200183020335f04961120313041f10605f2309070783010000e305c0006b030c002000b83c2000200167d85dc401788003e20f81e3060501023a801871382d40582c450078682100001e023a80d072382d40102c458078682100001e04740030f2705a80b0588a0078682100001e565e00a0a0a029503020350078682100001a000049";
+    in {
+      laptop = {
+        config.eDP-1 = {
+          enable = true;
+          mode = "1920x1080";
+          primary = true;
+          rate = "59.95";
+        };
+
+        fingerprint.eDP-1 = laptop;
+      };
+
+      desktop = {
+        config.HDMI-1 = {
+          enable = true;
+          mode = "2560x1440";
+          primary = true;
+          rate = "59.95";
+        };
+
+        fingerprint.HDMI-1 = monitor;
+      };
+    };
+  };
+}

lib/nixos/home-manager/modules/espanso.nix

@@ -0,0 +1,80 @@
+let
+  baseUrl = "https://www.oliverdavies.uk";
+in {
+  services.espanso = {
+    enable = true;
+
+    configs = {
+      default = {
+        show_notifications = false;
+      };
+    };
+
+    matches = {
+      base = {
+        matches = [
+          {
+            trigger = ":archive";
+            replace = "${baseUrl}/archive";
+          }
+          {
+            trigger = ":atdc";
+            replace = "${baseUrl}/atdc";
+          }
+          {
+            trigger = ":call";
+            replace = "${baseUrl}/call";
+          }
+          {
+            trigger = ":coaching";
+            replace = "${baseUrl}/team-coaching";
+          }
+          {
+            trigger = ":daily";
+            replace = "${baseUrl}/daily";
+          }
+          {
+            trigger = ":dotfiles";
+            replace = "https://github.com/opdavies/dotfiles.nix";
+          }
+          {
+            trigger = ":dc";
+            replace = "Drupal Commerce";
+          }
+          {
+            trigger = ":dr";
+            replace = "Drupal";
+          }
+          {
+            trigger = ":gt";
+            replace = "Great, thanks!";
+          }
+          {
+            trigger = ":lh";
+            replace = "http://localhost";
+          }
+          {
+            trigger = ":podcast";
+            replace = "${baseUrl}/podcast";
+          }
+          {
+            trigger = ":pricing";
+            replace = "${baseUrl}/pricing";
+          }
+          {
+            trigger = ":talks";
+            replace = "${baseUrl}/talks";
+          }
+          {
+            trigger = ":website";
+            replace = "${baseUrl}";
+          }
+          {
+            trigger = ":zoom";
+            replace = "https://savvycal.com/opdavies/zoom";
+          }
+        ];
+      };
+    };
+  };
+}

lib/nixos/home-manager/modules/i3.nix

@@ -0,0 +1,158 @@
+{
+  config,
+  inputs,
+  self,
+  username,
+  pkgs,
+  ...
+}: let
+  modifier = "Mod4";
+in {
+  xsession.windowManager.i3 = {
+    enable = true;
+
+    config = {
+      assigns = {
+        "7" = [{class = "vlc";}];
+        "8" = [{class = "0ad";}];
+        "9" = [
+          {class = "Slack";}
+          {class = "discord";}
+        ];
+      };
+
+      defaultWorkspace = "workspace number 1";
+
+      focus.followMouse = false;
+
+      modifier = modifier;
+
+      keybindings = inputs.nixpkgs.lib.mkOptionDefault {
+        "${modifier}+d" = "exec ${pkgs.rofi}/bin/rofi -show drun";
+
+        "${modifier}+Shift+b" = "exec ${pkgs.firefox}/bin/firefox";
+        "${modifier}+Shift+f" = "exec ${pkgs.xfce.thunar}/bin/thunar";
+        "${modifier}+Tab" = "workspace back_and_forth";
+
+        # Change focus.
+        "${modifier}+h" = "focus left";
+        "${modifier}+j" = "focus down";
+        "${modifier}+k" = "focus up";
+        "${modifier}+l" = "focus right";
+
+        # Move focused window.
+        "${modifier}+Shift+h" = "move left";
+        "${modifier}+Shift+j" = "move down";
+        "${modifier}+Shift+k" = "move up";
+        "${modifier}+Shift+l" = "move right";
+
+        "${modifier}+Shift+s" = "exec ${pkgs.flameshot}/bin/flameshot gui";
+        "${modifier}+Shift+p" = "exec ${pkgs.autorandr}/bin/autorandr --cycle";
+        "${modifier}+Shift+y" = "exec ${pkgs.copyq}/bin/copyq toggle";
+
+        "XF86AudioRaiseVolume" = "exec pamixer -ui 2 && pamixer --get-volume";
+        "XF86AudioLowerVolume" = "exec pamixer -ud 2 && pamixer --get-volume";
+        "XF86AudioMute" = "exec pamixer --toggle-mute && ( [ \"$(pamixer --get-mute)\" = \"true\" ] && echo 0";
+
+        "XF86MonBrightnessDown" = "exec brightnessctl set 5%- | sed -En 's/.*\(([0-9]+)%\).*/\1/p'";
+        "XF86MonBrightnessUp" = "exec brightnessctl set +5% | sed -En 's/.*\(([0-9]+)%\).*/\1/p'";
+      };
+
+      terminal = "alacritty";
+
+      window = {
+        border = 0;
+        hideEdgeBorders = "none";
+      };
+    };
+
+    extraConfig = ''
+      set $laptop eDP-1
+      bindswitch --reload --locked lid:on output $laptop disable
+      bindswitch --reload --locked lid:off output $laptop enable
+
+      exec --no-startup-id ${pkgs.feh}/bin/feh --randomize --bg-scale /home/${username}/Pictures/Wallpaper/*;
+
+      default_border none
+      default_floating_border none
+      smart_borders on
+      smart_gaps on
+
+                              #border backgr  text    indicator
+      client.focused          #444444 #555555 #ffffff #dddddd
+      client.focused_inactive #222222 #333333 #888888 #292d2e
+      client.unfocused        #222222 #111111 #888888 #292d2e
+      client.urgent           #2f343a #900000 #ffffff #900000
+
+    '';
+
+    config = {
+      bars = [
+        {
+          position = "bottom";
+          statusCommand = "${pkgs.i3status}/bin/i3status";
+          colors = {
+            background = "#161616";
+            statusline = "#ffffff";
+            separator = "#333333";
+
+            focusedWorkspace = {
+              background = "#444444";
+              border = "#555555";
+              text = "#ffffff";
+            };
+
+            activeWorkspace = {
+              background = "#555555";
+              border = "#666666";
+              text = "#ffffff";
+            };
+
+            inactiveWorkspace = {
+              background = "#111111";
+              border = "#000000";
+              text = "#888888";
+            };
+
+            bindingMode = {
+              background = "#ff0000";
+              border = "#880000";
+              text = "#ffffff";
+            };
+
+            urgentWorkspace = {
+              background = "#ff0000";
+              border = "#880000";
+              text = "#ffffff";
+            };
+          };
+        }
+      ];
+
+      fonts.names = ["GeistMono"];
+
+      gaps = {
+        smartBorders = "on";
+        smartGaps = true;
+      };
+    };
+  };
+
+  programs.i3status = {
+    enable = true;
+
+    general = {
+      colors = true;
+
+      color_bad = "#f7768e";
+      color_degraded = "#ff9e64";
+      color_good = "#c0caf5";
+    };
+
+    modules = {
+      cpu_temperature.enable = false;
+      ipv6.enable = false;
+      load.enable = false;
+    };
+  };
+}