summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Aristote <quentin@aristote.fr>2023-03-01 19:02:23 +0100
committerQuentin Aristote <quentin@aristote.fr>2023-03-01 19:02:23 +0100
commit34d85aa7559d1bd96db863668820404fd0a5d2d1 (patch)
tree0eea9d5f9f4830bac0efb9bee9d4a45f78b063b0
parentd954e4cc44a17c301d3d41dc02428e58d1d58cc9 (diff)
parent20825c9ec1dee69791d252ac3709cfc5c850045b (diff)
Merge branch 'master' into local
-rw-r--r--flake.lock150
-rw-r--r--flake.nix5
-rw-r--r--nixos/gui.nix1
-rw-r--r--nixos/nix.nix5
4 files changed, 7 insertions, 154 deletions
diff --git a/flake.lock b/flake.lock
deleted file mode 100644
index bea162f..0000000
--- a/flake.lock
+++ /dev/null
@@ -1,150 +0,0 @@
-{
- "nodes": {
- "flake-utils": {
- "locked": {
- "lastModified": 1676283394,
- "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
- "type": "github"
- },
- "original": {
- "id": "flake-utils",
- "type": "indirect"
- }
- },
- "home-manager": {
- "inputs": {
- "nixpkgs": "nixpkgs",
- "utils": "utils"
- },
- "locked": {
- "lastModified": 1677621055,
- "narHash": "sha256-n3D/pZX0cYEpWKcLJSFImo5Dpk3D1RrxKVDmI6lnaIg=",
- "owner": "nix-community",
- "repo": "home-manager",
- "rev": "ef7d316578367ed7732a21eede6c79546a36124f",
- "type": "github"
- },
- "original": {
- "id": "home-manager",
- "type": "indirect"
- }
- },
- "my-nixpkgs": {
- "inputs": {
- "flake-utils": "flake-utils",
- "nixpkgs": "nixpkgs_2",
- "nur": "nur"
- },
- "locked": {
- "lastModified": 1677675864,
- "narHash": "sha256-U1clIpa9CnhMMUZCVesoo25Sb33dksYO+qAmBxmWWzg=",
- "type": "git",
- "url": "file:///home/qaristote/code/nix/my-nixpkgs"
- },
- "original": {
- "type": "git",
- "url": "file:///home/qaristote/code/nix/my-nixpkgs"
- }
- },
- "nixos-hardware": {
- "locked": {
- "lastModified": 1677591639,
- "narHash": "sha256-DMlAyge+u3K+JOFLA5YfdjqagdAYJf29YGBWpy5izg4=",
- "owner": "NixOS",
- "repo": "nixos-hardware",
- "rev": "77de4cd09db4dbee9551ed2853cfcf113d7dc5ce",
- "type": "github"
- },
- "original": {
- "id": "nixos-hardware",
- "type": "indirect"
- }
- },
- "nixpkgs": {
- "locked": {
- "lastModified": 1675115703,
- "narHash": "sha256-4zetAPSyY0D77x+Ww9QBe8RHn1akvIvHJ/kgg8kGDbk=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "2caf4ef5005ecc68141ecb4aac271079f7371c44",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_2": {
- "locked": {
- "lastModified": 1677560409,
- "narHash": "sha256-PIvUIsVNozPXe1FmNe9c6B8Febl3t9+51uBKMJ1Q8o0=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "9e56d6ec92c8fb4192f1392aa5c4101ad77f2070",
- "type": "github"
- },
- "original": {
- "id": "nixpkgs",
- "type": "indirect"
- }
- },
- "nixpkgs_3": {
- "locked": {
- "lastModified": 1677560409,
- "narHash": "sha256-PIvUIsVNozPXe1FmNe9c6B8Febl3t9+51uBKMJ1Q8o0=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "9e56d6ec92c8fb4192f1392aa5c4101ad77f2070",
- "type": "github"
- },
- "original": {
- "id": "nixpkgs",
- "type": "indirect"
- }
- },
- "nur": {
- "locked": {
- "lastModified": 1677656154,
- "narHash": "sha256-C+LNfSAlWyRVNiwBoYodxnrVzDymA5dR36dg1epXAk4=",
- "owner": "nix-community",
- "repo": "NUR",
- "rev": "458246a5098156e4d8be62de85a03feec6a2e4fe",
- "type": "github"
- },
- "original": {
- "id": "nur",
- "type": "indirect"
- }
- },
- "root": {
- "inputs": {
- "home-manager": "home-manager",
- "my-nixpkgs": "my-nixpkgs",
- "nixos-hardware": "nixos-hardware",
- "nixpkgs": "nixpkgs_3"
- }
- },
- "utils": {
- "locked": {
- "lastModified": 1667395993,
- "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- }
- },
- "root": "root",
- "version": 7
-}
diff --git a/flake.nix b/flake.nix
index 9b97a1a..00d2c30 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,9 +1,10 @@
{
inputs = {
my-nixpkgs.url = "git+file:///home/qaristote/code/nix/my-nixpkgs";
+ stylix.url = "github:danth/stylix";
};
- outputs = { self, nixpkgs, my-nixpkgs, nixos-hardware, home-manager }:
+ outputs = { self, nixpkgs, my-nixpkgs, nixos-hardware, home-manager, stylix }:
let
system = "x86_64-linux";
overlays-module = { ... }: {
@@ -15,7 +16,7 @@
in {
nixosConfigurations.latitude-7490 = nixpkgs.lib.nixosSystem {
inherit system;
- specialArgs = { inherit nixos-hardware home-manager homeModules; };
+ specialArgs = { inherit nixos-hardware home-manager homeModules stylix; };
modules = nixosModules;
};
diff --git a/nixos/gui.nix b/nixos/gui.nix
index 7c76a43..0342747 100644
--- a/nixos/gui.nix
+++ b/nixos/gui.nix
@@ -6,6 +6,7 @@ in {
enable = true;
xserver.enable = true;
i3.enable = true;
+ stylix.enable = true;
};
services.xserver = {
diff --git a/nixos/nix.nix b/nixos/nix.nix
index 27198ac..0f17fcb 100644
--- a/nixos/nix.nix
+++ b/nixos/nix.nix
@@ -9,10 +9,11 @@
};
system.autoUpgrade.flags = pkgs.personal.lib.updateInputFlags [
- "latitude-7490/nixpkgs"
"latitude-7490/home-manager"
- "latitude-7490/nixos-hardware"
"latitude-7490/my-nixpkgs"
+ "latitude-7490/nixos-hardware"
+ "latitude-7490/nixpkgs"
+ "lattitude-7490/stylix"
];
# make auto-upgrade service lightweight