averageatchris/nixos-configs - Change COUSBBHL5XPZC5KWCYFFAE554D4VFFO55QOD726ODWIRZGWOUSUAC

flake-ify home-manager config and mk nixos module

Created by Chris Cummings on December 27, 2021

COUSBBHL5XPZC5KWCYFFAE554D4VFFO55QOD726ODWIRZGWOUSUAC

Dependencies

In channels

main

Change contents

File deletion: window_manager
BF:BFD[8.20] → [9.18:43]
BF:BFD[9.43] → [9.17:17]
File deletion: default.nix
BF:BFD[9.17] → [9.938:973]
BF:BFD[9.973] → [9.604:604]
∅:D[10.3393] → [9.628:742]
B:BD[9.628] → [9.628:742]
∅:D[11.99] → [9.805:824]
B:BD[9.805] → [9.805:824]
∅:D[10.3459] → [9.878:937]
∅:D[12.8487] → [9.878:937]
B:BD[9.878] → [9.878:937]
B:BD[9.824] → [12.8426:8487]
B:BD[9.742] → [11.35:99]
B:BD[9.604] → [10.3365:3393]
```
let
  # TODO why does using `pkgs` here cause an infinite recursion?
  # this works just seems ugly 🤷🤷🤷
in
if isLinux then
else {
  # TODO yabai & skhd or keep them in nix-darwin?
}
  import ./sway { pkgs = pkgs; config = config; lib = lib; }
  isLinux = (import <nixpkgs> { }).stdenv.hostPlatform.isLinux;
{ pkgs, config, lib, ... }:
```
File deletion: sway
BF:BFD[9.17] → [12.19:34]
BF:BFD[12.34] → [12.18:18]
File deletion: icons
BF:BFD[12.18] → [13.5082:5098]
BF:BFD[13.5098] → [13.5081:5081]
Replacement in nixpkgs/utils/default.nix at line 1 [14.2127]
B:BD[14.2127] → [11.102:156]
```
{ pkgs ? import <nixpkgs> { }, lib ? pkgs.lib, ... }:
```
[14.2127]
[14.2178]
```
{ pkgs, ... }:
```
Replacement in nixpkgs/utils/default.nix at line 4 [14.2127]
B:BD[14.2181] → [15.91:166]
∅:D[15.166] → [14.2181:2214]
B:BD[14.2181] → [14.2181:2214]
```
  isNixOS = lib.hasInfix "NAME=NixOS" (builtins.readFile /etc/os-release);
  mkINI = lib.generators.toINI {
```
[14.2181]
[14.2214]
```
  mkINI = pkgs.lib.generators.toINI {
```
Replacement in nixpkgs/utils/default.nix at line 8 [14.2127]
B:BD[16.134] → [16.134:169]
```
          if lib.isBool value then
```
[16.134]
[14.2282]
```
          if pkgs.lib.isBool value then
```

Replacement in nixpkgs/utils/default.nix at line 17 [14.2127]

B:BD[16.274] → [16.274:337]

    , mkValue ? (v: lib.generators.mkValueStringDefault { } v)

[16.274]

[16.337]

    , mkValue ? (v: pkgs.lib.generators.mkValueStringDefault { } v)

Replacement in nixpkgs/utils/default.nix at line 20 [14.2127]
∅:D[16.357] → [14.2509:2543]
B:BD[14.2509] → [14.2509:2543]
```
    (lib.strings.concatStringsSep
```
[16.357]
[14.2543]
```
    (pkgs.lib.strings.concatStringsSep
```
Replacement in nixpkgs/utils/default.nix at line 22 [14.2127]
B:BD[14.2554] → [14.2554:2589]
```
      (lib.attrsets.mapAttrsToList
```
[14.2554]
[14.2589]
```
      (pkgs.lib.attrsets.mapAttrsToList
```

File deletion: alacritty.nix

BF:BFD[9.980] → [9.1590:1627]

BF:BFD[9.1627] → [9.1336:1336]

B:BD[9.1336] → [9.1337:1589]

{ pkgs, config, ... }:
{
  config.programs.alacritty.enable = true;
  # register alacritty as sway's terminal if alacritty is installed 😀
  config.wayland.windowManager.sway.config.terminal = "${config.programs.alacritty.package}/bin/alacritty";
}

Replacement in nixpkgs/terminal_emulator/default.nix at line 3 [9.1011]

B:BD[9.1036] → [9.1036:1149]

B:BD[9.1149] → [11.162:226]

∅:D[11.226] → [9.1212:1290]

B:BD[9.1212] → [9.1212:1290]

B:BD[9.1290] → [11.227:236]

let
  # TODO why does using `pkgs` here cause an infinite recursion?
  # this works just seems ugly 🤷🤷🤷
  isLinux = (import <nixpkgs> { }).stdenv.hostPlatform.isLinux;
in
if isLinux then
  import ./alacritty.nix { pkgs = pkgs; config = config; }
else { }

[9.1036]

{
  config.programs.alacritty.enable = true;
  config.wayland.windowManager.sway.config.terminal = "${config.programs.alacritty.package}/bin/alacritty";
}

