palo/nixos-config
palo/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove nixpkgs channels which are not needed anymore

Browse source
This commit is contained in:
Ingolf Wagner 2024-06-07 14:25:34 +02:00
parent c5b5857a39
commit bd674ce4eb
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
18 changed files with 41 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
flake.lock
View file

@ -630,38 +630,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-legacy_2105": {
"locked": {
"lastModified": 1659914493,
"narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-21.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-legacy_2205": {
"locked": {
"lastModified": 1685573264,
"narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "380be19fbd2d9079f677978361792cb25e8a3635",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-22.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-legacy_2211": { "nixpkgs-legacy_2211": {
"locked": { "locked": {
"lastModified": 1688392541, "lastModified": 1688392541,
@ -678,22 +646,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-legacy_2305": {
"locked": {
"lastModified": 1704290814,
"narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-legacy_2311": { "nixpkgs-legacy_2311": {
"locked": { "locked": {
"lastModified": 1717530100, "lastModified": 1717530100,
@ -950,10 +902,7 @@
"nixos-anywhere": "nixos-anywhere", "nixos-anywhere": "nixos-anywhere",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"nixpkgs-legacy_2105": "nixpkgs-legacy_2105",
"nixpkgs-legacy_2205": "nixpkgs-legacy_2205",
"nixpkgs-legacy_2211": "nixpkgs-legacy_2211", "nixpkgs-legacy_2211": "nixpkgs-legacy_2211",
"nixpkgs-legacy_2305": "nixpkgs-legacy_2305",
"nixpkgs-legacy_2311": "nixpkgs-legacy_2311", "nixpkgs-legacy_2311": "nixpkgs-legacy_2311",
"overviewer": "overviewer", "overviewer": "overviewer",
"permown": "permown", "permown": "permown",

23
flake.nix
View file

@ -22,10 +22,7 @@
}; };
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-legacy_2105.url = "github:nixos/nixpkgs/nixos-21.05";
nixpkgs-legacy_2205.url = "github:nixos/nixpkgs/nixos-22.05";
nixpkgs-legacy_2211.url = "github:nixos/nixpkgs/nixos-22.11"; nixpkgs-legacy_2211.url = "github:nixos/nixpkgs/nixos-22.11";
nixpkgs-legacy_2305.url = "github:nixos/nixpkgs/nixos-23.05";
nixpkgs-legacy_2311.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs-legacy_2311.url = "github:nixos/nixpkgs/nixos-23.11";
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
nixos-anywhere.url = "github:nix-community/nixos-anywhere"; nixos-anywhere.url = "github:nix-community/nixos-anywhere";
@ -112,10 +109,7 @@
, nixos-anywhere , nixos-anywhere
, nixos-hardware , nixos-hardware
, nixpkgs , nixpkgs
, nixpkgs-legacy_2105
, nixpkgs-legacy_2205
, nixpkgs-legacy_2211 , nixpkgs-legacy_2211
, nixpkgs-legacy_2305
, nixpkgs-legacy_2311 , nixpkgs-legacy_2311
, overviewer , overviewer
, permown , permown
@ -147,15 +141,14 @@
]; ];
overlays = [ overlays = [
(_self: _super: { (_self: _super: {
# todo : remove this, we are on unstable in the future legacy_2211 = import nixpkgs-legacy_2211 {
unstable = import nixpkgs { inherit system;
config.allowUnfree = true;
};
legacy_2311 = import nixpkgs-legacy_2311 {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
legacy_2205 = import nixpkgs-legacy_2205 { inherit system; };
legacy_2211 = import nixpkgs-legacy_2211 { inherit system; };
legacy_2305 = import nixpkgs-legacy_2305 { inherit system; };
legacy_2311 = import nixpkgs-legacy_2311 { inherit system; };
polygon-art = polygon-art.packages.${system}; polygon-art = polygon-art.packages.${system};
landingpage = landingpage.packages.${system}.plain; landingpage = landingpage.packages.${system}.plain;
kmonad = kmonad.packages.${system}.kmonad; kmonad = kmonad.packages.${system}.kmonad;
@ -224,7 +217,7 @@
]; ];
}) })
# configure nix # configure nix
({ pkgs, ... }: ({ pkgs, lib, ... }:
{ {
nix.settings.substituters = [ "https://cache.nixos.org/" ]; nix.settings.substituters = [ "https://cache.nixos.org/" ];
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
@ -232,6 +225,10 @@
# no channesl needed this way # no channesl needed this way
nix.nixPath = [ "nixpkgs=${pkgs.path}" ]; nix.nixPath = [ "nixpkgs=${pkgs.path}" ];
documentation.nixos.enable = true; documentation.nixos.enable = true;
boot.loader.systemd-boot.configurationLimit = lib.mkDefault 10;
boot.loader.generic-extlinux-compatible.configurationLimit = lib.mkDefault 10;
boot.loader.grub.configurationLimit = lib.mkDefault 10;
}) })
# some modules I always use # some modules I always use
permown.nixosModules.permown permown.nixosModules.permown

2
nixos/components/gui/kmonad.nix
View file

@ -10,7 +10,7 @@
# only needed if you have an UHK # only needed if you have an UHK
hardware.keyboard.uhk.enable = true; hardware.keyboard.uhk.enable = true;
environment.systemPackages = [ pkgs.unstable.uhk-agent ]; environment.systemPackages = [ pkgs.uhk-agent ];
users.users.mainUser.extraGroups = [ "input" ]; users.users.mainUser.extraGroups = [ "input" ];
services.xserver = { services.xserver = {

8
nixos/components/media/video.nix
View file

@ -3,7 +3,7 @@
with lib; with lib;
let let
obs-cmd = pkgs.unstable.rustPlatform.buildRustPackage obs-cmd = pkgs.rustPlatform.buildRustPackage
rec { rec {
pname = "obs-cmd"; pname = "obs-cmd";
version = "v0.15.2"; version = "v0.15.2";
@ -128,8 +128,8 @@ in
boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ]; boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
unstable.youtube-dl youtube-dl
unstable.yt-dlp yt-dlp
mplayer mplayer
mpv mpv
mpvReview mpvReview
@ -140,7 +140,7 @@ in
# obs studio stuff # obs studio stuff
unstable.obs-cli obs-cli
v4l-utils v4l-utils
obs-cmd obs-cmd

2
nixos/components/monitor/opentelemetry.nix
View file

@ -38,7 +38,7 @@ in
(mkIf config.components.monitor.opentelemetry.enable { (mkIf config.components.monitor.opentelemetry.enable {
services.opentelemetry-collector = { services.opentelemetry-collector = {
enable = true; enable = true;
package = pkgs.unstable.opentelemetry-collector-contrib; package = pkgs.opentelemetry-collector-contrib;
}; };
}) })

2
nixos/components/terminal/heygpt.nix
View file

@ -12,7 +12,7 @@ with lib;
(pkgs.writers.writeBashBin "heygpt" '' (pkgs.writers.writeBashBin "heygpt" ''
export OPENAI_API_BASE="https://api.openai.com/v1" export OPENAI_API_BASE="https://api.openai.com/v1"
export OPENAI_API_KEY=$(pass openai/apikey) export OPENAI_API_KEY=$(pass openai/apikey)
${lib.getExe pkgs.unstable.heygpt} "$@" ${lib.getExe pkgs.heygpt} "$@"
'') '')
(pkgs.writers.writeBashBin "heygpt-models" '' (pkgs.writers.writeBashBin "heygpt-models" ''
export OPENAI_API_KEY=$(pass openai/apikey) export OPENAI_API_KEY=$(pass openai/apikey)

4
nixos/components/terminal/wtf.nix
View file

@ -372,7 +372,7 @@ let
createDashboard = { json, name }: createDashboard = { json, name }:
let configuration = pkgs.writeText "config.yml" (builtins.toJSON json); let configuration = pkgs.writeText "config.yml" (builtins.toJSON json);
in pkgs.writers.writeBashBin name '' in pkgs.writers.writeBashBin name ''
${pkgs.unstable.wtf}/bin/wtfutil --config=${toString configuration} ${pkgs.wtf}/bin/wtfutil --config=${toString configuration}
''; '';
in in
@ -387,7 +387,7 @@ in
services.upower.enable = true; services.upower.enable = true;
environment.systemPackages = [ environment.systemPackages = [
pkgs.unstable.wtf pkgs.wtf
(createDashboard { (createDashboard {
json = qJson; json = qJson;
name = "q"; name = "q";

4
nixos/homes/common/packages.nix
View file

@ -31,9 +31,9 @@ with lib;
killall killall
nix-tree nix-tree
unstable.vulnix vulnix
(writers.writeBashBin "vulnix-system" '' (writers.writeBashBin "vulnix-system" ''
${unstable.vulnix}/bin/vulnix --profile /nix/var/nix/profiles/system ${vulnix}/bin/vulnix --profile /nix/var/nix/profiles/system
'') '')
]; ];

4
nixos/homes/common/terminal.nix
View file

@ -36,8 +36,8 @@
enable = true; enable = true;
enableBashIntegration = true; enableBashIntegration = true;
enableZshIntegration = true; enableZshIntegration = true;
#package = pkgs.unstable.atuin; #package = pkgs.atuin;
package = pkgs.unstable.atuin.overrideAttrs (_old: { package = pkgs.atuin.overrideAttrs (_old: {
# as cursed as doing mitigations=off in the kernel command line # as cursed as doing mitigations=off in the kernel command line
patches = [ "${assets}/0001-make-atuin-on-zfs-fast-again.patch" ]; patches = [ "${assets}/0001-make-atuin-on-zfs-fast-again.patch" ];
}); });

21
nixos/homes/palo/packages/development.nix
View file

@ -10,22 +10,21 @@ with lib;
home.packages = [ home.packages = [
# general # general
unstable.jetbrains.idea-ultimate jetbrains.idea-ultimate
#vscode #vscode
jetbrains.mps jetbrains.mps
jetbrains.datagrip
unstable.jetbrains.datagrip
# Rust # Rust
# ---- # ----
unstable.jetbrains.clion jetbrains.clion
gcc gcc
rustup rustup
# Python # Python
# ------ # ------
unstable.jetbrains.pycharm-professional jetbrains.pycharm-professional
# planing # planing
((ganttproject-bin.override { ((ganttproject-bin.override {
@ -87,14 +86,14 @@ with lib;
miller miller
# nomad # nomad
unstable.nomad nomad
unstable.vault vault
unstable.consul consul
wander wander
# terraform # terraform
unstable.terragrunt terragrunt
unstable.terraform terraform
terraform-docs terraform-docs
awscli2 awscli2
@ -102,7 +101,7 @@ with lib;
python3Full python3Full
pipenv pipenv
unstable.mdbook mdbook
nodePackages.prettier nodePackages.prettier
shfmt shfmt

2
nixos/homes/palo/packages/packages.nix
View file

@ -42,7 +42,7 @@ with lib;
nginx-config-formatter nginx-config-formatter
unstable.yt-dlp yt-dlp
OSCAR OSCAR

2
nixos/homes/palo/taskwarrior.nix
View file

@ -74,7 +74,7 @@ in
taskwarrior-hooks taskwarrior-hooks
(pkgs.writeShellScriptBin "tsak" ''${pkgs.taskwarrior}/bin/task "$@"'') (pkgs.writeShellScriptBin "tsak" ''${pkgs.taskwarrior}/bin/task "$@"'')
unstable.vit vit
(pkgs.writers.writeBashBin "active" "${taskwarrior-tui}/bin/taskwarrior-tui -r active") (pkgs.writers.writeBashBin "active" "${taskwarrior-tui}/bin/taskwarrior-tui -r active")
(pkgs.writers.writeBashBin "todo" "${taskwarrior-tui}/bin/taskwarrior-tui -r todo") (pkgs.writers.writeBashBin "todo" "${taskwarrior-tui}/bin/taskwarrior-tui -r todo")

2
nixos/homes/tina/packages.nix
View file

@ -19,7 +19,7 @@ with lib;
bitwarden bitwarden
unstable.yt-dlp yt-dlp
# office # office
pdfarranger pdfarranger

4
nixos/legacy/robi/packages.nix
View file

@ -5,9 +5,9 @@
youtube-dl youtube-dl
ipset # for sshguard ipset # for sshguard
unstable.vulnix vulnix
(pkgs.writers.writeBashBin "vulnix-system" '' (pkgs.writers.writeBashBin "vulnix-system" ''
${pkgs.unstable.vulnix}/bin/vulnix --profile /nix/var/nix/profiles/system ${pkgs.vulnix}/bin/vulnix --profile /nix/var/nix/profiles/system
'') '')
]; ];

2
nixos/machines/chungus/media-audiobookshelf.nix
View file

@ -26,7 +26,7 @@ in
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
WorkingDirectory = "/srv/audiobookshelf"; WorkingDirectory = "/srv/audiobookshelf";
ExecStart = "${unstable.audiobookshelf}/bin/audiobookshelf --port ${toString port}"; ExecStart = "${audiobookshelf}/bin/audiobookshelf --port ${toString port}";
ExecReload = "${util-linux}/bin/kill -HUP $MAINPID"; ExecReload = "${util-linux}/bin/kill -HUP $MAINPID";
Restart = "always"; Restart = "always";
User = config.users.users.audiobookshelf.name; User = config.users.users.audiobookshelf.name;

2
nixos/machines/chungus/service-atuin.nix
View file

@ -1,7 +1,7 @@
{ config, pkgs, assets, ... }: { { config, pkgs, assets, ... }: {
services.atuin = { services.atuin = {
enable = true; enable = true;
package = pkgs.unstable.atuin.overrideAttrs (_old: { package = pkgs.atuin.overrideAttrs (_old: {
# as cursed as doing mitigations=off in the kernel command line # as cursed as doing mitigations=off in the kernel command line
patches = [ "${assets}/0001-make-atuin-on-zfs-fast-again.patch" ]; patches = [ "${assets}/0001-make-atuin-on-zfs-fast-again.patch" ];
}); });

2
nixos/machines/chungus/services-vault.nix
View file

@ -3,6 +3,6 @@
services.vault = { services.vault = {
enable = true; enable = true;
#adress = "chungus.private:8200"; #adress = "chungus.private:8200";
package = pkgs.unstable.vault; package = pkgs.vault;
}; };
} }

6
nixos/system/all/defaults.nix
View file

@ -34,12 +34,6 @@
#environment.variables.NIX_PATH = lib.mkForce "/var/src"; #environment.variables.NIX_PATH = lib.mkForce "/var/src";
nix.nixPath = [ "nixpkgs=${pkgs.path}" ]; nix.nixPath = [ "nixpkgs=${pkgs.path}" ];
# how much configurations should be kept?
boot.loader.systemd-boot.configurationLimit = lib.mkDefault 3;
boot.loader.generic-extlinux-compatible.configurationLimit = lib.mkDefault 3;
boot.loader.grub.configurationLimit = lib.mkDefault 3;
# Machines should be fast by default # Machines should be fast by default
# ---------------------------------- # ----------------------------------
powerManagement.cpuFreqGovernor = lib.mkOverride 1001 "ondemand"; powerManagement.cpuFreqGovernor = lib.mkOverride 1001 "ondemand";