Update to the latest nixpkgs
diff --git a/flake.lock b/flake.lock
index c4d1fe8..c50dbfa 100644
--- a/flake.lock
+++ b/flake.lock
@@ -12,11 +12,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
- "lastModified": 1677127644,
- "narHash": "sha256-uDvWTDn08GYBa5/m7xglsj8sA89/wXg5+tHX+a6YLP0=",
+ "lastModified": 1680584903,
+ "narHash": "sha256-uraq+D3jcLzw/UVk0xMHcnfILfIMa0DLrtAEq2nNlxU=",
"owner": "ipetkov",
"repo": "crane",
- "rev": "ba201b5632834cf757f00ea4c158b102fbad4271",
+ "rev": "65d3f6a3970cd46bef5eedfd458300f72c56b3c5",
"type": "github"
},
"original": {
@@ -33,11 +33,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
- "lastModified": 1674541370,
- "narHash": "sha256-L62dKDX6fIUQhlna9R8PKSAEGZ7ueU5gRGxZzZs/Zx8=",
+ "lastModified": 1680762089,
+ "narHash": "sha256-62lgi+xb+nn9H4O+ZIYNkHeQ8ryzstALKMJuoXiot0I=",
"owner": "nix-community",
"repo": "fenix",
- "rev": "4435f8e9da13581e51ba1f92a25d7d54c776ad94",
+ "rev": "5794e58068fb6a8eccad9e4ff77ffe1c08ded13c",
"type": "github"
},
"original": {
@@ -65,11 +65,11 @@
"flake-compat_2": {
"flake": false,
"locked": {
- "lastModified": 1668681692,
- "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
+ "lastModified": 1673956053,
+ "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
- "rev": "009399224d5e398d03b22badca40a37ac85412a1",
+ "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
@@ -81,11 +81,11 @@
"flake-compat_3": {
"flake": false,
"locked": {
- "lastModified": 1668681692,
- "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
+ "lastModified": 1673956053,
+ "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
- "rev": "009399224d5e398d03b22badca40a37ac85412a1",
+ "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
@@ -99,11 +99,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
- "lastModified": 1673047662,
- "narHash": "sha256-dXYxH/0Ea5oQSkGAWWNy7HzmFutguycDGn2dt6lTYRQ=",
+ "lastModified": 1678379998,
+ "narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "aa1f6ca773b6e740037ebfb35f7010e0c3960638",
+ "rev": "c13d60b89adea3dc20704c045ec4d50dd964d447",
"type": "github"
},
"original": {
@@ -114,11 +114,11 @@
},
"flake-utils": {
"locked": {
- "lastModified": 1676283394,
- "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
+ "lastModified": 1678901627,
+ "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+ "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"type": "github"
},
"original": {
@@ -165,11 +165,11 @@
"fzf-tab": {
"flake": false,
"locked": {
- "lastModified": 1675951080,
- "narHash": "sha256-yN1qmuwWNkWHF9ujxZq2MiroeASh+KQiCLyK5ellnB8=",
+ "lastModified": 1679190553,
+ "narHash": "sha256-dPe5CLCAuuuLGRdRCt/nNruxMrP9f/oddRxERkgm1FE=",
"owner": "Aloxaf",
"repo": "fzf-tab",
- "rev": "69024c27738138d6767ea7246841fdfc6ce0d0eb",
+ "rev": "5a81e13792a1eed4a03d2083771ee6e5b616b9ab",
"type": "github"
},
"original": {
@@ -203,11 +203,11 @@
"gtimelog": {
"flake": false,
"locked": {
- "lastModified": 1658868134,
- "narHash": "sha256-KR0pt2naL/1GWiTLQQPalfhrzj9rctjEA7BwARmfxDE=",
+ "lastModified": 1680709427,
+ "narHash": "sha256-sHXrDN8fRtcSJRUmw157LTxdEAU+zeRUnqWV/CByHFw=",
"ref": "refs/heads/master",
- "rev": "80112a7de035db3fced89be242a1878a9936e12f",
- "revCount": 460,
+ "rev": "4bb8e72206ccc4962a72a039f4f136e0fcf8c12e",
+ "revCount": 463,
"type": "git",
"url": "https://gitlab.collabora.com/collabora/gtimelog.git"
},
@@ -224,11 +224,11 @@
"utils": "utils"
},
"locked": {
- "lastModified": 1677104801,
- "narHash": "sha256-2V5nKOYVFMYlseYdDKiEaww2xqcE0GtS1ax3SoUX99I=",
+ "lastModified": 1680597706,
+ "narHash": "sha256-ZqJ3T+BxzjPH9TnmeUwS4Uu9ZQPeBXAFC9sUWlharT4=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "4295fdfa6b0005c32f2e1f0b732faf5810c1bc7f",
+ "rev": "ec06f419af79207b33d797064dfb3fc9dbe1df4a",
"type": "github"
},
"original": {
@@ -260,11 +260,11 @@
},
"locked": {
"dir": "nix",
- "lastModified": 1673185501,
- "narHash": "sha256-uEtWPpl9nH7QqochHo1z+giPga1zXR1Ko3dOXHIapFY=",
+ "lastModified": 1679982002,
+ "narHash": "sha256-st3xFK6kgoeTwVQw/zKGc4HLaWSU4yrRyY82d7bfgYk=",
"owner": "kmonad",
"repo": "kmonad",
- "rev": "3413f1be996142c8ef4f36e246776a6df7175979",
+ "rev": "a22e0bad9e76b01c7b9e56f193e07c615e82effa",
"type": "github"
},
"original": {
@@ -292,11 +292,11 @@
"rust-overlay": "rust-overlay_2"
},
"locked": {
- "lastModified": 1676939038,
- "narHash": "sha256-mrgx8hLguzZnVYmkehSuiTyaeg2r/3vIQREYPISdQsA=",
+ "lastModified": 1679410195,
+ "narHash": "sha256-O0QKWaIeX/QRQcOaf1RJofuRu+WnT+zHHHnqeAjAI0E=",
"owner": "nix-community",
"repo": "lanzaboote",
- "rev": "5af69f0d6306f8239b3ecd661a37c5ee0a5c9173",
+ "rev": "7c55847aaf804398c0cd1c75f20591075eafcdee",
"type": "github"
},
"original": {
@@ -329,11 +329,11 @@
]
},
"locked": {
- "lastModified": 1676778053,
- "narHash": "sha256-5/NghN1FCFpwCWp6Q3W4Of3keKYx/RgCNFuUmk6YmAA=",
+ "lastModified": 1679224439,
+ "narHash": "sha256-QkvcuC4b67FUkkxlMsLTMPbwoD7yZr0UvJpu6jkFuLo=",
"owner": "Mic92",
"repo": "nix-index-database",
- "rev": "688adea5ecff698a49461f77d649cc854b805dbc",
+ "rev": "2f5e6e915d70c04d673a8930f94591595c73eb84",
"type": "github"
},
"original": {
@@ -344,11 +344,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1677080879,
- "narHash": "sha256-0SjW4/d3Rkw6C7hHZ5lxT4r6Pw9vzQb6Il6zYWwe2Bo=",
+ "lastModified": 1680668850,
+ "narHash": "sha256-mQMg13yRsS0LXVzaeoSPwqgPO6yhkGzGewPgMSqXSv8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "f5dad40450d272a1ea2413f4a67ac08760649e89",
+ "rev": "4a65e9f64e53fdca6eed31adba836717a11247d2",
"type": "github"
},
"original": {
@@ -361,11 +361,11 @@
"nixpkgs-lib": {
"locked": {
"dir": "lib",
- "lastModified": 1672350804,
- "narHash": "sha256-jo6zkiCabUBn3ObuKXHGqqORUMH27gYDIFFfLq5P4wg=",
+ "lastModified": 1678375444,
+ "narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "677ed08a50931e38382dbef01cba08a8f7eac8f6",
+ "rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e",
"type": "github"
},
"original": {
@@ -393,27 +393,27 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1671271954,
- "narHash": "sha256-cSvu+bnvN08sOlTBWbBrKaBHQZq8mvk8bgpt0ZJ2Snc=",
+ "lastModified": 1678872516,
+ "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "d513b448cc2a6da2c8803e3c197c9fc7e67b19e3",
+ "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-22.05",
+ "ref": "nixos-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": {
- "lastModified": 1676771332,
- "narHash": "sha256-YYn2K0AwyIyCzvP7C+xzEt64rlCRPyrllRPGNNu+50M=",
+ "lastModified": 1680390120,
+ "narHash": "sha256-RyDJcG/7mfimadlo8vO0QjW22mvYH1+cCqMuigUntr8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "f27a4e2f6a3a23b843ca1c736e6043fb8b99acc1",
+ "rev": "c1e2efaca8d8a3db6a36f652765d6c6ba7bb8fae",
"type": "github"
},
"original": {
@@ -425,16 +425,16 @@
},
"nixpkgs-test": {
"locked": {
- "lastModified": 1671812130,
- "narHash": "sha256-GALBK+qB9rhnB+lVnxdgtMoXCySXughZZ3+qGO1Ke/k=",
- "owner": "RaitoBezarius",
+ "lastModified": 1679009563,
+ "narHash": "sha256-jizICiQOqUcYFNHRNNOo69bfyNo36iyuRAHem5z68LQ=",
+ "owner": "NixOS",
"repo": "nixpkgs",
- "rev": "e51bf8cc8e2c75192e930ad83ed272938729e7be",
+ "rev": "371d3778c4f9cee7d5cf014e6ce400d57366570f",
"type": "github"
},
"original": {
- "owner": "RaitoBezarius",
- "ref": "simplified-qemu-boot-disks",
+ "owner": "NixOS",
+ "ref": "qemu-boot-disk-using-make-disk-image",
"repo": "nixpkgs",
"type": "github"
}
@@ -446,11 +446,11 @@
]
},
"locked": {
- "lastModified": 1676544996,
- "narHash": "sha256-8bdPgQY+0fiFsmNxIwttWhQb7Efqq7//WcQN2KWgECc=",
+ "lastModified": 1678282698,
+ "narHash": "sha256-QX1GFxsV1WS0bEgOvMZUnZbZVOWPMpgefjCNMM9DY04=",
"owner": "numtide",
"repo": "nixpkgs-unfree",
- "rev": "61c0b870bedc4ef5b745e71f34de8a1ed58148af",
+ "rev": "2708e517eff25a904f914d2368feef0dccc2a969",
"type": "github"
},
"original": {
@@ -529,11 +529,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1672912243,
- "narHash": "sha256-QnQeKUjco2kO9J4rBqIBPp5XcOMblIMnmyhpjeaJBYc=",
+ "lastModified": 1678976941,
+ "narHash": "sha256-skNr08frCwN9NO+7I77MjOHHAw+L410/37JknNld+W4=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "a4548c09eac4afb592ab2614f4a150120b29584c",
+ "rev": "32b1dbedfd77892a6e375737ef04d8efba634e9e",
"type": "github"
},
"original": {
@@ -585,11 +585,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
- "lastModified": 1676976502,
- "narHash": "sha256-D0l5hvE4IFUqspKeorawIlLQRMKqCkMAhZ58KjDXJl8=",
+ "lastModified": 1680727375,
+ "narHash": "sha256-hb8AosuONAg0D9yoZ4VrBsjf5hINMYVLPEGekXF4qVE=",
"owner": "rust-lang",
"repo": "rust-analyzer",
- "rev": "27239fbb58a115915ffc1ce65ededc951eb00fd2",
+ "rev": "ea22d245b671f97b820cf761108251c6292c3152",
"type": "github"
},
"original": {
@@ -611,11 +611,11 @@
]
},
"locked": {
- "lastModified": 1676437770,
- "narHash": "sha256-mhJye91Bn0jJIE7NnEywGty/U5qdELfsT8S+FBjTdG4=",
+ "lastModified": 1680488274,
+ "narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "a619538647bd03e3ee1d7b947f7c11ff289b376e",
+ "rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8",
"type": "github"
},
"original": {
@@ -636,11 +636,11 @@
]
},
"locked": {
- "lastModified": 1673058265,
- "narHash": "sha256-FFigGHIO9BQeIIKjH5dcpB+ey5CSgfy47wHPGeOhCps=",
+ "lastModified": 1679279218,
+ "narHash": "sha256-vWUbkLgNaUo0TYi5BaboPTaB6IjoZPm+0y0SqLS54Jc=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "802ff3314663ec7114f29a6e8b200dfc892023f8",
+ "rev": "c680a0a4144bb0931f6cebd601a3978bbafc4f64",
"type": "github"
},
"original": {
@@ -657,11 +657,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
- "lastModified": 1676959847,
- "narHash": "sha256-KZS6sIsMXiNyN7jW45MrEo95iEXj6nMLKvxgxO181no=",
+ "lastModified": 1680404136,
+ "narHash": "sha256-06D8HJmRv4DdpEQGblMhx2Vm81SBWM61XBBIx7QQfo0=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "2c5828439d718a6cddd9a511997d9ac7626a4aff",
+ "rev": "b93eb910f768f9788737bfed596a598557e5625d",
"type": "github"
},
"original": {
@@ -672,11 +672,11 @@
},
"utils": {
"locked": {
- "lastModified": 1667395993,
- "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+ "lastModified": 1678901627,
+ "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+ "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"type": "github"
},
"original": {
diff --git a/modules/dnsmasq.nix b/modules/dnsmasq.nix
index e4831d7..c23dc16 100644
--- a/modules/dnsmasq.nix
+++ b/modules/dnsmasq.nix
@@ -7,12 +7,10 @@
settings = {
server = [ "1.1.1.1" "1.0.0.1" ];
conf-file = config.sops.secrets."dnsmasq-private.conf".path;
+ local = "/local/";
+ domain = "local";
+ expand-hosts = true;
};
- extraConfig = ''
- local=/local/
- domain=local
- expand-hosts
- '';
};
avahi = {
enable = true;
diff --git a/modules/mongo.nix b/modules/mongo.nix
index 4b3e26a..96770ee 100644
--- a/modules/mongo.nix
+++ b/modules/mongo.nix
@@ -1,8 +1,8 @@
{ pkgs, nixpkgs-unfree, system, username, lib, ... }: {
config = {
services.mongodb = {
- package = nixpkgs-unfree.legacyPackages.${system}.mongodb-6_0;
- enable = true;
+ package = pkgs.legacyPackages.${system}.mongodb-6_0;
+ enable = false;
dbpath = "/tmp/mongodb";
};
internal.allowUnfree = [ "mongodb" "mongodb-compass" ];
diff --git a/modules/office.nix b/modules/office.nix
index 130d286..f278957 100644
--- a/modules/office.nix
+++ b/modules/office.nix
@@ -1,3 +1,3 @@
{ pkgs, ... }: {
- home.home.packages = [pkgs.libreoffice];
+ /* home.home.packages = [pkgs.libreoffice]; */
}
diff --git a/modules/zsh.nix b/modules/zsh.nix
index eb50e71..690b226 100644
--- a/modules/zsh.nix
+++ b/modules/zsh.nix
@@ -4,6 +4,7 @@
, fzf-tab
, ...
}: {
+ config.programs.zsh.enable = true;
home = {
programs.zsh = {
enable = true;