File addition: sway (d--x------)
[8.20]
File move: waybar_style.css → waybar_style.css
BF:BFD[12.18] → [12.1344:1384]
BF:BF[12.1384] → [12.36:36]
[0.426]
[12.36]
File move: waybar.nix → waybar.nix
BF:BFD[12.18] → [12.4103:4137]
BF:BF[12.4137] → [12.1386:1386]
[0.426]
[12.1386]
File move: tmp_nwg-drawer.nix → tmp_nwg-drawer.nix
BF:BFD[12.18] → [17.937:979]
BF:BF[17.979] → [17.21:21]
[0.426]
[17.21]
File move: swaylock.config → swaylock.config
BF:BFD[12.18] → [17.1924:1963]
BF:BF[17.1963] → [17.981:981]
[0.426]
[17.981]
File move: screenshots.nix → screenshots.nix
BF:BFD[12.18] → [13.3199:3238]
BF:BF[13.3238] → [13.2862:2862]
[0.426]
[13.2862]
File move: playerctl.sh → playerctl.sh
BF:BFD[12.18] → [12.4485:4521]
BF:BF[12.4521] → [12.4139:4139]
[0.426]
[12.4139]
Replacement in nixpkgs/sway/playerctl.sh at line 1 [12.4139]
B:BD[12.4139] → [12.4140:4187]
```
player_status=$(playerctl status 2> /dev/null)
```
[12.4139]
[12.4187]
```
#!/bin/sh
player_status=$(playerctl status 2>/dev/null)
```

Replacement in nixpkgs/sway/playerctl.sh at line 5 [12.4139]

B:BD[12.4230] → [12.4230:4296]

echo "$(playerctl metadata artist) - $(playerctl metadata title)"

[12.4230]

[12.4296]

  echo "$(playerctl metadata artist) - $(playerctl metadata title)"

Replacement in nixpkgs/sway/playerctl.sh at line 8 [12.4139]

B:BD[12.4340] → [12.4340:4414]

    echo " $(playerctl metadata artist) - $(playerctl metadata title)"

[12.4340]

[12.4414]

  echo " $(playerctl metadata artist) - $(playerctl metadata title)"

Replacement in nixpkgs/sway/playerctl.sh at line 11 [12.4139]

B:BD[12.4420] → [12.4420:4480]

    echo "$(playerctl status): $(playerctl metadata title)"

[12.4420]

[12.4480]

  echo "$(playerctl status): $(playerctl metadata title)"

File move: nwg-panel.css → nwg-panel.css
BF:BFD[12.18] → [17.2488:2525]
BF:BF[17.2525] → [17.1967:1967]
[0.426]
[17.1967]
File move: nwg-bar.nix → nwg-bar.nix
BF:BFD[12.18] → [17.3343:3378]
BF:BF[17.3378] → [17.2527:2527]
[0.426]
[17.2527]
File move: nwg-bar.css → nwg-bar.css
BF:BFD[12.18] → [17.3974:4009]
BF:BF[17.4009] → [17.3380:3380]
[0.426]
[17.3380]
File move: keybindings.nix → keybindings.nix
BF:BFD[12.18] → [12.4523:4562]
BF:BF[12.4562] → [9.45:45]
[0.426]
[9.45]
File move: kanshi.nix → kanshi.nix
BF:BFD[12.18] → [2.1270:1304]
BF:BF[2.1304] → [2.29:29]
[0.426]
[2.29]
File addition: icons (d--x------)
[0.426]
File move: system-shutdown.svg → system-shutdown.svg
BF:BFD[13.5081] → [13.6987:7030]
BF:BF[13.7030] → [13.5100:5100]
[0.1134]
[13.5100]
File move: system-reboot.svg → system-reboot.svg
BF:BFD[13.5081] → [13.9811:9852]
BF:BF[13.9852] → [13.7032:7032]
[0.1134]
[13.7032]
File move: system-log-out.svg → system-log-out.svg
BF:BFD[13.5081] → [13.11756:11798]
BF:BF[13.11798] → [13.9854:9854]
[0.1134]
[13.9854]
File move: system-lock-screen.svg → system-lock-screen.svg
BF:BFD[13.5081] → [13.14190:14236]
BF:BF[13.14236] → [13.11800:11800]
[0.1134]
[13.11800]
File move: default.nix → default.nix
BF:BFD[12.18] → [12.8389:8424]
BF:BF[12.8424] → [12.6955:6955]
[0.426]
[12.6955]

Replacement in nixpkgs/shell/default.nix at line 4 [19.279]

B:BD[18.153] → [16.364:428]

  isLinux = (import <nixpkgs> { }).stdenv.hostPlatform.isLinux;

[18.153]

[18.216]

  isLinux = pkgs.stdenv.hostPlatform.isLinux;

Replacement in nixpkgs/shell/default.nix at line 20 [19.279]

B:BD[19.499] → [19.499:540]

    shellAliases = import ./aliases.nix;

[19.499]

[19.540]

    shellAliases = import ./aliases.nix { inherit pkgs; };

Insertion in nixpkgs/shell/aliases.nix at line 1 [20.2601]
[20.2601]
[21.49]
```
{ pkgs }:
```

Replacement in nixpkgs/shell/aliases.nix at line 3 [20.2601]

B:BD[21.53] → [16.591:655]

  isLinux = (import <nixpkgs> { }).stdenv.hostPlatform.isLinux;

[21.53]

[16.655]

  isLinux = pkgs.stdenv.hostPlatform.isLinux;

File addition: users (d--x------)
[22.73]

File addition: chris.nix (----------)

[0.1588]

{ pkgs, ... }:
let
  userName = "chris";
in
{
  users.users = {
    "${userName}" = {
      isNormalUser = true;
      extraGroups = [
        "networkmanager"
        "wheel"
      ];
      shell = pkgs.zsh;
    };
  };
}

File move: users.nix → chris-focus.nix
BF:BFD[22.73] → [23.952:985]
BF:BF[23.985] → [23.631:631]
[0.1588]
[23.631]

Deletion in nixpkgs/nixos/users/chris-focus.nix at line 10 [23.631]

B:BD[23.738] → [23.738:838]

    chris = {
      isNormalUser = true;
      extraGroups = groups;
      shell = pkgs.zsh;
    };

