averageatchris/nixos-configs - Change TPEUU3M4SFBXCX6UNFLJBGAVWH5AW2XRRVGV3R5LRC6KUXJ6WT5AC

move xps to flake

Created by Chris Cummings on December 30, 2021

TPEUU3M4SFBXCX6UNFLJBGAVWH5AW2XRRVGV3R5LRC6KUXJ6WT5AC

Dependencies

In channels

main

Change contents

File deletion: configuration.nix
BF:BFD[5.90] → [5.4921:4962]
BF:BFD[5.4962] → [5.1187:1187]
∅:D[6.316] → [5.1479:1480]
B:BD[5.1479] → [5.1479:1480]
∅:D[6.385] → [5.1508:1509]
B:BD[5.1508] → [5.1508:1509]
∅:D[6.389] → [5.1509:1569]
B:BD[5.1509] → [5.1509:1569]
∅:D[6.536] → [5.1604:1611]
B:BD[5.1604] → [5.1604:1611]
B:BD[5.1909] → [5.1909:1910]
∅:D[6.629] → [5.2163:2164]
B:BD[5.2163] → [5.2163:2164]
B:BD[7.452] → [8.92:144]
B:BD[5.2608] → [5.2608:2658]
∅:D[2.267] → [5.2658:2659]
B:BD[5.2658] → [5.2658:2659]
B:BD[5.4885] → [5.4885:4920]
B:BD[5.2658] → [2.128:267]
B:BD[5.1910] → [6.537:629]
∅:D[2.127] → [6.434:474]
B:BD[6.434] → [6.434:474]
∅:D[3.109] → [6.474:498]
B:BD[6.474] → [6.474:498]
∅:D[4.112] → [6.498:536]
B:BD[6.498] → [6.498:536]
B:BD[6.498] → [4.92:112]
B:BD[6.474] → [3.92:109]
B:BD[5.1569] → [2.92:127]
B:BD[5.1509] → [6.386:389]
B:BD[5.1480] → [6.317:385]
B:BD[5.1187] → [6.288:316]
```
{
  imports =
    [
      <nixos-hardware/dell/xps/13-9310>
    ];
  networking.wireless.interfaces = [ "wlp0s20f3" ];
  networking.interfaces.wlp0s20f3.useDHCP = true;
  system.stateVersion = "21.05";
}
  # these opengl is needed for sway to work right on intel graphics
  hardware.opengl.enable = true;
  hardware.opengl.driSupport = true;
  boot.initrd.luks.devices.root.device = primaryDisk;
  networking.hostName = computerName;
      ../common.nix
      ../greetd.nix
      ../networking.nix
      ../sound.nix
      ../users.nix
      ../podman.nix
      ../gtk.nix
      ./hardware-configuration.nix
in
let
  primaryDisk = "/dev/nvme0n1p2";
  computerName = "xps-nixos";
{ config, pkgs, lib, ... }:
```

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

[5.90]

