From 4198f3d2d9af96843623982a65ababd994b0452f Mon Sep 17 00:00:00 2001 From: materus Date: Mon, 20 Nov 2023 14:14:23 +0100 Subject: [PATCH] configurations: update --- .../host/materusPC/hardware/default.nix | 2 +- .../profile/home/editor/emacs/init.nix | 7 -- extraFiles/config/emacs/early-init.el | 10 +-- extraFiles/config/emacs/init.el | 30 ++++++- flake.lock | 90 +++++++++---------- flake.nix | 6 +- 6 files changed, 81 insertions(+), 64 deletions(-) diff --git a/configurations/host/materusPC/hardware/default.nix b/configurations/host/materusPC/hardware/default.nix index 7c3454d..0088f65 100644 --- a/configurations/host/materusPC/hardware/default.nix +++ b/configurations/host/materusPC/hardware/default.nix @@ -8,7 +8,7 @@ ]; hardware.firmware = with pkgs; [ #materusArg.pkgs.amdgpu-pro-libs.firmware.vcn - #materusArg.pkgs.amdgpu-pro-libs.firmware + materusArg.pkgs.amdgpu-pro-libs.firmware linux-firmware alsa-firmware sof-firmware diff --git a/configurations/profile/home/editor/emacs/init.nix b/configurations/profile/home/editor/emacs/init.nix index 385dc94..c609900 100644 --- a/configurations/profile/home/editor/emacs/init.nix +++ b/configurations/profile/home/editor/emacs/init.nix @@ -5,13 +5,6 @@ ${builtins.readFile (path + "early-init.el")} ''; initText = '' - (defvar materus/init-early nil) - (unless materus/init-early - (tool-bar-mode -1) - (setq initial-major-mode 'fundamental-mode) - (setq-default package-quickstart t) - (setq native-comp-speed 3) - ) (defvar materus/init-from-home nil) (when materus/init-from-home (setq-default inhibit-defaul-init 1) diff --git a/extraFiles/config/emacs/early-init.el b/extraFiles/config/emacs/early-init.el index 3746dcd..7dfb587 100644 --- a/extraFiles/config/emacs/early-init.el +++ b/extraFiles/config/emacs/early-init.el @@ -8,18 +8,16 @@ (setq initial-major-mode 'fundamental-mode) (setq-default package-quickstart t) (setq native-comp-speed 3) +(add-hook 'emacs-startup-hook (lambda () (package-initialize) + (setq gc-cons-threshold 100000000 ; ~100mb + gc-cons-percentage 0.1) +)) (unless (daemonp) (setq gc-cons-threshold most-positive-fixnum ; 2^61 bytes gc-cons-percentage 0.6) (setq package-enable-at-startup nil) - (add-hook 'emacs-startup-hook (lambda () (package-initialize) - (setq gc-cons-threshold 16777216 ; 16mb - gc-cons-percentage 0.1) - )) - - (advice-add #'tty-run-terminal-initialization :override #'ignore) (add-hook 'window-setup-hook (lambda () diff --git a/extraFiles/config/emacs/init.el b/extraFiles/config/emacs/init.el index 8580c39..b49ad81 100644 --- a/extraFiles/config/emacs/init.el +++ b/extraFiles/config/emacs/init.el @@ -2,7 +2,33 @@ (setq native-comp-async-report-warnings-errors nil) (setq package-enable-at-startup nil) (setq frame-inhibit-implied-resize t) - +(defvar materus/init-early nil) +(unless materus/init-early + (tool-bar-mode -1) + (setq initial-major-mode 'fundamental-mode) + (setq-default package-quickstart t) + (setq native-comp-speed 3) + (add-hook 'emacs-startup-hook (lambda () (package-initialize) + (setq gc-cons-threshold 100000000 ; ~100mb + gc-cons-percentage 0.1) + )) + (unless (daemonp) + (setq gc-cons-threshold most-positive-fixnum ; 2^61 bytes + gc-cons-percentage 0.6) + (setq package-enable-at-startup nil) + + (advice-add #'tty-run-terminal-initialization :override #'ignore) + (add-hook 'window-setup-hook + (lambda () + (advice-remove #'tty-run-terminal-initialization #'ignore) + (tty-run-terminal-initialization (selected-frame) nil t) + ) + ) +) +) +(setq auto-save-list-file-prefix (concat user-emacs-directory "backups/")) +(setq backup-directory-alist + `(("." . ,(concat user-emacs-directory "backups/")))) (require 'telephone-line) (require 'elcord) @@ -19,7 +45,7 @@ - +(setq read-process-output-max (* 1024 1024 3)) (setq custom-file (concat user-emacs-directory "custom.el")) (when (or (not (display-graphic-p)) (daemonp)) (xterm-mouse-mode 1) diff --git a/flake.lock b/flake.lock index 3256544..ec550da 100644 --- a/flake.lock +++ b/flake.lock @@ -64,11 +64,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1699954689, - "narHash": "sha256-gJtxMQotdEyiuGoiPPSdYqa8Pdw9ptgFFMrxKsWKj54=", + "lastModified": 1700470498, + "narHash": "sha256-NCz/PuDFJ0SO7QZzznK9Os6x7hij0ld/chr5x1RYcUo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "1d4ed29d4d9d076210485697c325f8d6914d908f", + "rev": "a70fd6e93de6f0d0bca3c02f9cc1acbaa914254e", "type": "github" }, "original": { @@ -88,11 +88,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1699954689, - "narHash": "sha256-gJtxMQotdEyiuGoiPPSdYqa8Pdw9ptgFFMrxKsWKj54=", + "lastModified": 1700470498, + "narHash": "sha256-NCz/PuDFJ0SO7QZzznK9Os6x7hij0ld/chr5x1RYcUo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "1d4ed29d4d9d076210485697c325f8d6914d908f", + "rev": "a70fd6e93de6f0d0bca3c02f9cc1acbaa914254e", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1699748081, - "narHash": "sha256-MOmMapBydd7MTjhX4eeQZzKlCABWw8W6iSHSG4OeFKE=", + "lastModified": 1700392168, + "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=", "owner": "nix-community", "repo": "home-manager", - "rev": "04bac349d585c9df38d78e0285b780a140dc74a4", + "rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e", "type": "github" }, "original": { @@ -167,11 +167,11 @@ ] }, "locked": { - "lastModified": 1699783872, - "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", + "lastModified": 1700419052, + "narHash": "sha256-U6a5f9ynbzcp8PMIHULbHPkbwp7YfPKOYmTcLqlalD4=", "owner": "nix-community", "repo": "home-manager", - "rev": "280721186ab75a76537713ec310306f0eba3e407", + "rev": "993fb02d20760067b8ee19c713d94cee07037759", "type": "github" }, "original": { @@ -186,11 +186,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1699783872, - "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", + "lastModified": 1700419052, + "narHash": "sha256-U6a5f9ynbzcp8PMIHULbHPkbwp7YfPKOYmTcLqlalD4=", "owner": "nix-community", "repo": "home-manager", - "rev": "280721186ab75a76537713ec310306f0eba3e407", + "rev": "993fb02d20760067b8ee19c713d94cee07037759", "type": "github" }, "original": { @@ -254,11 +254,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1699954245, - "narHash": "sha256-CSnfeOHc/wco8amdA0j268OaLrMcI5gGtK6Zm+y3lT0=", + "lastModified": 1700392353, + "narHash": "sha256-KARn8aVJu5fdW0jdJYoOQ1SPqWlNdz4l7r90NbArWSY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "df9bb8a436607da124e8cfa0fd19e70e9d9e0b7b", + "rev": "2b00bc76dc893cd996a3d76a2f059d657a5ef37a", "type": "github" }, "original": { @@ -270,11 +270,11 @@ }, "nixos-hardware_2": { "locked": { - "lastModified": 1699954245, - "narHash": "sha256-CSnfeOHc/wco8amdA0j268OaLrMcI5gGtK6Zm+y3lT0=", + "lastModified": 1700392353, + "narHash": "sha256-KARn8aVJu5fdW0jdJYoOQ1SPqWlNdz4l7r90NbArWSY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "df9bb8a436607da124e8cfa0fd19e70e9d9e0b7b", + "rev": "2b00bc76dc893cd996a3d76a2f059d657a5ef37a", "type": "github" }, "original": { @@ -286,11 +286,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697456312, - "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", + "lastModified": 1700204040, + "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", + "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", "type": "github" }, "original": { @@ -302,11 +302,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1699596684, - "narHash": "sha256-XSXP8zjBZJBVvpNb2WmY0eW8O2ce+sVyj1T0/iBRIvg=", + "lastModified": 1700403855, + "narHash": "sha256-Q0Uzjik9kUTN9pd/kp52XJi5kletBhy29ctBlAG+III=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da4024d0ead5d7820f6bd15147d3fe2a0c0cec73", + "rev": "0c5678df521e1407884205fe3ce3cf1d7df297db", "type": "github" }, "original": { @@ -318,11 +318,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1699596684, - "narHash": "sha256-XSXP8zjBZJBVvpNb2WmY0eW8O2ce+sVyj1T0/iBRIvg=", + "lastModified": 1700403855, + "narHash": "sha256-Q0Uzjik9kUTN9pd/kp52XJi5kletBhy29ctBlAG+III=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da4024d0ead5d7820f6bd15147d3fe2a0c0cec73", + "rev": "0c5678df521e1407884205fe3ce3cf1d7df297db", "type": "github" }, "original": { @@ -334,11 +334,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1699596684, - "narHash": "sha256-XSXP8zjBZJBVvpNb2WmY0eW8O2ce+sVyj1T0/iBRIvg=", + "lastModified": 1700403855, + "narHash": "sha256-Q0Uzjik9kUTN9pd/kp52XJi5kletBhy29ctBlAG+III=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da4024d0ead5d7820f6bd15147d3fe2a0c0cec73", + "rev": "0c5678df521e1407884205fe3ce3cf1d7df297db", "type": "github" }, "original": { @@ -350,11 +350,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1699781429, - "narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=", + "lastModified": 1700390070, + "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e44462d6021bfe23dfb24b775cc7c390844f773d", + "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", "type": "github" }, "original": { @@ -380,11 +380,11 @@ }, "nur_2": { "locked": { - "lastModified": 1699957785, - "narHash": "sha256-N7XJ+Otvn5GERktkIxw6K757JsmfvyO7I95VPgk38Z8=", + "lastModified": 1700480813, + "narHash": "sha256-WICrrmyn9Y7tZrqKBtw9rGjOJdZeSXJO9q+l7BZDa7g=", "owner": "nix-community", "repo": "NUR", - "rev": "34dadf63b2715951bec44a3ba01c4e72e07900dc", + "rev": "f8d15f19746eedce261e4f869634f48705de0716", "type": "github" }, "original": { @@ -410,11 +410,11 @@ }, "nur_4": { "locked": { - "lastModified": 1699957785, - "narHash": "sha256-N7XJ+Otvn5GERktkIxw6K757JsmfvyO7I95VPgk38Z8=", + "lastModified": 1700480813, + "narHash": "sha256-WICrrmyn9Y7tZrqKBtw9rGjOJdZeSXJO9q+l7BZDa7g=", "owner": "nix-community", "repo": "NUR", - "rev": "34dadf63b2715951bec44a3ba01c4e72e07900dc", + "rev": "f8d15f19746eedce261e4f869634f48705de0716", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "nur_5": { "locked": { - "lastModified": 1699957785, - "narHash": "sha256-N7XJ+Otvn5GERktkIxw6K757JsmfvyO7I95VPgk38Z8=", + "lastModified": 1700480813, + "narHash": "sha256-WICrrmyn9Y7tZrqKBtw9rGjOJdZeSXJO9q+l7BZDa7g=", "owner": "nix-community", "repo": "NUR", - "rev": "34dadf63b2715951bec44a3ba01c4e72e07900dc", + "rev": "f8d15f19746eedce261e4f869634f48705de0716", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4907f5d..2a9fb82 100644 --- a/flake.nix +++ b/flake.nix @@ -10,12 +10,12 @@ nixpkgs = { type = "github"; - owner = "NixOS"; - repo = "nixpkgs"; + owner = "NixOS"; + repo = "nixpkgs"; ref = "nixos-unstable"; }; - configInputs = { + configInputs = { type = "github"; owner = "materusPL"; repo = "nixos-config";