File deletion: configuration.nix, configuration.nix
BF:BFD[24.4964] → [24.4984:5025]
BF:BFD[24.5025] → [22.92:92]
BFD:BFD[22.73] → [22.4986:5027]
BF:BFD[22.5027] → [22.92:92]
∅:D[25.118] → [22.408:409]
B:BD[22.408] → [22.408:409]
B:BD[22.409] → [23.988:1058]
∅:D[23.1058] → [22.409:461]
B:BD[22.409] → [22.409:461]
∅:D[23.1225] → [22.496:504]
B:BD[22.496] → [22.496:504]
∅:D[23.1318] → [22.557:558]
B:BD[22.557] → [22.557:558]
∅:D[23.1368] → [22.1268:1417]
B:BD[22.1268] → [22.1268:1417]
B:BD[22.2388] → [22.2388:2389]
B:BD[22.4983] → [25.463:496]
B:BD[25.496] → [6.100:227]
∅:D[6.227] → [22.4983:4985]
∅:D[25.496] → [22.4983:4985]
B:BD[22.4983] → [22.4983:4985]
B:BD[22.558] → [23.1319:1368]
B:BD[22.504] → [23.1226:1318]
B:BD[22.461] → [23.1059:1143]
∅:D[4.117] → [23.1143:1225]
B:BD[23.1143] → [23.1143:1225]
B:BD[23.1143] → [4.100:117]
B:BD[22.385] → [25.90:118]
```
let
  primaryDisk = "/dev/sda2";
  computerName = "thelio-nixos";
in
{
  imports =
    [
      <nixos-hardware/system76>
    ];
  networking.interfaces.enp5s0.useDHCP = true;
  networking.interfaces.enp7s0f3u4u3u4.useDHCP = true;
  networking.interfaces.wlp6s0.useDHCP = true;
  system.stateVersion = "21.05";
  # system76 doesn't use fwupd / fwupdmgr, they have their own cli
  environment.systemPackages = [ pkgs.system76-firmware ];
}
  networking.wireless.interfaces = [ "wlp6s0" ];
  boot.initrd.luks.devices.root.device = primaryDisk;
  networking.hostName = computerName;
      /etc/nixos/hardware-configuration.nix
      ../common.nix
      ../greetd.nix
      ../networking.nix
      ../podman.nix
      ../sound.nix
      ../users.nix
      ../gtk.nix
{ config, pkgs, lib, ... }:
```

Replacement in nixpkgs/nixos/thelio/flake.nix at line 5 [7.1026]

B:BD[7.1087] → [7.1087:1141]

    nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11";

[7.1087]

