schrottkatze/nix-configs
1
0
Fork 0
mirror of https://forge.katzen.cafe/schrottkatze/nix-configs.git synced 2024-11-05 15:16:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: schrottkatze:ab61d680ac7fabe8aa1c371cdeaa6228c7a8bac1
Branches Tags
schrottkatze:main
schrottkatze:push-ryvwvsovxzpu
schrottkatze:push-pqvqptxrrmyk
..
compare: schrottkatze:e222066a878aadbdc300e1ca6b1808ecb68cd660
Branches Tags
schrottkatze:main
schrottkatze:push-ryvwvsovxzpu
schrottkatze:push-pqvqptxrrmyk

No commits in common. "ab61d680ac7fabe8aa1c371cdeaa6228c7a8bac1" and "e222066a878aadbdc300e1ca6b1808ecb68cd660" have entirely different histories.
ab61d680ac ... e222066a87

7 changed files with 48 additions and 38 deletions
Show stats Expand all files Collapse all files

1
common.nix
View file

@ -33,7 +33,6 @@ with builtins; {
config = { config = {
allowUnfree = true; allowUnfree = true;
permittedInsecurePackages = [ permittedInsecurePackages = [
"electron-27.3.11"
"nodejs-16.20.0" "nodejs-16.20.0"
]; ];
}; };

65
flake.lock
View file

@ -28,11 +28,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1722320953, "lastModified": 1722148092,
"narHash": "sha256-DfGaJtgrzcwPQYLTvjL1KaVIjpvi85b2MpM6yEGvJzM=", "narHash": "sha256-5QS64rfIFDzU1jmZrOK6wyZOCi6Vn/90apWRI6Hy+xk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "483df76def3e5010d709aa3a0418ba2088503994", "rev": "b39d8959f286dc7b9da91ae92f6af56de0169e87",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -104,15 +104,16 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1722305447, "lastModified": 1721054193,
"narHash": "sha256-2jG85FHBhKeoF8vNUkCHflrliuC8HCaMOzmERct9imc=", "narHash": "sha256-xonM9t7oZ8YiwcEXuVlhs+8FsMSXI42djzUgpDt1n/w=",
"owner": "helix-editor", "owner": "pascalkuthe",
"repo": "helix", "repo": "helix",
"rev": "ce809fb9ef4c5af59b5401419a2e8ae6964c8229", "rev": "386fa371d708f8e91a83762dfc7a58971681e091",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "helix-editor", "owner": "pascalkuthe",
"ref": "inline-diagnostics",
"repo": "helix", "repo": "helix",
"type": "github" "type": "github"
} }
@ -124,11 +125,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722321190, "lastModified": 1722119539,
"narHash": "sha256-WeVWVRqkgrbLzmk6FfJoloJ7Xe7HWD27Pv950IUG2kI=", "narHash": "sha256-2kU90liMle0vKR8exJx1XM4hZh9CdNgZGHCTbeA9yzY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4fcd54df7cbb1d79cbe81209909ee8514d6b17a4", "rev": "d0240a064db3987eb4d5204cf2400bc4452d9922",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -140,22 +141,27 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1722357433, "lastModified": 1714955862,
"narHash": "sha256-bv8oI8t46KXY6elO4n0R9P3SPBLtuJFMYm0oDxLD/90=", "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=",
"rev": "97a389b0bee7baf2d445121afa6ec84bef3a4bd7", "ref": "refs/tags/2.90-beta.1",
"type": "tarball", "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/97a389b0bee7baf2d445121afa6ec84bef3a4bd7.tar.gz" "revCount": 15501,
"type": "git",
"url": "https://git@git.lix.systems/lix-project/lix"
}, },
"original": { "original": {
"type": "tarball", "ref": "refs/tags/2.90-beta.1",
"url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" "type": "git",
"url": "https://git@git.lix.systems/lix-project/lix"
} }
}, },
"lix-module": { "lix-module": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"flakey-profile": "flakey-profile", "flakey-profile": "flakey-profile",
"lix": "lix", "lix": [
"lix"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -177,7 +183,7 @@
"mac-brcm-fw": { "mac-brcm-fw": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1709065070, "lastModified": 1701030348,
"narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=", "narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=",
"path": "/home/jade/nix-configs/mac-brcm-fw", "path": "/home/jade/nix-configs/mac-brcm-fw",
"type": "path" "type": "path"
@ -205,11 +211,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1722185531, "lastModified": 1722062969,
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -235,11 +241,11 @@
}, },
"nixpkgs-unstable-small": { "nixpkgs-unstable-small": {
"locked": { "locked": {
"lastModified": 1722309256, "lastModified": 1722179153,
"narHash": "sha256-Eqlu/hisMWE51b9YeKqehNaHLPhZOmkFkrx+VzI5YcM=", "narHash": "sha256-ZJ75T0GWpLI4hoaL+YxueHD2pXG+VYpYtPJdwbkERVs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3fcada1050e3820241590679838954bacf7d38f8", "rev": "dcfb2878c687e5eb5fcbc5116969c45c85be34e2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -254,6 +260,7 @@
"fenix": "fenix", "fenix": "fenix",
"helix-inline-diags": "helix-inline-diags", "helix-inline-diags": "helix-inline-diags",
"home-manager": "home-manager", "home-manager": "home-manager",
"lix": "lix",
"lix-module": "lix-module", "lix-module": "lix-module",
"mac-brcm-fw": "mac-brcm-fw", "mac-brcm-fw": "mac-brcm-fw",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
@ -265,11 +272,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1722262053, "lastModified": 1722099723,
"narHash": "sha256-KxjkPVn9rQqYam6DhiN/V2NcMXtYW25maxkJoiVMpmE=", "narHash": "sha256-61f+rvQAObm/TuBEqYFNUTngm/wXcuNhGtQbAmfZVvY=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "a021b85be57d34b1eed687fcafd5d5ec64b2d853", "rev": "a46788318cce3b62e14606f70a14896b223ee5ec",
"type": "github" "type": "github"
}, },
"original": { "original": {

10
flake.nix
View file

@ -6,14 +6,19 @@
nixpkgs-stable.url = "nixpkgs/nixos-23.11"; nixpkgs-stable.url = "nixpkgs/nixos-23.11";
nixpkgs-unstable-small.url = "nixpkgs/nixos-unstable-small"; nixpkgs-unstable-small.url = "nixpkgs/nixos-unstable-small";
helix-inline-diags = { helix-inline-diags = {
url = "github:helix-editor/helix"; url = "github:pascalkuthe/helix/inline-diagnostics";
inputs = { inputs = {
crane.follows = "crane"; crane.follows = "crane";
nixpkgs.follows = "nixpkgs"; 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 = { lix-module = {
url = "git+https://git.lix.systems/lix-project/nixos-module"; url = "git+https://git.lix.systems/lix-project/nixos-module";
inputs.lix.follows = "lix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager = { home-manager = {
@ -58,7 +63,8 @@
crane-lib = crane.lib.${system}; crane-lib = crane.lib.${system};
rs-toolchain = with fenix.packages.${system}; rs-toolchain = with fenix.packages.${system};
combine [ combine [
complete.toolchain default.toolchain
rust-analyzer
]; ];
# rs-platform = pkgs.makeRustPlatform { # rs-platform = pkgs.makeRustPlatform {
# cargo = rs-toolchain; # cargo = rs-toolchain;

1
hosts/catbook-j/configuration.nix
View file

@ -9,7 +9,6 @@
}: { }: {
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [
"electron-25.9.0" "electron-25.9.0"
"electron-27.3.11"
]; ];
imports = [ imports = [
# Include the results of the hardware scan. # Include the results of the hardware scan.

3
modules/desktop-environment/audio.nix
View file

@ -16,9 +16,10 @@
playerctl playerctl
pulseaudioFull pulseaudioFull
easyeffects
cava cava
helvum helvum
]; ];
hardware.pulseaudio.enable = pkgs.lib.mkForce false; hardware.pulseaudio.enable = pkgs.lib.mkForce false;
# sound.mediaKeys.enable = true; sound.mediaKeys.enable = true;
} }

4
modules/desktop/default.nix
View file

@ -115,7 +115,7 @@ in
xfce.thunar xfce.thunar
xfce.tumbler xfce.tumbler
xfce.thunar-archive-plugin xfce.thunar-archive-plugin
file-roller gnome.file-roller
# media/file viewers # media/file viewers
vlc vlc
mpv mpv
@ -136,7 +136,7 @@ in
gitg gitg
gpick gpick
qdirstat qdirstat
ffmpeg_7-full ffmpeg_5
# external # external
libnotify libnotify

2
modules/desktop/firefox.nix
View file

@ -215,8 +215,6 @@
"browser.aboutwelcome.enabled" = false; "browser.aboutwelcome.enabled" = false;
"browser.preferences.moreFromMozilla" = false; "browser.preferences.moreFromMozilla" = false;
"browser.menu.showViewImageInfo" = true; "browser.menu.showViewImageInfo" = true;
"browser.shopping.experience2023.active" = false;
"browser.shopping.experience2023.survey.enabled" = false;
"identity.fxaccounts.enabled" = true; "identity.fxaccounts.enabled" = true;
"browser.tabs.firefox-view" = true; "browser.tabs.firefox-view" = true;