upgrade cream
This commit is contained in:
parent
40f8d7f4be
commit
aa11982ecb
15 changed files with 51 additions and 50 deletions
|
@ -18,7 +18,6 @@
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
# installed packages
|
# installed packages
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
#style
|
#style
|
||||||
most
|
most
|
||||||
|
|
|
@ -20,7 +20,6 @@
|
||||||
'';
|
'';
|
||||||
|
|
||||||
networking.hostName = "translate";
|
networking.hostName = "translate";
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
|
|
||||||
programs.bash = {
|
programs.bash = {
|
||||||
enableCompletion = true;
|
enableCompletion = true;
|
||||||
|
|
|
@ -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 = {
|
home-manager.users.mainUser = {
|
||||||
programs.doom-emacs = {
|
programs.doom-emacs = {
|
||||||
enable = lib.mkDefault true;
|
enable = lib.mkDefault true;
|
||||||
|
@ -14,11 +22,11 @@
|
||||||
; (font-spec :family "Terminus" :size ${toString config.programs.custom.urxvt.fontSize} :weight 'light))
|
; (font-spec :family "Terminus" :size ${toString config.programs.custom.urxvt.fontSize} :weight 'light))
|
||||||
'';
|
'';
|
||||||
|
|
||||||
emacsPackagesOverlay = self: super: {
|
#emacsPackagesOverlay = self: super: {
|
||||||
# fixes https://github.com/vlaci/nix-doom-emacs/issues/394
|
# # fixes https://github.com/vlaci/nix-doom-emacs/issues/394
|
||||||
gitignore-mode = pkgs.emacsPackages.git-modes;
|
# gitignore-mode = pkgs.emacsPackages.git-modes;
|
||||||
gitconfig-mode = pkgs.emacsPackages.git-modes;
|
# gitconfig-mode = pkgs.emacsPackages.git-modes;
|
||||||
};
|
#};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
|
|
|
@ -23,11 +23,12 @@ with lib;
|
||||||
home.shellAliases.cat = "${pkgs.bat}/bin/bat";
|
home.shellAliases.cat = "${pkgs.bat}/bin/bat";
|
||||||
|
|
||||||
# a better ls
|
# a better ls
|
||||||
programs.exa = {
|
# todo what's the new shit?
|
||||||
enable = true;
|
#programs.eza = {
|
||||||
enableAliases = true;
|
# enable = true;
|
||||||
};
|
# enableAliases = true;
|
||||||
home.shellAliases.llt = "${pkgs.exa}/bin/exa -a --tree";
|
#};
|
||||||
|
home.shellAliases.llt = "${pkgs.eza}/bin/exa -a --tree";
|
||||||
|
|
||||||
# use z instead of cd
|
# use z instead of cd
|
||||||
# use zi to fuzzy search through all registered directories
|
# use zi to fuzzy search through all registered directories
|
||||||
|
|
|
@ -95,10 +95,6 @@
|
||||||
kernelModules = [ "e1000e" ];
|
kernelModules = [ "e1000e" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
# nixpkgs.config.packageOverrides = pkgs: {
|
|
||||||
# vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
|
|
||||||
# };
|
|
||||||
hardware.opengl = {
|
hardware.opengl = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
|
|
|
@ -31,6 +31,8 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
components.gui.enable = true;
|
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.mainUser.enable = true;
|
||||||
components.media.enable = true;
|
components.media.enable = true;
|
||||||
components.media.tts-client.enable = false;
|
components.media.tts-client.enable = false;
|
||||||
|
@ -82,7 +84,7 @@
|
||||||
|
|
||||||
networking.hostName = "cream";
|
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
|
# make sure battery is charged in a way to live for a long time
|
||||||
services.power-profiles-daemon.enable = false;
|
services.power-profiles-daemon.enable = false;
|
||||||
|
@ -138,7 +140,7 @@
|
||||||
height = 1504;
|
height = 1504;
|
||||||
};
|
};
|
||||||
|
|
||||||
services.xserver.desktopManager.gnome.enable = true;
|
#services.xserver.desktopManager.gnome.enable = true;
|
||||||
#services.xserver.displayManager.lightdm.enable = false;
|
#services.xserver.displayManager.lightdm.enable = false;
|
||||||
#services.xserver.displayManager.sddm.enable = true;
|
#services.xserver.displayManager.sddm.enable = true;
|
||||||
|
|
||||||
|
|
|
@ -63,8 +63,7 @@ in
|
||||||
inkscape
|
inkscape
|
||||||
imagemagick
|
imagemagick
|
||||||
|
|
||||||
bitwig-studio3
|
#bitwig-studio3
|
||||||
#sononym-crawler
|
|
||||||
darktable
|
darktable
|
||||||
|
|
||||||
blender
|
blender
|
||||||
|
@ -136,9 +135,9 @@ in
|
||||||
|
|
||||||
unstable.yt-dlp
|
unstable.yt-dlp
|
||||||
|
|
||||||
unstable.terragrunt
|
#unstable.terragrunt
|
||||||
unstable.terraform
|
#unstable.terraform
|
||||||
terraform-docs
|
#terraform-docs
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
{
|
|
||||||
nixpkgs.config.permittedInsecurePackages = [
|
|
||||||
"python-2.7.18.6"
|
|
||||||
];
|
|
||||||
}
|
|
|
@ -26,7 +26,6 @@
|
||||||
|
|
||||||
# allow un-free
|
# allow un-free
|
||||||
# -------------
|
# -------------
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
environment.variables.NIXPKGS_ALLOW_UNFREE = "1";
|
environment.variables.NIXPKGS_ALLOW_UNFREE = "1";
|
||||||
|
|
||||||
# some system stuff
|
# some system stuff
|
||||||
|
|
|
@ -73,9 +73,6 @@
|
||||||
driSupport = true;
|
driSupport = true;
|
||||||
driSupport32Bit = true;
|
driSupport32Bit = true;
|
||||||
};
|
};
|
||||||
#nixpkgs.config.packageOverrides = pkgs: {
|
|
||||||
# vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
|
|
||||||
#};
|
|
||||||
|
|
||||||
services.xserver.displayManager.defaultSession = "plasma";
|
services.xserver.displayManager.defaultSession = "plasma";
|
||||||
|
|
||||||
|
|
|
@ -98,8 +98,5 @@
|
||||||
driSupport = true;
|
driSupport = true;
|
||||||
driSupport32Bit = true;
|
driSupport32Bit = true;
|
||||||
};
|
};
|
||||||
#nixpkgs.config.packageOverrides = pkgs: {
|
|
||||||
# vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
|
|
||||||
#};
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,7 @@ let callPackage = super.pkgs.callPackage;
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
|
||||||
bitwig-studio3 = callPackage ./bitwig-studio/bitwig-studio3.nix { };
|
#bitwig-studio3 = callPackage ./bitwig-studio/bitwig-studio3.nix { };
|
||||||
emo = callPackage ./emoji { };
|
emo = callPackage ./emoji { };
|
||||||
light-control = callPackage ./light-control { };
|
light-control = callPackage ./light-control { };
|
||||||
otpmenu = callPackage ./otpmenu { };
|
otpmenu = callPackage ./otpmenu { };
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
# allow un-free
|
# allow un-free
|
||||||
# -------------
|
# -------------
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
environment.variables.NIXPKGS_ALLOW_UNFREE = "1";
|
environment.variables.NIXPKGS_ALLOW_UNFREE = "1";
|
||||||
|
|
||||||
# some system stuff
|
# some system stuff
|
||||||
|
|
|
@ -48,7 +48,8 @@ with lib; {
|
||||||
# -------------------------------
|
# -------------------------------
|
||||||
private = {
|
private = {
|
||||||
enable = lib.mkDefault false;
|
enable = lib.mkDefault false;
|
||||||
watch = lib.mkDefault false;
|
#watch = lib.mkDefault false;
|
||||||
|
path = lib.mkDefault "/tmp/private";
|
||||||
devices = [ "chungus" "pepe" "cream" "sterni" "mobi" "bobi" ];
|
devices = [ "chungus" "pepe" "cream" "sterni" "mobi" "bobi" ];
|
||||||
versioning = {
|
versioning = {
|
||||||
type = "simple";
|
type = "simple";
|
||||||
|
@ -57,7 +58,8 @@ with lib; {
|
||||||
};
|
};
|
||||||
art = {
|
art = {
|
||||||
enable = lib.mkDefault false;
|
enable = lib.mkDefault false;
|
||||||
watch = lib.mkDefault false;
|
#watch = lib.mkDefault false;
|
||||||
|
path = lib.mkDefault "/tmp/art";
|
||||||
devices = [ "chungus" "pepe" "cream" "sterni" "bumba" ];
|
devices = [ "chungus" "pepe" "cream" "sterni" "bumba" ];
|
||||||
versioning = {
|
versioning = {
|
||||||
type = "simple";
|
type = "simple";
|
||||||
|
@ -66,7 +68,8 @@ with lib; {
|
||||||
};
|
};
|
||||||
books = {
|
books = {
|
||||||
enable = lib.mkDefault false;
|
enable = lib.mkDefault false;
|
||||||
watch = lib.mkDefault false;
|
#watch = lib.mkDefault false;
|
||||||
|
path = lib.mkDefault "/tmp/books";
|
||||||
devices = [ "chungus" "robi" ];
|
devices = [ "chungus" "robi" ];
|
||||||
versioning = {
|
versioning = {
|
||||||
type = "simple";
|
type = "simple";
|
||||||
|
@ -75,7 +78,8 @@ with lib; {
|
||||||
};
|
};
|
||||||
password-store = {
|
password-store = {
|
||||||
enable = lib.mkDefault false;
|
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" ];
|
devices = [ "chungus" "pepe" "cream" "sterni" "mobi" "bobi" ];
|
||||||
versioning = {
|
versioning = {
|
||||||
type = "simple";
|
type = "simple";
|
||||||
|
@ -84,12 +88,14 @@ with lib; {
|
||||||
};
|
};
|
||||||
desktop = {
|
desktop = {
|
||||||
enable = lib.mkDefault false;
|
enable = lib.mkDefault false;
|
||||||
watch = lib.mkDefault false;
|
#watch = lib.mkDefault false;
|
||||||
|
path = lib.mkDefault "/tmp/desktop";
|
||||||
devices = [ "chungus" "pepe" "cream" "sterni" "mobi" "bobi" ];
|
devices = [ "chungus" "pepe" "cream" "sterni" "mobi" "bobi" ];
|
||||||
};
|
};
|
||||||
finance = {
|
finance = {
|
||||||
enable = lib.mkDefault false;
|
enable = lib.mkDefault false;
|
||||||
watch = lib.mkDefault false;
|
#watch = lib.mkDefault false;
|
||||||
|
path = lib.mkDefault "/tmp/finance";
|
||||||
devices = [ "chungus" "pepe" "cream" "sterni" "mobi" "bobi" ];
|
devices = [ "chungus" "pepe" "cream" "sterni" "mobi" "bobi" ];
|
||||||
versioning = {
|
versioning = {
|
||||||
type = "simple";
|
type = "simple";
|
||||||
|
@ -98,7 +104,8 @@ with lib; {
|
||||||
};
|
};
|
||||||
fotos = {
|
fotos = {
|
||||||
enable = lib.mkDefault false;
|
enable = lib.mkDefault false;
|
||||||
watch = lib.mkDefault false;
|
#watch = lib.mkDefault false;
|
||||||
|
path = lib.mkDefault "/tmp/fotos";
|
||||||
devices = [ "chungus" "pepe" ];
|
devices = [ "chungus" "pepe" ];
|
||||||
versioning = {
|
versioning = {
|
||||||
type = "simple";
|
type = "simple";
|
||||||
|
@ -110,7 +117,8 @@ with lib; {
|
||||||
# ----------------------------------------
|
# ----------------------------------------
|
||||||
lost-fotos = {
|
lost-fotos = {
|
||||||
enable = lib.mkDefault false;
|
enable = lib.mkDefault false;
|
||||||
watch = lib.mkDefault false;
|
#watch = lib.mkDefault false;
|
||||||
|
path = lib.mkDefault "/tmp/lost-fotos";
|
||||||
devices = [ "chungus" "pepe" "robi" ];
|
devices = [ "chungus" "pepe" "robi" ];
|
||||||
versioning = {
|
versioning = {
|
||||||
type = "simple";
|
type = "simple";
|
||||||
|
@ -125,7 +133,8 @@ with lib; {
|
||||||
music-projects = {
|
music-projects = {
|
||||||
enable = lib.mkDefault false;
|
enable = lib.mkDefault false;
|
||||||
id = "acfhu-r4t4f";
|
id = "acfhu-r4t4f";
|
||||||
watch = lib.mkDefault false;
|
path = lib.mkDefault "/tmp/lost-fotos";
|
||||||
|
#watch = lib.mkDefault false;
|
||||||
devices = [ "chungus" "pepe" "cream" "sterni" "robi" ];
|
devices = [ "chungus" "pepe" "cream" "sterni" "robi" ];
|
||||||
versioning = {
|
versioning = {
|
||||||
type = "simple";
|
type = "simple";
|
||||||
|
@ -134,7 +143,8 @@ with lib; {
|
||||||
};
|
};
|
||||||
nextcloud_backup = {
|
nextcloud_backup = {
|
||||||
enable = lib.mkDefault false;
|
enable = lib.mkDefault false;
|
||||||
watch = lib.mkDefault false;
|
#watch = lib.mkDefault false;
|
||||||
|
path = lib.mkDefault "/tmp/lost-fotos";
|
||||||
devices = [ "chungus" "pepe" "robi" ];
|
devices = [ "chungus" "pepe" "robi" ];
|
||||||
versioning = {
|
versioning = {
|
||||||
type = "simple";
|
type = "simple";
|
||||||
|
|
|
@ -245,7 +245,7 @@ in
|
||||||
|
|
||||||
trash-cli
|
trash-cli
|
||||||
|
|
||||||
nix-review
|
nixpkgs-review
|
||||||
units
|
units
|
||||||
|
|
||||||
hub # for github
|
hub # for github
|
||||||
|
|
Loading…
Reference in a new issue