diff --git a/flake.lock b/flake.lock
index 86ac0bb7..bd4da6b1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
- "lastModified": 1693611461,
- "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=",
+ "lastModified": 1696343447,
+ "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca",
+ "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
"type": "github"
},
"original": {
@@ -24,43 +24,27 @@
]
},
"locked": {
- "lastModified": 1695738267,
- "narHash": "sha256-LTNAbTQ96xSj17xBfsFrFS9i56U2BMLpD0BduhrsVkU=",
+ "lastModified": 1695108154,
+ "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "0f4e5b4999fd6a42ece5da8a3a2439a50e48e486",
+ "rev": "07682fff75d41f18327a871088d20af2710d4744",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "master",
+ "ref": "release-23.05",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
- "lastModified": 1695360818,
- "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=",
+ "lastModified": 1696039360,
+ "narHash": "sha256-g7nIUV4uq1TOVeVIDEZLb005suTWCUjSY0zYOlSBsyE=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs-2305": {
- "locked": {
- "lastModified": 1695559356,
- "narHash": "sha256-kXZ1pUoImD9OEbPCwpTz4tHsNTr4CIyIfXb3ocuR8sI=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "261abe8a44a7e8392598d038d2e01f7b33cf26d0",
+ "rev": "32dcb45f66c0487e92db8303a798ebc548cadedc",
"type": "github"
},
"original": {
@@ -73,11 +57,11 @@
"nixpkgs-lib": {
"locked": {
"dir": "lib",
- "lastModified": 1693471703,
- "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=",
+ "lastModified": 1696019113,
+ "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85",
+ "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
"type": "github"
},
"original": {
@@ -88,12 +72,28 @@
"type": "github"
}
},
+ "nixpkgs-unstable": {
+ "locked": {
+ "lastModified": 1696019113,
+ "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"root": {
"inputs": {
"flake-parts": "flake-parts",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
- "nixpkgs-2305": "nixpkgs-2305"
+ "nixpkgs-unstable": "nixpkgs-unstable"
}
}
},
diff --git a/flake.nix b/flake.nix
index f637c010..5609e30c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,9 +1,9 @@
{
inputs = {
home-manager.inputs.nixpkgs.follows = "nixpkgs";
- home-manager.url = "github:nix-community/home-manager/master";
- nixpkgs-2305.url = "github:nixos/nixpkgs/nixos-23.05";
- nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+ home-manager.url = "github:nix-community/home-manager/release-23.05";
+ nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+ nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
};
outputs = inputs@{ flake-parts, self, ... }:
@@ -11,7 +11,7 @@
system = "x86_64-linux";
username = "opdavies";
- nixos-system = import ./system/nixos { inherit inputs self username; };
+ nixos-system = import ./system/nixos { inherit inputs self system username; };
wsl-system = import ./system/wsl2 { inherit inputs self system username; };
in
flake-parts.lib.mkFlake { inherit inputs; } {
diff --git a/system/nixos/configuration.nix b/system/nixos/configuration.nix
index c2a49892..d024f536 100644
--- a/system/nixos/configuration.nix
+++ b/system/nixos/configuration.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ inputs, pkgs, system }:
let
configure-gtk = pkgs.writeTextFile {
@@ -120,7 +120,6 @@ in
brightnessctl
configure-gtk
ffmpegthumbnailer
- google-chrome
shotwell
swaybg
xfce.thunar
@@ -182,8 +181,7 @@ in
monospace = [ "JetBrainsMono Nerd Font Mono" ];
};
};
- fonts = with pkgs; [
- intel-one-mono
+ fonts = with inputs.nixpkgs-unstable.legacyPackages."${system}"; [
(nerdfonts.override {
fonts = [
"FiraCode"
@@ -221,7 +219,7 @@ in
in
{
enable = true;
- plugins = lib.mkForce [ pkgs.interception-tools-plugins.dual-function-keys ];
+ 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:
diff --git a/system/nixos/default.nix b/system/nixos/default.nix
index 9f5c0722..a4215610 100644
--- a/system/nixos/default.nix
+++ b/system/nixos/default.nix
@@ -1,9 +1,11 @@
-{ inputs, self, username }:
+{ inputs, self, system, username }:
{ desktop }:
let
- configuration = import ./configuration.nix;
+ pkgs = inputs.nixpkgs.legacyPackages."${system}";
+
+ configuration = import ./configuration.nix { inherit inputs pkgs system; };
hardware-configuration = import ./hardware-configuration.nix;
in
inputs.nixpkgs.lib.nixosSystem {
diff --git a/system/shared/home-manager-packages.nix b/system/shared/home-manager-packages.nix
index 83e3e69f..d658ab52 100644
--- a/system/shared/home-manager-packages.nix
+++ b/system/shared/home-manager-packages.nix
@@ -6,7 +6,7 @@ with pkgs; [
delta
dog
doppler
- inputs.nixpkgs-2305.legacyPackages."${system}".exa
+ exa
fd
file
fzf
@@ -18,6 +18,7 @@ with pkgs; [
go
htop
inotify-tools
+ inputs.nixpkgs-unstable.legacyPackages."${system}".rustywind
jq
just
lua
@@ -25,7 +26,6 @@ with pkgs; [
neofetch
pv
ripgrep
- rustywind
terraform
tldr
tree
diff --git a/system/shared/home-manager.nix b/system/shared/home-manager.nix
index 9603dd1c..e536758b 100644
--- a/system/shared/home-manager.nix
+++ b/system/shared/home-manager.nix
@@ -1,4 +1,4 @@
-{ inputs, pkgs, self, username }:
+{ inputs, pkgs, username, self }:
let
customVim = with self; {
@@ -566,6 +566,7 @@ in
'';
}
+ inputs.nixpkgs-unstable.legacyPackages."${system}".vimPlugins.refactoring-nvim
vimPlugins.comment-nvim
vimPlugins.dial-nvim
vimPlugins.gitsigns-nvim
@@ -573,7 +574,6 @@ in
vimPlugins.impatient-nvim
vimPlugins.indent-blankline-nvim
vimPlugins.nvim-web-devicons
- vimPlugins.refactoring-nvim
vimPlugins.rest-nvim
vimPlugins.splitjoin-vim
vimPlugins.todo-comments-nvim
@@ -627,11 +627,11 @@ in
# LSP
customVim.none-ls-nvim
+ # inputs.nixpkgs-unstable.legacyPackages."${system}".vimPlugins.nvim-lspconfig
vimPlugins.lsp-status-nvim
vimPlugins.nvim-lspconfig
# Completion
- inputs.nixpkgs-2305.legacyPackages."${system}".vimPlugins.phpactor
vimPlugins.cmp-buffer
vimPlugins.cmp-cmdline
vimPlugins.cmp-nvim-lsp
@@ -643,6 +643,7 @@ in
vimPlugins.cmp_luasnip
vimPlugins.lspkind-nvim
vimPlugins.nvim-cmp
+ vimPlugins.phpactor
# Snippets
vimPlugins.friendly-snippets
@@ -691,8 +692,8 @@ in
# Language servers
ansible-language-server
gopls
+ inputs.nixpkgs-unstable.legacyPackages."${system}".nixd
lua-language-server
- nixd
nodePackages.intelephense
nodePackages."@astrojs/language-server"
nodePackages."@tailwindcss/language-server"