Compare commits

..

2 Commits

Author SHA1 Message Date
85c5aa239a Temp use vscode python ext from nixpkgs master
Some checks are pending
pre-commit / pre-commit (push) Waiting to run
2024-09-16 00:30:54 +02:00
f4e2ff36c6 flake.lock: Update
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/503af483e1b328691ea3a434d331995595fb2e3d' (2024-09-13)
  → 'github:nix-community/home-manager/e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f' (2024-09-14)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/4f807e8940284ad7925ebd0a0993d2a1791acb2f' (2024-09-11)
  → 'github:nixos/nixpkgs/345c263f2f53a3710abe117f28a5cb86d0ba4059' (2024-09-13)
2024-09-15 19:18:23 +02:00
3 changed files with 48 additions and 16 deletions

View File

@ -64,11 +64,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726222338, "lastModified": 1726357542,
"narHash": "sha256-KuA8ciNR8qCF3dQaCaeh0JWyQUgEwkwDHr/f49Q5/e8=", "narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "503af483e1b328691ea3a434d331995595fb2e3d", "rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -145,11 +145,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1726062873, "lastModified": 1726243404,
"narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=", "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f", "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -159,6 +159,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-master": {
"locked": {
"lastModified": 1726438876,
"narHash": "sha256-mfk6fhXH75IH2zZIHKD+hdyvvPQxiop16JchbMQrBzw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "401a65280e36b3893f380d1fd67c76a5026b86d3",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1720535198, "lastModified": 1720535198,
@ -239,6 +255,7 @@
"huecli": "huecli", "huecli": "huecli",
"nix-packages": "nix-packages", "nix-packages": "nix-packages",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }

View File

@ -4,6 +4,7 @@
inputs = { inputs = {
# nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; # nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-23.11"; nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-23.11";
nixpkgs-master.url = "github:nixos/nixpkgs?ref=master";
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
@ -28,6 +29,7 @@
{ {
self, self,
nixpkgs, nixpkgs,
nixpkgs-master,
nixpkgs-stable, nixpkgs-stable,
sops-nix, sops-nix,
ghettoptt, ghettoptt,
@ -44,6 +46,12 @@
config.allowUnfree = true; config.allowUnfree = true;
}; };
}; };
overlay-master = final: prev: {
master = import nixpkgs-master {
inherit system;
config.allowUnfree = true;
};
};
allSystems = [ allSystems = [
"x86_64-linux" "x86_64-linux"
"aarch64-linux" "aarch64-linux"
@ -73,6 +81,7 @@
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
overlay-stable overlay-stable
overlay-master
ghettoptt.overlays.default ghettoptt.overlays.default
huecli.overlays.default huecli.overlays.default
nix-packages.overlays.default nix-packages.overlays.default
@ -99,6 +108,7 @@
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
overlay-stable overlay-stable
overlay-master
ghettoptt.overlays.default ghettoptt.overlays.default
huecli.overlays.default huecli.overlays.default
nix-packages.overlays.default nix-packages.overlays.default

View File

@ -1,18 +1,23 @@
{ pkgs, ... }: { pkgs, lib, ... }:
{ {
programs.vscode = { programs.vscode = {
enable = true; enable = true;
enableUpdateCheck = true; enableUpdateCheck = true;
enableExtensionUpdateCheck = true; enableExtensionUpdateCheck = true;
extensions = with pkgs.vscode-extensions; [ extensions =
catppuccin.catppuccin-vsc with pkgs.vscode-extensions;
catppuccin.catppuccin-vsc-icons [
golang.go catppuccin.catppuccin-vsc
vscodevim.vim catppuccin.catppuccin-vsc-icons
ms-python.python golang.go
ms-vscode-remote.remote-ssh vscodevim.vim
bbenoist.nix # ms-python.python
]; ms-vscode-remote.remote-ssh
bbenoist.nix
]
++ [
(lib.warn "Using vscode-extensions.ms-python.python from nixpkgs master!" pkgs.master.vscode-extensions.ms-python.python)
];
userSettings = { userSettings = {
"window.titleBarStyle" = "custom"; "window.titleBarStyle" = "custom";
}; };