Noratrieb/nixos
1
0
Fork 0
mirror of https://github.com/Noratrieb/nixos.git synced 2026-01-14 11:45:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

update

Browse source
This commit is contained in:
nora 2023-12-16 00:06:39 +01:00
parent c067774aab
commit 98e487b199
5 changed files with 39 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
custom-pkgs/cargo-mommy.nix
View file

@ -3,16 +3,16 @@
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
pname = "cargo-mommy"; pname = "cargo-mommy";
version = "0.1.1"; version = "0.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Gankra"; owner = "Gankra";
repo = "cargo-mommy"; repo = "cargo-mommy";
rev = "0d96506db241003166e32deb22ad0ab0fc52c16c"; rev = "0ec17361d8b0573d0155984403e576b788abeb60";
hash = "sha256-SIL7ExSRVBXr7Z+ye+rjjUpK6WS/fytvfhj3WPPdenc="; hash = "sha256-Mf0VGxQ90PjNhFA2OnDIFkNZjYDCuMqPsexqy5+gRdI=";
}; };
cargoSha256 = "sha256-hdWYvWNOko6wlffv2Vb3xTYfh9mQgLlON8EVKVkWUV0="; cargoSha256 = "sha256-iQt6eTCcpzhFnrDkUmT4x7JX+Z7fWdW5ovbB/9Ui7Sw=";
meta = with lib; { meta = with lib; {
description = "Cargo wrapper that encourages you after running commands"; description = "Cargo wrapper that encourages you after running commands";

35
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1701728041, "lastModified": 1702538064,
"narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=", "narHash": "sha256-At5GwJPu2tzvS9dllhBoZmqK6lkkh/sOp2YefWRlaL8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf", "rev": "0e2e443ff24f9d75925e91b89d1da44b863734af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -43,11 +43,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1701718080, "lastModified": 1702312524,
"narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=", "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335", "rev": "a9bf124c46ef298113270b1f84a164865987a91c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -57,13 +57,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": {
"locked": {
"lastModified": 1702346276,
"narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1702060431, "lastModified": 1702673133,
"narHash": "sha256-8/yGvqBUx/oR2rDhY8+iWZ1nErjpsNCe2O8PvzFaerM=", "narHash": "sha256-WWLJaaCSufoQ4kNyIeKJvEFuAMgCvd9BdBeoJEm7YQ0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "d854884a8c7d2014ff44a27cfe9cac8dd78cc7ea", "rev": "cdf58b69ab208e77fa1d6195983a151c9cd20e9e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -77,6 +93,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"minegrub-theme": "minegrub-theme", "minegrub-theme": "minegrub-theme",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable",
"nur": "nur" "nur": "nur"
} }
} }

3
flake.nix
View file

@ -6,6 +6,7 @@
inputs = { inputs = {
# Nixpkgs # Nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
@ -26,7 +27,7 @@
nixosConfigurations = { nixosConfigurations = {
nixos = nixpkgs.lib.nixosSystem { nixos = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; # Pass flake inputs to our config specialArgs = { inherit inputs; };
modules = [ modules = [
./nixos/configuration.nix ./nixos/configuration.nix
inputs.minegrub-theme.nixosModules.default inputs.minegrub-theme.nixosModules.default

9
home-manager/vscode.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, ... }: { { pkgs, lib, inputs, ... }: {
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgs.vscode; package = pkgs.vscode;
@ -44,14 +44,13 @@
jnoortheen.nix-ide jnoortheen.nix-ide
mads-hartmann.bash-ide-vscode mads-hartmann.bash-ide-vscode
ms-azuretools.vscode-docker ms-azuretools.vscode-docker
# the server fails to build temporarily ms-python.python
# https://github.com/NixOS/nixpkgs/issues/263493
# ms-python.python
ms-vscode-remote.remote-ssh ms-vscode-remote.remote-ssh
ms-vscode.cmake-tools ms-vscode.cmake-tools
ms-vscode.cpptools ms-vscode.cpptools
ms-vscode.hexeditor ms-vscode.hexeditor
nvarner.typst-lsp # https://github.com/NixOS/nixpkgs/issues/273835
(import inputs.nixpkgs-stable { system = "x86_64-linux"; }).vscode-extensions.nvarner.typst-lsp
redhat.vscode-yaml redhat.vscode-yaml
rust-lang.rust-analyzer rust-lang.rust-analyzer
tamasfe.even-better-toml tamasfe.even-better-toml

4
nixos/configuration.nix
View file

@ -37,7 +37,9 @@ in
# Disable if you don't want unfree packages # Disable if you don't want unfree packages
allowUnfree = true; allowUnfree = true;
nvidia.acceptLicense = true; nvidia.acceptLicense = true;
# allowUnfreePredicate = (_: true); permittedInsecurePackages = [
"electron-25.9.0" # Temporary fix until the next obsidian release: https://github.com/NixOS/nixpkgs/issues/273611
];
}; };
}; };