[7.1141]

    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
    nixos-hardware.url = "github:nixos/nixos-hardware";
    emacs-overlay.url = "github:nix-community/emacs-overlay";
    home-manager = {
      url = "github:nix-community/home-manager";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    nix-doom-emacs = {
      url = "github:nix-community/nix-doom-emacs";
      inputs.nixpkgs.follows = "nixpkgs";
    };

Replacement in nixpkgs/nixos/thelio/flake.nix at line 20 [7.1026]

B:BD[7.1147] → [7.1147:1180]

  outputs = { self, nixpkgs }: {

[7.1147]

[7.1180]

  outputs =
    { self
    , nixpkgs
    , emacs-overlay
    , home-manager
    , nixos-hardware
    , nix-doom-emacs
    ,
    }@inputs: {

Replacement in nixpkgs/nixos/thelio/flake.nix at line 30 [7.1026]

B:BD[7.1181] → [7.1181:1487]

    nixosConfigurations."thelio-nixos" = nixpkgs.lib.nixosSystem {
      system = "x86_64-linux";
      modules = [
        ./hardware-configuration.nix
        ../common.nix
        ../greetd.nix
        ../gtk.nix
        ../networking.nix
        ../podman.nix
        ../sound.nix
        ../users.nix

[7.1181]

[7.1487]

      overlays = [ emacs-overlay ];

Replacement in nixpkgs/nixos/thelio/flake.nix at line 32 [7.1026]

B:BD[7.1488] → [7.1488:1624]

        ({ pkgs, ... }: {
          boot.initrd.luks.devices.root.device = "/dev/sda2";
          networking.hostName = "thelio-nixos";

[7.1488]

[7.1624]

      nixosConfigurations."thelio-nixos" = nixpkgs.lib.nixosSystem {
        system = "x86_64-linux";
        specialArgs = { inherit inputs; };
        modules = [
          ./hardware-configuration.nix
          nixos-hardware.nixosModules.system76
          ../common.nix
          ../greetd.nix
          ../gtk.nix
          ../networking.nix
          ../podman.nix
          ../sound.nix
          ../users/chris.nix

Replacement in nixpkgs/nixos/thelio/flake.nix at line 46 [7.1026]

B:BD[7.1625] → [7.1625:1855]

          networking.wireless.interfaces = [ "wlp6s0" ];
          networking.interfaces.enp5s0.useDHCP = true;
          networking.interfaces.enp7s0f3u4u3u4.useDHCP = true;
          networking.interfaces.wlp6s0.useDHCP = true;

[7.1625]

[7.1855]

          ({ pkgs, ... }: {
            boot.initrd.luks.devices.root.device = "/dev/sda2";
            networking.hostName = "thelio-nixos";

Replacement in nixpkgs/nixos/thelio/flake.nix at line 50 [7.1026]

B:BD[7.1856] → [7.1856:1998]

          # system76 doesn't use fwupd / fwupdmgr, they have their own cli
          environment.systemPackages = [ pkgs.system76-firmware ];

[7.1856]

[7.1998]

            networking.wireless.interfaces = [ "wlp6s0" ];
            networking.interfaces.enp5s0.useDHCP = true;
            networking.interfaces.enp7s0f3u4u3u4.useDHCP = true;
            networking.interfaces.wlp6s0.useDHCP = true;

Replacement in nixpkgs/nixos/thelio/flake.nix at line 55 [7.1026]

B:BD[7.1999] → [7.1999:2051]

          system.stateVersion = "21.05";
        })

[7.1999]

[7.2051]

            # system76 doesn't use fwupd / fwupdmgr, they have their own cli
            environment.systemPackages = [ pkgs.system76-firmware ];
            system.stateVersion = "21.05";
          })

Replacement in nixpkgs/nixos/thelio/flake.nix at line 62 [7.1026]

B:BD[7.2052] → [7.2052:2061]

];

[7.2052]

[7.2061]

          home-manager.nixosModules.home-manager
          {
            home-manager.useGlobalPkgs = true;
            home-manager.useUserPackages = true;
            home-manager.users.chris = { pkgs, ... }: {
              imports = [
                { nixpkgs.overlays = self.overlays; }
                ../../home.nix
                nix-doom-emacs.hmModule
              ];
            };
          }
        ];
      };

Deletion in nixpkgs/nixos/thelio/flake.nix at line 79 [7.1026]
B:BD[7.2068] → [7.2068:2074]
```
  };
```

Insertion in nixpkgs/nixos/thelio/flake.lock at line 3 [7.2112]

[7.2128]

    "doom-emacs": {
      "flake": false,
      "locked": {
        "lastModified": 1639786417,
        "narHash": "sha256-UgrbF/cNv2qJxK2jwrAsPdgeVTRrjCyU40xeMbyi1sI=",
        "owner": "hlissner",
        "repo": "doom-emacs",
        "rev": "af7c1d79bd63d78410aafc410d52ee5c1109ec26",
        "type": "github"
      },
      "original": {
        "owner": "hlissner",
        "ref": "develop",
        "repo": "doom-emacs",
        "type": "github"
      }
    },
    "doom-snippets": {
      "flake": false,
      "locked": {
        "lastModified": 1637750904,
        "narHash": "sha256-zkKmbl9rros3IzMTX01l9eh1Uzg3E+eYgzuj8+VPBwM=",
        "owner": "hlissner",
        "repo": "doom-snippets",
        "rev": "3083b2342f95fa55c1fd3b4a16229c5d867a02b0",
        "type": "github"
      },
      "original": {
        "owner": "hlissner",
        "repo": "doom-snippets",
        "type": "github"
      }
    },
    "emacs-overlay": {
      "locked": {
        "lastModified": 1640572408,
        "narHash": "sha256-bADuO+iCbpFbII3rSB66eg+rVsTbuBUSyMpG6dQoH44=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
        "rev": "1f591ff5ed96777035f5f438bb77224d9a1cdf5d",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
        "repo": "emacs-overlay",
        "type": "github"
      }
    },
    "emacs-overlay_2": {
      "flake": false,
      "locked": {
        "lastModified": 1640341393,
        "narHash": "sha256-E3gQLE5PjOhE/vVCI/VHl45LJIW0fMEKC7M3WSz89KE=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
        "rev": "085a34df847458952c13b29d94e12c0333828bbc",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
        "repo": "emacs-overlay",
        "type": "github"
      }
    },
    "emacs-so-long": {
      "flake": false,
      "locked": {
        "lastModified": 1575031854,
        "narHash": "sha256-xIa5zO0ZaToDrec1OFjBK6l39AbA4l/CE4LInVu2hi0=",
        "owner": "hlissner",
        "repo": "emacs-so-long",
        "rev": "ed666b0716f60e8988c455804de24b55919e71ca",
        "type": "github"
      },
      "original": {
        "owner": "hlissner",
        "repo": "emacs-so-long",
        "type": "github"
      }
    },
    "evil-markdown": {
      "flake": false,
      "locked": {
        "lastModified": 1626852210,
        "narHash": "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8=",
        "owner": "Somelauw",
        "repo": "evil-markdown",
        "rev": "8e6cc68af83914b2fa9fd3a3b8472573dbcef477",
        "type": "github"
      },
      "original": {
        "owner": "Somelauw",
        "repo": "evil-markdown",
        "type": "github"
      }
    },
    "evil-org-mode": {
      "flake": false,
      "locked": {
        "lastModified": 1607203864,
        "narHash": "sha256-JxwqVYDN6OIJEH15MVI6XOZAPtUWUhJQWHyzcrUvrFg=",
        "owner": "hlissner",
        "repo": "evil-org-mode",
        "rev": "a9706da260c45b98601bcd72b1d2c0a24a017700",
        "type": "github"
      },
      "original": {
        "owner": "hlissner",
        "repo": "evil-org-mode",
        "type": "github"
      }
    },
    "evil-quick-diff": {
      "flake": false,
      "locked": {
        "lastModified": 1575189609,
        "narHash": "sha256-oGzl1ayW9rIuq0haoiFS7RZsS8NFMdEA7K1BSozgnJU=",
        "owner": "rgrinberg",
        "repo": "evil-quick-diff",
        "rev": "69c883720b30a892c63bc89f49d4f0e8b8028908",
        "type": "github"
      },
      "original": {
        "owner": "rgrinberg",
        "repo": "evil-quick-diff",
        "type": "github"
      }
    },
    "explain-pause-mode": {
      "flake": false,
      "locked": {
        "lastModified": 1595842060,
        "narHash": "sha256-++znrjiDSx+cy4okFBBXUBkRFdtnE2x+trkmqjB3Njs=",
        "owner": "lastquestion",
        "repo": "explain-pause-mode",
        "rev": "2356c8c3639cbeeb9751744dbe737267849b4b51",
        "type": "github"
      },
      "original": {
        "owner": "lastquestion",
        "repo": "explain-pause-mode",
        "type": "github"
      }
    },
    "flake-utils": {
      "locked": {
        "lastModified": 1638122382,
        "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
        "owner": "numtide",
        "repo": "flake-utils",
        "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
        "type": "github"
      },
      "original": {
        "owner": "numtide",
        "repo": "flake-utils",
        "type": "github"
      }
    },
    "format-all": {
      "flake": false,
      "locked": {
        "lastModified": 1581716637,
        "narHash": "sha256-ul7LCe60W8TIvUmUtZtZRo8489TK9iTPDsLHmzxY57M=",
        "owner": "lassik",
        "repo": "emacs-format-all-the-code",
        "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3",
        "type": "github"
      },
      "original": {
        "owner": "lassik",
        "repo": "emacs-format-all-the-code",
        "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3",
        "type": "github"
      }
    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1640417317,
        "narHash": "sha256-jT2uMARXs0Xm65ccroFsKyr4LTHSecw+9HAnmBdJO8U=",
        "owner": "nix-community",
        "repo": "home-manager",
        "rev": "48f2b381dd397ec88040d3354ac9c036739ba139",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
        "repo": "home-manager",
        "type": "github"
      }
    },
    "nix-doom-emacs": {
      "inputs": {
        "doom-emacs": "doom-emacs",
        "doom-snippets": "doom-snippets",
        "emacs-overlay": "emacs-overlay_2",
        "emacs-so-long": "emacs-so-long",
        "evil-markdown": "evil-markdown",
        "evil-org-mode": "evil-org-mode",
        "evil-quick-diff": "evil-quick-diff",
        "explain-pause-mode": "explain-pause-mode",
        "flake-utils": "flake-utils",
        "format-all": "format-all",
        "nix-straight": "nix-straight",
        "nixpkgs": [
          "nixpkgs"
        ],
        "nose": "nose",
        "ob-racket": "ob-racket",
        "org": "org",
        "org-contrib": "org-contrib",
        "org-yt": "org-yt",
        "php-extras": "php-extras",
        "revealjs": "revealjs",
        "rotate-text": "rotate-text"
      },
      "locked": {
        "lastModified": 1640349307,
        "narHash": "sha256-/L/yUpqVig55T4tvThpuHQEZJTclsyFPHbP4xuCG0eE=",
        "owner": "nix-community",
        "repo": "nix-doom-emacs",
        "rev": "e29eb738085f88022eefb4ef959b48ba90c93d27",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
        "repo": "nix-doom-emacs",
        "type": "github"
      }
    },
    "nix-straight": {
      "flake": false,
      "locked": {
        "lastModified": 1639180741,
        "narHash": "sha256-3AaUE9Z/Sc5QxK8WtkPzU+9UqcOUaF9klaz8sV8DUu4=",
        "owner": "nix-community",
        "repo": "nix-straight.el",
        "rev": "866ef703fa96c970624d6d4ad33110a0708fcfef",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
        "repo": "nix-straight.el",
        "type": "github"
      }
    },
    "nixos-hardware": {
      "locked": {
        "lastModified": 1640513880,
        "narHash": "sha256-dIJYjqGFqCBNh3iasE+6EHG/W96I0YK6ayjfazOVuE8=",
        "owner": "nixos",
        "repo": "nixos-hardware",
        "rev": "2a76e1204f3a605f8d8d2f323671e1a295a5246d",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
        "repo": "nixos-hardware",
        "type": "github"
      }
    },

Replacement in nixpkgs/nixos/thelio/flake.lock at line 271 [7.2112]

B:BD[7.2163] → [7.2163:2273]

        "lastModified": 1640443850,
        "narHash": "sha256-s3EhD+iNjyIE/gZkV5vES6d0eI4dJ2WBlaXyUsEmaek=",

[7.2163]

[7.2273]

        "lastModified": 1640408860,
        "narHash": "sha256-h2uF3+a8bVfM8SjcS4hLbsOzOuG3qsxuImC0BucWs1Q=",

Replacement in nixpkgs/nixos/thelio/flake.lock at line 275 [7.2112]

B:BD[7.2326] → [7.2326:2385]

        "rev": "6979c0e49bb491e18dd4870abb104cc7375aa7e8",

[7.2326]

[7.2385]

        "rev": "cb372c3b8880e504b06946e8fb2ca9777c685505",

Replacement in nixpkgs/nixos/thelio/flake.lock at line 280 [7.2112]
B:BD[7.2465] → [7.2465:2495]
```
        "ref": "nixos-21.11",
```
[7.2465]
[7.2495]
```
        "ref": "nixos-unstable",
```

Insertion in nixpkgs/nixos/thelio/flake.lock at line 285 [7.2112]

[7.2562]

    "nose": {
      "flake": false,
      "locked": {
        "lastModified": 1400604510,
        "narHash": "sha256-daEi8Kta1oGaDEmUUDDQMahTTPOpvNpDKk22rlr7cB0=",
        "owner": "emacsattic",
        "repo": "nose",
        "rev": "f8528297519eba911696c4e68fa88892de9a7b72",
        "type": "github"
      },
      "original": {
        "owner": "emacsattic",
        "repo": "nose",
        "type": "github"
      }
    },
    "ob-racket": {
      "flake": false,
      "locked": {
        "lastModified": 1584656173,
        "narHash": "sha256-rBUYDDCXb+3D4xTPQo9UocbTPZ32kWV1Uya/1DmZknU=",
        "owner": "xchrishawk",
        "repo": "ob-racket",
        "rev": "83457ec9e1e96a29fd2086ed19432b9d75787673",
        "type": "github"
      },
      "original": {
        "owner": "xchrishawk",
        "repo": "ob-racket",
        "type": "github"
      }
    },
    "org": {
      "flake": false,
      "locked": {
        "lastModified": 1640085226,
        "narHash": "sha256-brwgjUsaANVNbxujNi4E+fAtps0SIYpZZUlA1s7Ve+g=",
        "owner": "emacs-straight",
        "repo": "org-mode",
        "rev": "be03334a7e5dae4f04b52a1cd1614024d5473ceb",
        "type": "github"
      },
      "original": {
        "owner": "emacs-straight",
        "repo": "org-mode",
        "type": "github"
      }
    },
    "org-contrib": {
      "flake": false,
      "locked": {
        "lastModified": 1639727892,
        "narHash": "sha256-+T6Y87aSAx7kMpigm8d1ODDQIyPBM6a+4qGolXjCEXs=",
        "ref": "master",
        "rev": "5766ff1088191e4df5fecd55007ba4271e609bcc",
        "revCount": 2611,
        "type": "git",
        "url": "https://git.sr.ht/~bzg/org-contrib"
      },
      "original": {
        "type": "git",
        "url": "https://git.sr.ht/~bzg/org-contrib"
      }
    },
    "org-yt": {
      "flake": false,
      "locked": {
        "lastModified": 1527381913,
        "narHash": "sha256-dzQ6B7ryzatHCTLyEnRSbWO0VUiX/FHYnpHTs74aVUs=",
        "owner": "TobiasZawada",
        "repo": "org-yt",
        "rev": "40cc1ac76d741055cbefa13860d9f070a7ade001",
        "type": "github"
      },
      "original": {
        "owner": "TobiasZawada",
        "repo": "org-yt",
        "type": "github"
      }
    },
    "php-extras": {
      "flake": false,
      "locked": {
        "lastModified": 1573312690,
        "narHash": "sha256-r4WyVbzvT0ra4Z6JywNBOw5RxOEYd6Qe2IpebHXkj1U=",
        "owner": "arnested",
        "repo": "php-extras",
        "rev": "d410c5af663c30c01d461ac476d1cbfbacb49367",
        "type": "github"
      },
      "original": {
        "owner": "arnested",
        "repo": "php-extras",
        "type": "github"
      }
    },
    "revealjs": {
      "flake": false,
      "locked": {
        "lastModified": 1640009311,
        "narHash": "sha256-RXVvHPKA7vkBzzTRGH2LgL5ywvlcBG1wWRdmwoUtewc=",
        "owner": "hakimel",
        "repo": "reveal.js",
        "rev": "38b32c66199a29cf21f60f920c30a4ead150c654",
        "type": "github"
      },
      "original": {
        "owner": "hakimel",
        "repo": "reveal.js",
        "type": "github"
      }
    },

Insertion in nixpkgs/nixos/thelio/flake.lock at line 399 [7.2112]

[7.2594]

        "emacs-overlay": "emacs-overlay",
        "home-manager": "home-manager",
        "nix-doom-emacs": "nix-doom-emacs",
        "nixos-hardware": "nixos-hardware",

Insertion in nixpkgs/nixos/thelio/flake.lock at line 405 [7.2112]

[7.2631]

    },
    "rotate-text": {
      "flake": false,
      "locked": {
        "lastModified": 1322962747,
        "narHash": "sha256-SOeOgSlcEIsKhUiYDJv0p+mLUb420s9E2BmvZQvZ0wk=",
        "owner": "debug-ito",
        "repo": "rotate-text.el",
        "rev": "48f193697db996855aee1ad2bc99b38c6646fe76",
        "type": "github"
      },
      "original": {
        "owner": "debug-ito",
        "repo": "rotate-text.el",
        "type": "github"
      }

Insertion in nixpkgs/nixos/common.nix at line 11 [23.4276]
[5.281]
[23.4361]
```
  nixpkgs.config.allowUnfree = true;
```

File addition: default.nix (----------)

[8.2383]

{ config, pkgs, ... }:
let
  userName = "chris";
  # on macos this is /Users/<username>
  homeDirectory = "/home/${userName}";
in
{
  ###
  ### Tell home-manager the basics
  ###
  config.home.username = userName;
  config.home.homeDirectory = homeDirectory;
  ###
  ### Choose which modules to install on this system
  ###
  imports = [
    ../emacs
    # ../email
    ../firefox
    ../git
    ../guiapps
    ../linux_desktop
    ../neovim
    ../personal_scripts
    ../python
    ../shell
    ../sway
    ../terminal_emulator
    ../tmux
  ];
  ###
  ### Setup the git personal info relevant for this system
  ###
  config.programs.git = {
    userName = "Chris Cummings";
    userEmail = "chris@thesogu.com";
  };
  # local machine specific sway config
  # NOTE swaymsg -t get_outputs
  config.wayland.windowManager.sway.config = {
    output = {
      "*" = { bg = "${homeDirectory}/wallpapers/1.jpg fill"; };
    };
    startup = [ ];
  };
  ###
  ### Enable specific email accounts
  ###
  config.accounts.email.accounts = {
    # add a new email account by adding a nix module, then adding it to the .gitignore
    # or ignore privately
    # see example-email.nix for an example
    # e.g.:
    # example = import ../email/example-email.nix;
    # personal = import ../email/personal.nix
  };
  ####
  #### extra options to consider
  ####
  # if on a machine using aws cli you probably want to set this
  # to the profile you use most often
  config.programs.zsh.sessionVariables = {
    # SOME_VAR = "holy crap it worked?";
  };
  # if on pop-os you probably want to add these
  # make sure all of the distro's default XDG_DATA_DIRS values are in here
  # most of these should be set in linux_desktop/default.nix
  config.xdg.systemDirs.data = [
    # "/var/lib/flatpak/exports/share"
  ];
}

Replacement in nixpkgs/linux_desktop/default.nix at line 1 [26.596]
B:BD[26.596] → [15.228:265]
B:BD[15.265] → [11.441:484]
```
{ config, pgks, isNixOS, ... }:
let
  isNixOS = (import ../utils { }).isNixOS;
```
[26.596]
[26.620]
```
{ config, pkgs, ... }:
```
Deletion in nixpkgs/linux_desktop/default.nix at line 3 [26.596]
B:BD[26.621] → [15.308:311]
```
in
```
Replacement in nixpkgs/linux_desktop/default.nix at line 23 [26.596]
B:BD[26.1134] → [15.347:396]
```
  config.targets.genericLinux.enable = !isNixOS;
```
[26.1134]
[26.1225]
```
  config.targets.genericLinux.enable = false;
```
Replacement in nixpkgs/home.nix at line 1 [20.418]
B:BD[20.418] → [19.1834:1857]
```
{ config, pkgs, ... }:
```
[20.418]
[20.447]
```
{ pkgs, ... }:
```

File deletion: doom.nix

BF:BFD[8.4641] → [27.919:951]

BF:BFD[27.951] → [27.73:73]

B:BD[27.73] → [27.74:85]

∅:D[28.144] → [29.251:360]

∅:D[30.358] → [29.251:360]

B:BD[27.102] → [29.251:360]

∅:D[3.532] → [29.360:772]

B:BD[29.360] → [29.360:772]

∅:D[30.410] → [29.999:1001]

∅:D[28.433] → [29.999:1001]

B:BD[29.999] → [29.999:1001]

B:BD[29.772] → [30.359:410]

B:BD[29.360] → [3.129:532]

B:BD[27.85] → [28.74:124]

B:BD[28.124] → [30.74:358]

{ pkgs }:
  (builtins.fetchTarball {
    url = "https://github.com/vlaci/nix-doom-emacs/archive/master.tar.gz";
  })
{
  doomPrivateDir = ./doom.d;
  extraConfig = ''
    (setq
        mu4e-mu-binary "${pkgs.mu}/bin/mu"
        sendmail-program "${pkgs.msmtp}/bin/msmtp"
        message-sendmail-f-is-evil t
        message-sendmail-extra-arguments '("--read-envelope-from")
        message-send-mail-function 'message-send-mail-with-sendmail)
  '';
  extraPackages = epkgs: [ pkgs.emacs-all-the-icons-fonts pkgs.mu epkgs.vterm ];
}
  emacsPackages = pkgs.emacsPackagesFor pkg-emacs;
  dependencyOverrides = {
    "emacs-overlay" = (builtins.fetchTarball {
      url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
    });
  };
  emacsPackagesOverlay = self: super: {
    # https://github.com/vlaci/nix-doom-emacs/issues/394
    # package was renamed 😎
    gitignore-mode = pkgs.emacsPackages.git-modes;
    gitconfig-mode = pkgs.emacsPackages.git-modes;
  };
let
  isLinux = pkgs.stdenv.hostPlatform.isLinux;
  # NOTE: won't need to overrideAttrs on emacsMacport once the below PR is released
  # https://github.com/NixOS/nixpkgs/pull/133260/
  pkg-emacs = if isLinux then pkgs.emacs else
  pkgs.emacsMacport.overrideAttrs (old: {
    passthru = old.passthru or { };
  });
in
pkgs.callPackage

Deletion in nixpkgs/emacs/doom.d/packages.el at line 42 [31.525]
B:BD[31.2309] → [32.144:217]
```
; (package! format-all :pin  "caa0269ce89789a702823041ca7b309ddaffb5ce")
```
Replacement in nixpkgs/emacs/doom.d/init.el at line 50 [18.2338]
B:BD[18.3571] → [18.3571:3597]
```
       ; (format +onsave)
```
[18.3571]
[18.3597]
```
       (format +onsave)
```
Deletion in nixpkgs/emacs/default.nix at line 5 [31.12973]
B:BD[27.1027] → [29.1007:1054]
B:BD[29.1054] → [30.1108:1109]
```
  doom = (import ./doom.nix { pkgs = pkgs; });
```
Deletion in nixpkgs/emacs/default.nix at line 32 [31.12973]
B:BD[30.1527] → [30.1527:1528]
B:BD[30.1528] → [33.160:204]
∅:D[33.204] → [30.1556:1686]
B:BD[30.1556] → [30.1556:1686]
B:BD[30.1686] → [11.504:518]
```
  pkgs-linux = with pkgs; if isLinux then [
    # these are needed to support doom :tool everywhere (emacs-everywhere)
    xclip
    xdotool
    xorg.xprop
    xorg.xwininfo
  ] else [ ];
```

Replacement in nixpkgs/emacs/default.nix at line 35 [31.12973]

B:BD[30.1693] → [30.1693:1813]

  config.home.packages = [ doom ] ++ pkgs-markdownMode ++ pkgs-pythonMode ++ pkgs-shellMode ++ pkgs-misc ++ pkgs-linux;

[30.1693]

[30.1813]

  config.home.packages = pkgs-markdownMode ++ pkgs-pythonMode ++ pkgs-shellMode ++ pkgs-misc;

Replacement in nixpkgs/emacs/default.nix at line 37 [31.12973]

∅:D[30.1814] → [27.1125:1173]

B:BD[31.13394] → [27.1125:1173]

∅:D[27.1173] → [31.13435:13465]

B:BD[31.13435] → [31.13435:13465]

  config.home.file.".emacs.d/init.el".text = ''
    (load "default.el")
  '';

[30.1814]

[34.79]

  config.programs.doom-emacs = {
    enable = true;
    doomPrivateDir = ./doom.d;
    extraConfig = ''
      (setq
          mu4e-mu-binary "${pkgs.mu}/bin/mu"
          sendmail-program "${pkgs.msmtp}/bin/msmtp"
          message-sendmail-f-is-evil t
          message-sendmail-extra-arguments '("--read-envelope-from")
          message-send-mail-function 'message-send-mail-with-sendmail)
    '';
    extraPackages = [ pkgs.emacs-all-the-icons-fonts pkgs.mu ];
  };

Replacement in nixpkgs/emacs/default.nix at line 52 [31.12973]
B:BD[27.1232] → [29.1061:1161]
B:BD[29.1161] → [30.1815:1845]
∅:D[30.1845] → [29.1188:1204]
B:BD[29.1188] → [29.1188:1204]
∅:D[29.1204] → [34.151:152]
∅:D[27.1362] → [34.151:152]
B:BD[34.151] → [34.151:152]
```
  config.services =
    if isLinux then {
      emacs.enable = isLinux;
      emacs.package = doom;
      lorri.enable = isLinux;
    } else { };
```
[27.1232]
[31.13465]
```
  config.services.emacs.enable = isLinux;
  config.services.lorri.enable = isLinux;
```
Deletion in .gitignore at line 17 [36.44]
B:BD[35.166] → [18.5369:5423]
B:BD[18.5423] → [37.202:232]
```
/stowed/nixpkgs/.config/nixpkgs/localhome/default.nix
nixpkgs/localhome/default.nix
```

flake-ify home-manager config and mk nixos module

Dependencies

In channels

Change contents

File deletion: window_manager

File deletion: default.nix

File deletion: sway

File deletion: icons

Replacement in nixpkgs/utils/default.nix at line 1 [14.2127]

Replacement in nixpkgs/utils/default.nix at line 4 [14.2127]

Replacement in nixpkgs/utils/default.nix at line 8 [14.2127]

Replacement in nixpkgs/utils/default.nix at line 17 [14.2127]

Replacement in nixpkgs/utils/default.nix at line 20 [14.2127]

Replacement in nixpkgs/utils/default.nix at line 22 [14.2127]

File deletion: alacritty.nix

Replacement in nixpkgs/terminal_emulator/default.nix at line 3 [9.1011]

File addition: sway (d--x------)

File move: waybar_style.css → waybar_style.css

File move: waybar.nix → waybar.nix

File move: tmp_nwg-drawer.nix → tmp_nwg-drawer.nix

File move: swaylock.config → swaylock.config

File move: screenshots.nix → screenshots.nix

File move: playerctl.sh → playerctl.sh

Replacement in nixpkgs/sway/playerctl.sh at line 1 [12.4139]

Replacement in nixpkgs/sway/playerctl.sh at line 5 [12.4139]

Replacement in nixpkgs/sway/playerctl.sh at line 8 [12.4139]

Replacement in nixpkgs/sway/playerctl.sh at line 11 [12.4139]

File move: nwg-panel.css → nwg-panel.css

File move: nwg-bar.nix → nwg-bar.nix

File move: nwg-bar.css → nwg-bar.css

File move: keybindings.nix → keybindings.nix

File move: kanshi.nix → kanshi.nix

File addition: icons (d--x------)

File move: system-shutdown.svg → system-shutdown.svg

File move: system-reboot.svg → system-reboot.svg

File move: system-log-out.svg → system-log-out.svg

File move: system-lock-screen.svg → system-lock-screen.svg

File move: default.nix → default.nix

Replacement in nixpkgs/shell/default.nix at line 4 [19.279]

Replacement in nixpkgs/shell/default.nix at line 20 [19.279]

Insertion in nixpkgs/shell/aliases.nix at line 1 [20.2601]

Replacement in nixpkgs/shell/aliases.nix at line 3 [20.2601]

File addition: users (d--x------)

File addition: chris.nix (----------)

File move: users.nix → chris-focus.nix

Deletion in nixpkgs/nixos/users/chris-focus.nix at line 10 [23.631]

File deletion: configuration.nix, configuration.nix

Replacement in nixpkgs/nixos/thelio/flake.nix at line 5 [7.1026]

Replacement in nixpkgs/nixos/thelio/flake.nix at line 20 [7.1026]

Replacement in nixpkgs/nixos/thelio/flake.nix at line 30 [7.1026]

Replacement in nixpkgs/nixos/thelio/flake.nix at line 32 [7.1026]

Replacement in nixpkgs/nixos/thelio/flake.nix at line 46 [7.1026]

Replacement in nixpkgs/nixos/thelio/flake.nix at line 50 [7.1026]

Replacement in nixpkgs/nixos/thelio/flake.nix at line 55 [7.1026]

Replacement in nixpkgs/nixos/thelio/flake.nix at line 62 [7.1026]

Deletion in nixpkgs/nixos/thelio/flake.nix at line 79 [7.1026]

Insertion in nixpkgs/nixos/thelio/flake.lock at line 3 [7.2112]

Replacement in nixpkgs/nixos/thelio/flake.lock at line 271 [7.2112]

Replacement in nixpkgs/nixos/thelio/flake.lock at line 275 [7.2112]

Replacement in nixpkgs/nixos/thelio/flake.lock at line 280 [7.2112]

Insertion in nixpkgs/nixos/thelio/flake.lock at line 285 [7.2112]

Insertion in nixpkgs/nixos/thelio/flake.lock at line 399 [7.2112]

Insertion in nixpkgs/nixos/thelio/flake.lock at line 405 [7.2112]

Insertion in nixpkgs/nixos/common.nix at line 11 [23.4276]

File addition: default.nix (----------)

Replacement in nixpkgs/linux_desktop/default.nix at line 1 [26.596]

Deletion in nixpkgs/linux_desktop/default.nix at line 3 [26.596]

Replacement in nixpkgs/linux_desktop/default.nix at line 23 [26.596]

Replacement in nixpkgs/home.nix at line 1 [20.418]

File deletion: doom.nix

Deletion in nixpkgs/emacs/doom.d/packages.el at line 42 [31.525]

Replacement in nixpkgs/emacs/doom.d/init.el at line 50 [18.2338]

Deletion in nixpkgs/emacs/default.nix at line 5 [31.12973]

Deletion in nixpkgs/emacs/default.nix at line 32 [31.12973]

Replacement in nixpkgs/emacs/default.nix at line 35 [31.12973]

Replacement in nixpkgs/emacs/default.nix at line 37 [31.12973]

Replacement in nixpkgs/emacs/default.nix at line 52 [31.12973]

Deletion in .gitignore at line 17 [36.44]