{
  description = "My XPS desktop config";
  inputs = {
    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
    nixos-hardware.url = "github:nixos/nixos-hardware";
    emacs-overlay = {
      url = "github:nix-community/emacs-overlay";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    wayland-overlay = {
      url = "github:nix-community/nixpkgs-wayland";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    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";
    };
  };
  outputs =
    { self
    , nixpkgs
    , emacs-overlay
    , home-manager
    , nixos-hardware
    , nix-doom-emacs
    , wayland-overlay
    }@inputs: rec {
      system = "x86_64-linux";
      overlays = [ emacs-overlay.overlay wayland-overlay.overlay ];
      nixosConfigurations."xps-nixos" = nixpkgs.lib.nixosSystem {
        inherit system;
        specialArgs = { inherit inputs overlays; };
        modules = [
          ./hardware-configuration.nix
          nixos-hardware.nixosModules.dell-xps-13-9310
          ../common.nix
          ../greetd.nix
          ../networking.nix
          ../podman.nix
          ../sound.nix
          ../users/chris.nix
          ({ pkgs, ... }: {
            boot.initrd.luks.devices.root.device = "/dev/nvme0n1p2";
            networking.hostName = "xps-nixos";
            networking.wireless.interfaces = [ "wlp0s20f3" ];
            networking.interfaces.wlp6s0.useDHCP = true;
            # these opengl is needed for sway to work right on intel graphics
            hardware.opengl.enable = true;
            hardware.opengl.driSupport = true;
            system.stateVersion = "21.05";
          })
          home-manager.nixosModules.home-manager
          {
            home-manager.useGlobalPkgs = true;
            home-manager.useUserPackages = true;
          }
        ];
      };
    };
}

File addition: flake.lock (----------)

[5.90]

{
  "nodes": {
    "cachix": {
      "locked": {
        "lastModified": 1640169700,
        "narHash": "sha256-Y+WR7cpiUTroEtoGR8Q3KMbFARvOiACLLmNQ+/iEz2E=",
        "owner": "nixos",
        "repo": "nixpkgs",
        "rev": "3f0e4de0c2d2c85d7abce260f8c17c8ef5b78e5b",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
        "ref": "nixos-21.05",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "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": 1640834398,
        "narHash": "sha256-ZeydQdZNachSCO1Jq56qlz5zb/bwi+4dVQRHU2/tzbQ=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
        "rev": "8fbdbd2f0d3b05ebeeba8441a5785abc6bb37ab2",
        "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": 1640770690,
        "narHash": "sha256-Rl2cD8yspug7sPRXXJkVvmjLFS8i9g04iNDzohMEuyg=",
        "owner": "nix-community",
        "repo": "home-manager",
        "rev": "2f40cd05dc0ffe3ba69a94e9e76e0357c5b9a0b8",
        "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": 1640655392,
        "narHash": "sha256-yEQHA0/Po54sGz+72npsKXzQrTte+79H5yJy2obaafg=",
        "owner": "nix-community",
        "repo": "nix-doom-emacs",
        "rev": "3209f69db760959331e2f8201de17758fbe08015",
        "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": 1640686209,
        "narHash": "sha256-6glXUlKRDhEhNuYx6r3fXU6KH2/Vq9mJZjB9oUpwrmc=",
        "owner": "nixos",
        "repo": "nixos-hardware",
        "rev": "46df95ca81e7e4cf3458cdb4b7d1714b5fce9da5",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
        "repo": "nixos-hardware",
        "type": "github"
      }
    },
    "nixpkgs": {
      "locked": {
        "lastModified": 1640540585,
        "narHash": "sha256-cCmknKFjWgam9jq+58wSd0Z4REia8mjBP65kXcL3ki8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
        "rev": "ac169ec6371f0d835542db654a65e0f2feb07838",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "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"
      }
    },
    "root": {
      "inputs": {
        "emacs-overlay": "emacs-overlay",
        "home-manager": "home-manager",
        "nix-doom-emacs": "nix-doom-emacs",
        "nixos-hardware": "nixos-hardware",
        "nixpkgs": "nixpkgs",
        "wayland-overlay": "wayland-overlay"
      }
    },
    "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"
      }
    },
    "wayland-overlay": {
      "inputs": {
        "cachix": "cachix",
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1640387278,
        "narHash": "sha256-8bLZfs9aOHWR12HaUYz+4IC0zPo8SnqntDVN6Bb0XcM=",
        "owner": "nix-community",
        "repo": "nixpkgs-wayland",
        "rev": "1ffd1e219ef9ef8fa70fe4d0ce4b385ef48ba633",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
        "repo": "nixpkgs-wayland",
        "type": "github"
      }
    }
  },
  "root": "root",
  "version": 7
}

move xps to flake

Dependencies

In channels

Change contents

File deletion: configuration.nix

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

File addition: flake.lock (----------)