upgrade cream

This commit is contained in:
Ingolf Wagner 2023-12-08 21:27:52 +01:00
parent 40f8d7f4be
commit aa11982ecb
Signed by: palo
GPG key ID: 76BF5F1928B9618B
15 changed files with 51 additions and 50 deletions

View file

@ -18,7 +18,6 @@
}
{
# installed packages
nixpkgs.config.allowUnfree = true;
environment.systemPackages = with pkgs; [
#style
most

View file

@ -20,7 +20,6 @@
'';
networking.hostName = "translate";
nixpkgs.config.allowUnfree = true;
programs.bash = {
enableCompletion = true;

View file

@ -1,6 +1,14 @@
{ config, pkgs, lib, ... }: {
{ config, pkgs, lib, ... }:
with lib;
{
options.components.gui.emacs.enable = mkOption {
type = lib.types.bool;
default = config.components.gui.enable;
};
config = mkIf (config.components.gui.emacs.enable) {
config = lib.mkIf config.components.gui.enable {
home-manager.users.mainUser = {
programs.doom-emacs = {
enable = lib.mkDefault true;
@ -14,11 +22,11 @@
; (font-spec :family "Terminus" :size ${toString config.programs.custom.urxvt.fontSize} :weight 'light))
'';
emacsPackagesOverlay = self: super: {
# fixes https://github.com/vlaci/nix-doom-emacs/issues/394
gitignore-mode = pkgs.emacsPackages.git-modes;
gitconfig-mode = pkgs.emacsPackages.git-modes;
};
#emacsPackagesOverlay = self: super: {
# # fixes https://github.com/vlaci/nix-doom-emacs/issues/394
# gitignore-mode = pkgs.emacsPackages.git-modes;
# gitconfig-mode = pkgs.emacsPackages.git-modes;
#};
};
};
environment.systemPackages = [

View file

@ -23,11 +23,12 @@ with lib;
home.shellAliases.cat = "${pkgs.bat}/bin/bat";
# a better ls
programs.exa = {
enable = true;
enableAliases = true;
};
home.shellAliases.llt = "${pkgs.exa}/bin/exa -a --tree";
# todo what's the new shit?
#programs.eza = {
# enable = true;
# enableAliases = true;
#};
home.shellAliases.llt = "${pkgs.eza}/bin/exa -a --tree";
# use z instead of cd
# use zi to fuzzy search through all registered directories

View file

@ -95,10 +95,6 @@
kernelModules = [ "e1000e" ];
};
# nixpkgs.config.packageOverrides = pkgs: {
# vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
# };
hardware.opengl = {
enable = true;
extraPackages = with pkgs; [

View file

@ -31,6 +31,8 @@
];
components.gui.enable = true;
# todo enable again
components.gui.emacs.enable = false; # because it's not working at the moment (again)
components.mainUser.enable = true;
components.media.enable = true;
components.media.tts-client.enable = false;
@ -82,7 +84,7 @@
networking.hostName = "cream";
services.flatpak.enable = true;
#services.flatpak.enable = true;
# make sure battery is charged in a way to live for a long time
services.power-profiles-daemon.enable = false;
@ -138,7 +140,7 @@
height = 1504;
};
services.xserver.desktopManager.gnome.enable = true;
#services.xserver.desktopManager.gnome.enable = true;
#services.xserver.displayManager.lightdm.enable = false;
#services.xserver.displayManager.sddm.enable = true;

View file

@ -63,8 +63,7 @@ in
inkscape
imagemagick
bitwig-studio3
#sononym-crawler
#bitwig-studio3
darktable
blender
@ -136,9 +135,9 @@ in
unstable.yt-dlp
unstable.terragrunt
unstable.terraform
terraform-docs
#unstable.terragrunt
#unstable.terraform
#terraform-docs
];

View file

@ -1,5 +0,0 @@
{
nixpkgs.config.permittedInsecurePackages = [
"python-2.7.18.6"
];
}

View file

@ -26,7 +26,6 @@
# allow un-free
# -------------
nixpkgs.config.allowUnfree = true;
environment.variables.NIXPKGS_ALLOW_UNFREE = "1";
# some system stuff

View file

@ -73,9 +73,6 @@
driSupport = true;
driSupport32Bit = true;
};
#nixpkgs.config.packageOverrides = pkgs: {
# vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
#};
services.xserver.displayManager.defaultSession = "plasma";

View file

@ -98,8 +98,5 @@
driSupport = true;
driSupport32Bit = true;
};
#nixpkgs.config.packageOverrides = pkgs: {
# vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
#};
}

View file

@ -6,7 +6,7 @@ let callPackage = super.pkgs.callPackage;
in {
bitwig-studio3 = callPackage ./bitwig-studio/bitwig-studio3.nix { };
#bitwig-studio3 = callPackage ./bitwig-studio/bitwig-studio3.nix { };
emo = callPackage ./emoji { };
light-control = callPackage ./light-control { };
otpmenu = callPackage ./otpmenu { };

View file

@ -8,7 +8,6 @@
# allow un-free
# -------------
nixpkgs.config.allowUnfree = true;
environment.variables.NIXPKGS_ALLOW_UNFREE = "1";
# some system stuff

View file

@ -48,7 +48,8 @@ with lib; {
# -------------------------------
private = {
enable = lib.mkDefault false;
watch = lib.mkDefault false;
#watch = lib.mkDefault false;
path = lib.mkDefault "/tmp/private";
devices = [ "chungus" "pepe" "cream" "sterni" "mobi" "bobi" ];
versioning = {
type = "simple";
@ -57,7 +58,8 @@ with lib; {
};
art = {
enable = lib.mkDefault false;
watch = lib.mkDefault false;
#watch = lib.mkDefault false;
path = lib.mkDefault "/tmp/art";
devices = [ "chungus" "pepe" "cream" "sterni" "bumba" ];
versioning = {
type = "simple";
@ -66,7 +68,8 @@ with lib; {
};
books = {
enable = lib.mkDefault false;
watch = lib.mkDefault false;
#watch = lib.mkDefault false;
path = lib.mkDefault "/tmp/books";
devices = [ "chungus" "robi" ];
versioning = {
type = "simple";
@ -75,7 +78,8 @@ with lib; {
};
password-store = {
enable = lib.mkDefault false;
watch = lib.mkDefault false;
#watch = lib.mkDefault false;
path = lib.mkDefault "/tmp/password-store";
devices = [ "chungus" "pepe" "cream" "sterni" "mobi" "bobi" ];
versioning = {
type = "simple";
@ -84,12 +88,14 @@ with lib; {
};
desktop = {
enable = lib.mkDefault false;
watch = lib.mkDefault false;
#watch = lib.mkDefault false;
path = lib.mkDefault "/tmp/desktop";
devices = [ "chungus" "pepe" "cream" "sterni" "mobi" "bobi" ];
};
finance = {
enable = lib.mkDefault false;
watch = lib.mkDefault false;
#watch = lib.mkDefault false;
path = lib.mkDefault "/tmp/finance";
devices = [ "chungus" "pepe" "cream" "sterni" "mobi" "bobi" ];
versioning = {
type = "simple";
@ -98,7 +104,8 @@ with lib; {
};
fotos = {
enable = lib.mkDefault false;
watch = lib.mkDefault false;
#watch = lib.mkDefault false;
path = lib.mkDefault "/tmp/fotos";
devices = [ "chungus" "pepe" ];
versioning = {
type = "simple";
@ -110,7 +117,8 @@ with lib; {
# ----------------------------------------
lost-fotos = {
enable = lib.mkDefault false;
watch = lib.mkDefault false;
#watch = lib.mkDefault false;
path = lib.mkDefault "/tmp/lost-fotos";
devices = [ "chungus" "pepe" "robi" ];
versioning = {
type = "simple";
@ -125,7 +133,8 @@ with lib; {
music-projects = {
enable = lib.mkDefault false;
id = "acfhu-r4t4f";
watch = lib.mkDefault false;
path = lib.mkDefault "/tmp/lost-fotos";
#watch = lib.mkDefault false;
devices = [ "chungus" "pepe" "cream" "sterni" "robi" ];
versioning = {
type = "simple";
@ -134,7 +143,8 @@ with lib; {
};
nextcloud_backup = {
enable = lib.mkDefault false;
watch = lib.mkDefault false;
#watch = lib.mkDefault false;
path = lib.mkDefault "/tmp/lost-fotos";
devices = [ "chungus" "pepe" "robi" ];
versioning = {
type = "simple";

View file

@ -245,7 +245,7 @@ in
trash-cli
nix-review
nixpkgs-review
units
hub # for github