From 7d1bc11b4dec445aaf88a99471b52af91105edf8 Mon Sep 17 00:00:00 2001 From: Menno van Leeuwen Date: Wed, 18 Dec 2024 10:20:02 +0100 Subject: [PATCH] update flake.lock and workstation.nix for nixpkgs revisions and clean up vscode settings --- config/home-manager/flake.lock | 12 ++++++------ config/nixos/common/workstation.nix | 2 +- config/nixos/flake.lock | 12 ++++++------ vscode/settings.json | 1 - 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/config/home-manager/flake.lock b/config/home-manager/flake.lock index e1ae70c..8de59c2 100644 --- a/config/home-manager/flake.lock +++ b/config/home-manager/flake.lock @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733808091, - "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733940404, - "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { diff --git a/config/nixos/common/workstation.nix b/config/nixos/common/workstation.nix index 833e104..2837194 100644 --- a/config/nixos/common/workstation.nix +++ b/config/nixos/common/workstation.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { # Enable the X11 windowing system. services.xserver.enable = true; diff --git a/config/nixos/flake.lock b/config/nixos/flake.lock index 2a12ac6..a936dd5 100644 --- a/config/nixos/flake.lock +++ b/config/nixos/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1733808091, - "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { @@ -18,11 +18,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733940404, - "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { diff --git a/vscode/settings.json b/vscode/settings.json index 6443833..e8e8ef6 100755 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -41,6 +41,5 @@ "[dockercompose]": { "editor.defaultFormatter": "ms-azuretools.vscode-docker" }, - "terminal.integrated.defaultLocation": "editor", "go.toolsManagement.autoUpdate": true, }