diff --git a/flake.lock b/flake.lock index 8e893be..c161d7c 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ "blocklist-hosts": { "flake": false, "locked": { - "lastModified": 1720371934, - "narHash": "sha256-30Hl4Llh1wetlW3au2/bRR+/m5P9D7QvLGFWAYHKbKs=", + "lastModified": 1719456570, + "narHash": "sha256-FS9+w+9QPBd6hCtX7C5x/xm4nGCA0lOtYgjefkQNbbg=", "owner": "StevenBlack", "repo": "hosts", - "rev": "67448bdb863d266fd6031f1330c8958d84eba1a2", + "rev": "0f8be09978187ba0e4eab2a9e0dcde88f358f1dc", "type": "github" }, "original": { @@ -451,11 +451,11 @@ ] }, "locked": { - "lastModified": 1719827415, - "narHash": "sha256-pvh+1hStXXAZf0sZ1xIJbWGx4u+OGBC1rVx6Wsw0fBw=", + "lastModified": 1717476296, + "narHash": "sha256-ScHe38Tr+TxGURC17kby4mIIxOG3aJvZWXzPM79UnEk=", "owner": "nix-community", "repo": "home-manager", - "rev": "f2e3c19867262dbe84fdfab42467fc8dd83a2005", + "rev": "095ef64aa3b2ab4a4f1bf07f29997e21e3a5576a", "type": "github" }, "original": { @@ -472,11 +472,11 @@ ] }, "locked": { - "lastModified": 1720327769, - "narHash": "sha256-kAsg3Lg4YKKpGw+f1W2s5hzjP8B0y/juowvjK8utIag=", + "lastModified": 1719677234, + "narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=", "owner": "nix-community", "repo": "home-manager", - "rev": "6b7ce96f34b324e4e104abc30d06955d216bac71", + "rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d", "type": "github" }, "original": { @@ -863,11 +863,11 @@ "nmd": "nmd_2" }, "locked": { - "lastModified": 1720396533, - "narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=", + "lastModified": 1710434231, + "narHash": "sha256-yrWnsG28518tbIapJWiluweHORuuIwAQrA8lga0Sqlw=", "owner": "nix-community", "repo": "nix-on-droid", - "rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25", + "rev": "2d93311c4f3f300154d2085e4b4b1d550237da92", "type": "github" }, "original": { @@ -896,11 +896,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720031269, - "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", + "lastModified": 1719506693, + "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", + "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", "type": "github" }, "original": { @@ -927,27 +927,27 @@ }, "nixpkgs-for-bootstrap": { "locked": { - "lastModified": 1720244366, - "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=", + "lastModified": 1708105575, + "narHash": "sha256-sS4AItZeUnAei6v8FqxNlm+/27MPlfoGym/TZP0rmH0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", + "rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", + "rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1719957072, - "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", + "lastModified": 1719234068, + "narHash": "sha256-1AjSIedDC/aERt24KsCUftLpVppW61S7awfjGe7bMio=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", + "rev": "90bd1b26e23760742fdcb6152369919098f05417", "type": "github" }, "original": { @@ -1351,11 +1351,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1720405186, - "narHash": "sha256-7D57KwmTIbsopE/1g8hFeIbVoeJGgU3wfuGYvTlNQG4=", + "lastModified": 1719627476, + "narHash": "sha256-LBfULF+2sCaWmkjmj1LkkGrAS/E9ZdXU1A5wWKjt9p0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f0ca58b37ff4179ce4587589c32205764d9b4a4f", + "rev": "5be53be9e5c766fc72fc5d65ba8a566cc0c3217f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a3568f1..c18ddfc 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,6 @@ bootMode = "uefi"; # uefi or bios bootMountPath = "/boot"; # mount path for efi boot partition; only used for uefi boot mode grubDevice = ""; # device identifier for grub; only used for legacy (bios) boot mode - gpuType = "amd"; # amd, intel or nvidia; only makes some slight mods for amd at the moment }; # ----- USER SETTINGS ----- # @@ -49,7 +48,7 @@ # create patched nixpkgs nixpkgs-patched = - (import inputs.nixpkgs { system = systemSettings.system; rocmSupport = (if systemSettings.gpu == "amd" then true else false); }).applyPatches { + (import inputs.nixpkgs { system = systemSettings.system; }).applyPatches { name = "nixpkgs-patched"; src = inputs.nixpkgs; patches = [ ./patches/emacs-no-version-check.patch ]; diff --git a/profiles/work/home.nix b/profiles/work/home.nix index af0cfd4..fa6fae4 100644 --- a/profiles/work/home.nix +++ b/profiles/work/home.nix @@ -58,8 +58,6 @@ numbat element-desktop-wayland - openai-whisper-cpp - wine bottles # The following requires 64-bit FL Studio (FL64) to be installed to a bottle diff --git a/system/hardware-configuration.nix b/system/hardware-configuration.nix index 34005b9..daf2657 100644 --- a/system/hardware-configuration.nix +++ b/system/hardware-configuration.nix @@ -12,7 +12,7 @@ boot.initrd.kernelModules = [ "radeon" ]; boot.kernelModules = [ "kvm-amd" "radeon" ]; boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; - hardware.opengl.extraPackages = [ pkgs.amdvlk pkgs.rocmPackages.clr.icd ]; + hardware.opengl.extraPackages = [ pkgs.amdvlk ]; hardware.opengl.extraPackages32 = [ pkgs.driversi686Linux.amdvlk ]; systemd.tmpfiles.rules = [ diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el index b03e110..e4ce51f 100644 --- a/user/app/doom-emacs/config.el +++ b/user/app/doom-emacs/config.el @@ -47,8 +47,6 @@ )) ) -(add-to-list 'default-frame-alist '(inhibit-double-buffering . t)) - ;; Icons in completion buffers (add-hook 'marginalia-mode-hook #'all-the-icons-completion-marginalia-setup) (all-the-icons-completion-mode) @@ -59,8 +57,6 @@ ;; Beacon shows where the cursor is, even when fast scrolling (setq beacon-mode t) -(setq company-idle-delay 0.05) - ;; Quicker window management keybindings (bind-key* "C-j" #'evil-window-down) (bind-key* "C-k" #'evil-window-up) @@ -242,10 +238,7 @@ ;;;------ Org mode configuration ------;;; ;; Set default org directory -(setq org-directory "~/Org") -(setq org-attach-directory "~/Org/.attach") -(setq org-attach-id-dir "~/Org/.attach") -(setq org-id-locations-file "~/Org/.orgids") +(setq org-directory "~/.Org") (remove-hook 'after-save-hook #'+literate|recompile-maybe) (set-company-backend! 'org-mode nil) @@ -607,13 +600,19 @@ If the path from LINK does not exist, nil is returned." input-str))))))) ;; Org transclusion -(require 'org-transclusion) -(after! org - (map! :map global-map "" #'org-transclusion-add :leader :prefix "n" :desc "Org Transclusion Mode" "t" #'org-transclusion-mode) - (map! :leader :prefix "n" "l" #'org-transclusion-live-sync-start) - (setq org-transclusion-exclude-elements '(property-drawer keyword)) - (add-hook 'org-mode-hook #'org-transclusion-mode) -) +(use-package! org-transclusion + :after org + :init + (map! + :map global-map "" #'org-transclusion-add + :leader + :prefix "n" + :desc "Org Transclusion Mode" "t" #'org-transclusion-mode)) +(map! :leader :prefix "n" "l" #'org-transclusion-live-sync-start) + +(setq org-transclusion-exclude-elements '(property-drawer keyword)) + +(add-hook 'org-mode-hook #'org-transclusion-mode) (defun org-jekyll-new-post () (interactive) @@ -982,7 +981,8 @@ If the path from LINK does not exist, nil is returned." (add-load-path! "~/.emacs.d/org-nursery/lisp") (require 'org-roam-dblocks) -(add-hook 'org-mode-hook 'org-roam-dblocks-autoupdate-mode) +(use-package org-roam-dblocks + :hook (org-mode . org-roam-dblocks-autoupdate-mode)) (setq org-id-extra-files 'org-agenda-text-search-extra-files) @@ -1036,8 +1036,8 @@ If the path from LINK does not exist, nil is returned." org-agenda-skip-deadline-if-done t org-agenda-skip-scheduled-if-done t org-agenda-skip-scheduled-if-deadline-is-shown t - org-agenda-skip-timestamp-if-deadline-is-shown t - org-log-into-drawer t) + org-agenda-skip-timestamp-if-deadline-is-shown t) + ;; Custom styles for dates in agenda (custom-set-faces! @@ -1491,12 +1491,20 @@ If the path from LINK does not exist, nil is returned." "f u" #'sudo-edit-find-file) ;;;-- LSP stuff ;;;-- -(require 'lsp-mode) -(require 'nix-mode) -(require 'gdscript-mode) +(use-package lsp-mode + :ensure t) + +(use-package nix-mode + :hook (nix-mode . lsp-deferred) + :ensure t) (setq lsp-java-workspace-dir (concat user-home-directory "/.local/share/doom/java-workspace")) +(require 'gdscript-mode) +(use-package gdscript-mode + :hook (gdscript-mode . lsp-deferred) + :ensure t) + (setq lsp-treemacs-deps-position-params '((side . right) (slot . 1) diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org index d8e25a1..ff15424 100644 --- a/user/app/doom-emacs/doom.org +++ b/user/app/doom-emacs/doom.org @@ -110,8 +110,6 @@ Doom Emacs is traditionally installed by cloning the repository ([[https://githu )) ) -(add-to-list 'default-frame-alist '(inhibit-double-buffering . t)) - ;; Icons in completion buffers (add-hook 'marginalia-mode-hook #'all-the-icons-completion-marginalia-setup) (all-the-icons-completion-mode) @@ -122,8 +120,6 @@ Doom Emacs is traditionally installed by cloning the repository ([[https://githu ;; Beacon shows where the cursor is, even when fast scrolling (setq beacon-mode t) -(setq company-idle-delay 0.05) - ;; Quicker window management keybindings (bind-key* "C-j" #'evil-window-down) (bind-key* "C-k" #'evil-window-up) @@ -312,10 +308,7 @@ Doom Emacs is traditionally installed by cloning the repository ([[https://githu ;;;------ Org mode configuration ------;;; ;; Set default org directory -(setq org-directory "~/Org") -(setq org-attach-directory "~/Org/.attach") -(setq org-attach-id-dir "~/Org/.attach") -(setq org-id-locations-file "~/Org/.orgids") +(setq org-directory "~/.Org") (remove-hook 'after-save-hook #'+literate|recompile-maybe) (set-company-backend! 'org-mode nil) @@ -734,13 +727,19 @@ exit *** Org Transclusion #+BEGIN_SRC emacs-lisp :tangle config.el ;; Org transclusion -(require 'org-transclusion) -(after! org - (map! :map global-map "" #'org-transclusion-add :leader :prefix "n" :desc "Org Transclusion Mode" "t" #'org-transclusion-mode) - (map! :leader :prefix "n" "l" #'org-transclusion-live-sync-start) - (setq org-transclusion-exclude-elements '(property-drawer keyword)) - (add-hook 'org-mode-hook #'org-transclusion-mode) -) +(use-package! org-transclusion + :after org + :init + (map! + :map global-map "" #'org-transclusion-add + :leader + :prefix "n" + :desc "Org Transclusion Mode" "t" #'org-transclusion-mode)) +(map! :leader :prefix "n" "l" #'org-transclusion-live-sync-start) + +(setq org-transclusion-exclude-elements '(property-drawer keyword)) + +(add-hook 'org-mode-hook #'org-transclusion-mode) #+END_SRC *** Org Jekyll @@ -1139,7 +1138,9 @@ exit #+BEGIN_SRC emacs-lisp :tangle config.el (add-load-path! "~/.emacs.d/org-nursery/lisp") (require 'org-roam-dblocks) -(add-hook 'org-mode-hook 'org-roam-dblocks-autoupdate-mode) +(use-package org-roam-dblocks + :hook (org-mode . org-roam-dblocks-autoupdate-mode)) + #+END_SRC *** Org Roam Export Setup #+BEGIN_SRC emacs-lisp :tangle config.el @@ -1204,8 +1205,8 @@ On Wayland, EAF doesn't work. org-agenda-skip-deadline-if-done t org-agenda-skip-scheduled-if-done t org-agenda-skip-scheduled-if-deadline-is-shown t - org-agenda-skip-timestamp-if-deadline-is-shown t - org-log-into-drawer t) + org-agenda-skip-timestamp-if-deadline-is-shown t) + ;; Custom styles for dates in agenda (custom-set-faces! @@ -1759,12 +1760,20 @@ I don't have this active right now since it's kinda weird with pgtk... ** LSP #+BEGIN_SRC emacs-lisp :tangle config.el ;;;-- LSP stuff ;;;-- -(require 'lsp-mode) -(require 'nix-mode) -(require 'gdscript-mode) +(use-package lsp-mode + :ensure t) + +(use-package nix-mode + :hook (nix-mode . lsp-deferred) + :ensure t) (setq lsp-java-workspace-dir (concat user-home-directory "/.local/share/doom/java-workspace")) +(require 'gdscript-mode) +(use-package gdscript-mode + :hook (gdscript-mode . lsp-deferred) + :ensure t) + (setq lsp-treemacs-deps-position-params '((side . right) (slot . 1) diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index 12d7d16..5a8d205 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -607,16 +607,11 @@ in } listener { - timeout = 150 # in seconds + timeout = 300 # in seconds on-timeout = loginctl lock-session } listener { - timeout = 165 # in seconds - on-timeout = hyprctl dispatch dpms off - on-resume = hyprctl dispatch dpms on - } - listener { - timeout = 7200 # in seconds + timeout = 600 # in seconds on-timeout = systemctl suspend } '';