From aa11982ecb15d0eec30b96b1383cb70168d9ff44 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Fri, 8 Dec 2023 21:27:52 +0100 Subject: [PATCH] upgrade cream --- images/lib/remote-access.nix | 1 - images/translate-setup/config.nix | 1 - .../gui/home-manager/doom-emacs.nix | 22 +++++++++----- nixos/components/terminal/zsh.nix | 11 +++---- nixos/machines/chungus/configuration.nix | 4 --- nixos/machines/cream/configuration.nix | 6 ++-- nixos/machines/cream/packages.nix | 9 +++--- nixos/machines/cream/strange_2305_upgrade.nix | 5 ---- nixos/machines/dummy/configuration.nix | 1 - nixos/machines/sternchen/configuration.nix | 3 -- nixos/machines/sterni/configuration.nix | 3 -- nixos/pkgs/default.nix | 2 +- nixos/system/all/defaults.nix | 1 - nixos/system/all/syncthing.nix | 30 ++++++++++++------- nixos/system/desktop/packages.nix | 2 +- 15 files changed, 51 insertions(+), 50 deletions(-) delete mode 100644 nixos/machines/cream/strange_2305_upgrade.nix diff --git a/images/lib/remote-access.nix b/images/lib/remote-access.nix index dcd7ff1..b1f71ad 100644 --- a/images/lib/remote-access.nix +++ b/images/lib/remote-access.nix @@ -18,7 +18,6 @@ } { # installed packages - nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ #style most diff --git a/images/translate-setup/config.nix b/images/translate-setup/config.nix index 8ab41a1..a46899a 100644 --- a/images/translate-setup/config.nix +++ b/images/translate-setup/config.nix @@ -20,7 +20,6 @@ ''; networking.hostName = "translate"; - nixpkgs.config.allowUnfree = true; programs.bash = { enableCompletion = true; diff --git a/nixos/components/gui/home-manager/doom-emacs.nix b/nixos/components/gui/home-manager/doom-emacs.nix index 38fbe55..f93838b 100644 --- a/nixos/components/gui/home-manager/doom-emacs.nix +++ b/nixos/components/gui/home-manager/doom-emacs.nix @@ -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 = [ diff --git a/nixos/components/terminal/zsh.nix b/nixos/components/terminal/zsh.nix index ba02044..3b5f063 100644 --- a/nixos/components/terminal/zsh.nix +++ b/nixos/components/terminal/zsh.nix @@ -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 diff --git a/nixos/machines/chungus/configuration.nix b/nixos/machines/chungus/configuration.nix index 689e61b..4cf755f 100644 --- a/nixos/machines/chungus/configuration.nix +++ b/nixos/machines/chungus/configuration.nix @@ -95,10 +95,6 @@ kernelModules = [ "e1000e" ]; }; - - # nixpkgs.config.packageOverrides = pkgs: { - # vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; - # }; hardware.opengl = { enable = true; extraPackages = with pkgs; [ diff --git a/nixos/machines/cream/configuration.nix b/nixos/machines/cream/configuration.nix index 0623daa..b27f70a 100644 --- a/nixos/machines/cream/configuration.nix +++ b/nixos/machines/cream/configuration.nix @@ -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; diff --git a/nixos/machines/cream/packages.nix b/nixos/machines/cream/packages.nix index 59bb84a..7818f1d 100644 --- a/nixos/machines/cream/packages.nix +++ b/nixos/machines/cream/packages.nix @@ -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 ]; diff --git a/nixos/machines/cream/strange_2305_upgrade.nix b/nixos/machines/cream/strange_2305_upgrade.nix deleted file mode 100644 index 8a71835..0000000 --- a/nixos/machines/cream/strange_2305_upgrade.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - nixpkgs.config.permittedInsecurePackages = [ - "python-2.7.18.6" - ]; -} diff --git a/nixos/machines/dummy/configuration.nix b/nixos/machines/dummy/configuration.nix index 4fa8ab7..92356f2 100644 --- a/nixos/machines/dummy/configuration.nix +++ b/nixos/machines/dummy/configuration.nix @@ -26,7 +26,6 @@ # allow un-free # ------------- - nixpkgs.config.allowUnfree = true; environment.variables.NIXPKGS_ALLOW_UNFREE = "1"; # some system stuff diff --git a/nixos/machines/sternchen/configuration.nix b/nixos/machines/sternchen/configuration.nix index b2f3322..ca1e9bc 100644 --- a/nixos/machines/sternchen/configuration.nix +++ b/nixos/machines/sternchen/configuration.nix @@ -73,9 +73,6 @@ driSupport = true; driSupport32Bit = true; }; - #nixpkgs.config.packageOverrides = pkgs: { - # vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; - #}; services.xserver.displayManager.defaultSession = "plasma"; diff --git a/nixos/machines/sterni/configuration.nix b/nixos/machines/sterni/configuration.nix index 8e86ead..aee98d3 100644 --- a/nixos/machines/sterni/configuration.nix +++ b/nixos/machines/sterni/configuration.nix @@ -98,8 +98,5 @@ driSupport = true; driSupport32Bit = true; }; - #nixpkgs.config.packageOverrides = pkgs: { - # vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; - #}; } diff --git a/nixos/pkgs/default.nix b/nixos/pkgs/default.nix index b5286de..248368c 100644 --- a/nixos/pkgs/default.nix +++ b/nixos/pkgs/default.nix @@ -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 { }; diff --git a/nixos/system/all/defaults.nix b/nixos/system/all/defaults.nix index 77f6dbd..a7b16ed 100644 --- a/nixos/system/all/defaults.nix +++ b/nixos/system/all/defaults.nix @@ -8,7 +8,6 @@ # allow un-free # ------------- - nixpkgs.config.allowUnfree = true; environment.variables.NIXPKGS_ALLOW_UNFREE = "1"; # some system stuff diff --git a/nixos/system/all/syncthing.nix b/nixos/system/all/syncthing.nix index 785760a..5acb32a 100644 --- a/nixos/system/all/syncthing.nix +++ b/nixos/system/all/syncthing.nix @@ -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"; diff --git a/nixos/system/desktop/packages.nix b/nixos/system/desktop/packages.nix index f218757..4b9d3d6 100644 --- a/nixos/system/desktop/packages.nix +++ b/nixos/system/desktop/packages.nix @@ -245,7 +245,7 @@ in trash-cli - nix-review + nixpkgs-review units hub # for github