Compare commits
No commits in common. "ab61d680ac7fabe8aa1c371cdeaa6228c7a8bac1" and "e222066a878aadbdc300e1ca6b1808ecb68cd660" have entirely different histories.
ab61d680ac
...
e222066a87
7 changed files with 48 additions and 38 deletions
|
|
@ -33,7 +33,6 @@ with builtins; {
|
|||
config = {
|
||||
allowUnfree = true;
|
||||
permittedInsecurePackages = [
|
||||
"electron-27.3.11"
|
||||
"nodejs-16.20.0"
|
||||
];
|
||||
};
|
||||
|
|
|
|||
65
flake.lock
65
flake.lock
|
|
@ -28,11 +28,11 @@
|
|||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722320953,
|
||||
"narHash": "sha256-DfGaJtgrzcwPQYLTvjL1KaVIjpvi85b2MpM6yEGvJzM=",
|
||||
"lastModified": 1722148092,
|
||||
"narHash": "sha256-5QS64rfIFDzU1jmZrOK6wyZOCi6Vn/90apWRI6Hy+xk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "483df76def3e5010d709aa3a0418ba2088503994",
|
||||
"rev": "b39d8959f286dc7b9da91ae92f6af56de0169e87",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -104,15 +104,16 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722305447,
|
||||
"narHash": "sha256-2jG85FHBhKeoF8vNUkCHflrliuC8HCaMOzmERct9imc=",
|
||||
"owner": "helix-editor",
|
||||
"lastModified": 1721054193,
|
||||
"narHash": "sha256-xonM9t7oZ8YiwcEXuVlhs+8FsMSXI42djzUgpDt1n/w=",
|
||||
"owner": "pascalkuthe",
|
||||
"repo": "helix",
|
||||
"rev": "ce809fb9ef4c5af59b5401419a2e8ae6964c8229",
|
||||
"rev": "386fa371d708f8e91a83762dfc7a58971681e091",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "helix-editor",
|
||||
"owner": "pascalkuthe",
|
||||
"ref": "inline-diagnostics",
|
||||
"repo": "helix",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -124,11 +125,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722321190,
|
||||
"narHash": "sha256-WeVWVRqkgrbLzmk6FfJoloJ7Xe7HWD27Pv950IUG2kI=",
|
||||
"lastModified": 1722119539,
|
||||
"narHash": "sha256-2kU90liMle0vKR8exJx1XM4hZh9CdNgZGHCTbeA9yzY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "4fcd54df7cbb1d79cbe81209909ee8514d6b17a4",
|
||||
"rev": "d0240a064db3987eb4d5204cf2400bc4452d9922",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -140,22 +141,27 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1722357433,
|
||||
"narHash": "sha256-bv8oI8t46KXY6elO4n0R9P3SPBLtuJFMYm0oDxLD/90=",
|
||||
"rev": "97a389b0bee7baf2d445121afa6ec84bef3a4bd7",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/97a389b0bee7baf2d445121afa6ec84bef3a4bd7.tar.gz"
|
||||
"lastModified": 1714955862,
|
||||
"narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=",
|
||||
"ref": "refs/tags/2.90-beta.1",
|
||||
"rev": "b6799ab0374a8e1907a48915d3187e07da41d88c",
|
||||
"revCount": 15501,
|
||||
"type": "git",
|
||||
"url": "https://git@git.lix.systems/lix-project/lix"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
|
||||
"ref": "refs/tags/2.90-beta.1",
|
||||
"type": "git",
|
||||
"url": "https://git@git.lix.systems/lix-project/lix"
|
||||
}
|
||||
},
|
||||
"lix-module": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"flakey-profile": "flakey-profile",
|
||||
"lix": "lix",
|
||||
"lix": [
|
||||
"lix"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
|
|
@ -177,7 +183,7 @@
|
|||
"mac-brcm-fw": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1709065070,
|
||||
"lastModified": 1701030348,
|
||||
"narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=",
|
||||
"path": "/home/jade/nix-configs/mac-brcm-fw",
|
||||
"type": "path"
|
||||
|
|
@ -205,11 +211,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1722185531,
|
||||
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
|
||||
"lastModified": 1722062969,
|
||||
"narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
|
||||
"rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -235,11 +241,11 @@
|
|||
},
|
||||
"nixpkgs-unstable-small": {
|
||||
"locked": {
|
||||
"lastModified": 1722309256,
|
||||
"narHash": "sha256-Eqlu/hisMWE51b9YeKqehNaHLPhZOmkFkrx+VzI5YcM=",
|
||||
"lastModified": 1722179153,
|
||||
"narHash": "sha256-ZJ75T0GWpLI4hoaL+YxueHD2pXG+VYpYtPJdwbkERVs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3fcada1050e3820241590679838954bacf7d38f8",
|
||||
"rev": "dcfb2878c687e5eb5fcbc5116969c45c85be34e2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -254,6 +260,7 @@
|
|||
"fenix": "fenix",
|
||||
"helix-inline-diags": "helix-inline-diags",
|
||||
"home-manager": "home-manager",
|
||||
"lix": "lix",
|
||||
"lix-module": "lix-module",
|
||||
"mac-brcm-fw": "mac-brcm-fw",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
|
|
@ -265,11 +272,11 @@
|
|||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1722262053,
|
||||
"narHash": "sha256-KxjkPVn9rQqYam6DhiN/V2NcMXtYW25maxkJoiVMpmE=",
|
||||
"lastModified": 1722099723,
|
||||
"narHash": "sha256-61f+rvQAObm/TuBEqYFNUTngm/wXcuNhGtQbAmfZVvY=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "a021b85be57d34b1eed687fcafd5d5ec64b2d853",
|
||||
"rev": "a46788318cce3b62e14606f70a14896b223ee5ec",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
10
flake.nix
10
flake.nix
|
|
@ -6,14 +6,19 @@
|
|||
nixpkgs-stable.url = "nixpkgs/nixos-23.11";
|
||||
nixpkgs-unstable-small.url = "nixpkgs/nixos-unstable-small";
|
||||
helix-inline-diags = {
|
||||
url = "github:helix-editor/helix";
|
||||
url = "github:pascalkuthe/helix/inline-diagnostics";
|
||||
inputs = {
|
||||
crane.follows = "crane";
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
lix = {
|
||||
url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
|
||||
flake = false;
|
||||
};
|
||||
lix-module = {
|
||||
url = "git+https://git.lix.systems/lix-project/nixos-module";
|
||||
inputs.lix.follows = "lix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
home-manager = {
|
||||
|
|
@ -58,7 +63,8 @@
|
|||
crane-lib = crane.lib.${system};
|
||||
rs-toolchain = with fenix.packages.${system};
|
||||
combine [
|
||||
complete.toolchain
|
||||
default.toolchain
|
||||
rust-analyzer
|
||||
];
|
||||
# rs-platform = pkgs.makeRustPlatform {
|
||||
# cargo = rs-toolchain;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
}: {
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"electron-25.9.0"
|
||||
"electron-27.3.11"
|
||||
];
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
|
|
|
|||
|
|
@ -16,9 +16,10 @@
|
|||
playerctl
|
||||
|
||||
pulseaudioFull
|
||||
easyeffects
|
||||
cava
|
||||
helvum
|
||||
];
|
||||
hardware.pulseaudio.enable = pkgs.lib.mkForce false;
|
||||
# sound.mediaKeys.enable = true;
|
||||
sound.mediaKeys.enable = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ in
|
|||
xfce.thunar
|
||||
xfce.tumbler
|
||||
xfce.thunar-archive-plugin
|
||||
file-roller
|
||||
gnome.file-roller
|
||||
# media/file viewers
|
||||
vlc
|
||||
mpv
|
||||
|
|
@ -136,7 +136,7 @@ in
|
|||
gitg
|
||||
gpick
|
||||
qdirstat
|
||||
ffmpeg_7-full
|
||||
ffmpeg_5
|
||||
|
||||
# external
|
||||
libnotify
|
||||
|
|
|
|||
|
|
@ -215,8 +215,6 @@
|
|||
"browser.aboutwelcome.enabled" = false;
|
||||
"browser.preferences.moreFromMozilla" = false;
|
||||
"browser.menu.showViewImageInfo" = true;
|
||||
"browser.shopping.experience2023.active" = false;
|
||||
"browser.shopping.experience2023.survey.enabled" = false;
|
||||
|
||||
"identity.fxaccounts.enabled" = true;
|
||||
"browser.tabs.firefox-view" = true;
|
||||
|
|
|
|||
Loading…
Reference in a new issue