From 08ca5fa888f1acb2be51096fc0357501f052c210 Mon Sep 17 00:00:00 2001 From: Liam Malone Date: Sun, 13 Oct 2024 15:15:59 +0200 Subject: [PATCH] updates --- flake.lock | 164 ++++++++++--------- flake.nix | 6 +- hosts/default/configuration.nix | 2 +- hosts/default/home.nix | 14 +- modules/desktop/hyprland.nix | 2 +- modules/home-manager/fastfetch.nix | 2 + modules/old_configs/emacs/config.org | 20 ++- modules/old_configs/nvim/lua/liamm/remap.lua | 44 ++++- modules/old_configs/nvim/lua/liamm/set.lua | 2 +- modules/old_configs/waybar/config.jsonc | 4 +- 10 files changed, 165 insertions(+), 95 deletions(-) diff --git a/flake.lock b/flake.lock index 7241ae8..60c8452 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1725841979, - "narHash": "sha256-SXYqzpHPuXFR6w/cUKo3VN8XRn6XA2mGbdRXs9oLk6k=", + "lastModified": 1727303518, + "narHash": "sha256-lO5JMynTxNZxg/+E4/Y9reeLGIz/M8cEue+Re4cP6qo=", "owner": "Aylur", "repo": "ags", - "rev": "aaef50bb2c80ef4b4a359329d72669a95e7c4796", + "rev": "cd543afec4d9ed708990e5ba52184716809bf248", "type": "github" }, "original": { @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1725753098, - "narHash": "sha256-/NO/h/qD/eJXAQr/fHA4mdDgYsNT9thHQ+oT6KPi2ac=", + "lastModified": 1727261104, + "narHash": "sha256-rxDI7WrxIRV9it9mDCHcLa7xQykf1JloXnoXr5xQ8zI=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "e4a13203112a036fc7f437d391c7810f3dd5ab52", + "rev": "b82fdaff917582a9d568969e15e61b398c71e990", "type": "github" }, "original": { @@ -72,16 +72,20 @@ }, "ghostty": { "inputs": { - "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs-stable": [ + "nixpkgs" + ], + "nixpkgs-unstable": [ + "nixpkgs" + ], "zig": "zig" }, "locked": { - "lastModified": 1726286796, - "narHash": "sha256-5mop4eJrzPTuEsUaqRZizzjySOx+vK9ZXl7HlJqWh1M=", + "lastModified": 1727631856, + "narHash": "sha256-VdoYxOjaDOT9BuyOlPN3IROc4PEKoCw9sSotzRA/PvE=", "ref": "refs/heads/main", - "rev": "4241eac890b8f4b6bbadf27b2d109ce483813fe9", - "revCount": 7314, + "rev": "83505bb4c0980e17cb7f396a43c1a3630c4ffdb0", + "revCount": 7546, "type": "git", "url": "ssh://git@github.com/ghostty-org/ghostty" }, @@ -97,11 +101,11 @@ ] }, "locked": { - "lastModified": 1726440980, - "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", + "lastModified": 1727383923, + "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", + "rev": "ffe2d07e771580a005e675108212597e5b367d2d", "type": "github" }, "original": { @@ -126,11 +130,11 @@ ] }, "locked": { - "lastModified": 1722623071, - "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=", + "lastModified": 1727532803, + "narHash": "sha256-ZaZ7h7PY8mQc4vtGmVqWLAq9CAO02gHMyNR5yY8zDmM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "912d56025f03d41b1ad29510c423757b4379eb1c", + "rev": "b98726e431d4d3ed58bd58bee1047cdb81cec69f", "type": "github" }, "original": { @@ -149,11 +153,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1725204025, - "narHash": "sha256-DdPf2Hm/ywtXqQutmxuzvMLgTzuV1nuzbrsahyhB8uU=", + "lastModified": 1727257269, + "narHash": "sha256-b/j875k6RrxQLtbW+NCLw7NLToMd9KDYywjtUoihpq4=", "owner": "hyprwm", "repo": "hypridle", - "rev": "22b058b47a57b609e00c5c8a90697f33c7fe1fd3", + "rev": "cc23f97836adbba1abc8edd48169fb1f1f698c32", "type": "github" }, "original": { @@ -166,6 +170,7 @@ "inputs": { "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", + "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang_2", "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner", @@ -174,11 +179,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1726430622, - "narHash": "sha256-50vt1snpVwS5lqvvH4p6DHiEWspJUZuJ1kYy1DKtrfM=", + "lastModified": 1727621787, + "narHash": "sha256-gSoqO3r98YvPEvN/6Fnw+UNg4hEwq/YWFijPtlLtFWM=", "ref": "refs/heads/main", - "rev": "9e356562446f44c471ae38a80506a9df039305d6", - "revCount": 5224, + "rev": "6649255d54f45a7e2fedd9b4be85fe5d11229c04", + "revCount": 5278, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -206,11 +211,11 @@ ] }, "locked": { - "lastModified": 1723143591, - "narHash": "sha256-dPcWAeRJoG5CyWC32X3XX+Og0v/k1/S1N0T5dQWT32k=", + "lastModified": 1727625596, + "narHash": "sha256-+BQyiJPhb9txsO6xZ4c4HrQwBzTe9gohX1e+wUvOM+Q=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "b73d7b901d8cb1172dd25c7b7159f0242c625a77", + "rev": "13301eeede3deb4b3a5478518eb0931ae274a798", "type": "github" }, "original": { @@ -220,6 +225,31 @@ } }, "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1727451107, + "narHash": "sha256-qV9savtHwmZUa0eJE294WYJjKPGB2+bJhwByFShsVyo=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "6b3261ee13a6d2b99de79a31d352f6996e35bde3", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland-protocols_2": { "inputs": { "nixpkgs": [ "hyprland", @@ -343,11 +373,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1725535663, - "narHash": "sha256-hsvbU1utffVOFTRa3arPepv8en42VltR33L72vK3QVo=", + "lastModified": 1727254580, + "narHash": "sha256-JPms9Xhgr2R76vWEGmCvsBAoM0JUd4cQ2zl4pie+XAM=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "153977aab35a72f3e142e32aed6b268b659d18e1", + "rev": "9ea804788ca5b4852d7e045d7a57f8d413852ca0", "type": "github" }, "original": { @@ -393,11 +423,11 @@ ] }, "locked": { - "lastModified": 1724966483, - "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=", + "lastModified": 1727300645, + "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2", + "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c", "type": "github" }, "original": { @@ -443,11 +473,11 @@ ] }, "locked": { - "lastModified": 1721324119, - "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=", + "lastModified": 1726874836, + "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30", + "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", "type": "github" }, "original": { @@ -472,45 +502,13 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1726062281, - "narHash": "sha256-PyFVySdGj3enKqm8RQuo4v1KLJLmNLOq2yYOHsI6e2Q=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e65aa8301ba4f0ab8cb98f944c14aa9da07394f8", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1725983898, - "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", "type": "github" }, "original": { @@ -522,11 +520,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1726243404, - "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", "type": "github" }, "original": { @@ -625,11 +623,19 @@ }, "xdph": { "inputs": { - "hyprland-protocols": "hyprland-protocols", + "hyprland-protocols": "hyprland-protocols_2", "hyprlang": [ "hyprland", "hyprlang" ], + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -640,11 +646,11 @@ ] }, "locked": { - "lastModified": 1726046979, - "narHash": "sha256-6SEsjurq9cdTkITA6d49ncAJe4O/8CgRG5/F//s6Xh8=", + "lastModified": 1727524473, + "narHash": "sha256-1DGktDtSWIJpnDbVoj/qpvJSH5zg6JbOfuh6xqZMap0=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "e695669fd8e1d1be9eaae40f35e00f8bd8b64c18", + "rev": "7e500e679ede40e79cf2d89b5f5fa3e34923bd26", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 411824f..674ebe2 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; ghostty = { - url = "git+ssh://git@github.com/ghostty-org/ghostty"; + inputs = { + nixpkgs-stable.follows = "nixpkgs"; + nixpkgs-unstable.follows = "nixpkgs"; + }; + url = "git+ssh://git@github.com/ghostty-org/ghostty"; }; }; diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 01c6ee2..de69e05 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -95,7 +95,7 @@ blueman.enable = true; - printing.enable = true; # Enable CUPS to print documents. + # printing.enable = true; # Enable CUPS to print documents. gvfs.enable = true; auto-cpufreq.enable = true; diff --git a/hosts/default/home.nix b/hosts/default/home.nix index 25590e8..e9b2bd7 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -42,6 +42,8 @@ gimp gnome-keyring gnome-sound-recorder + gnome-disk-utility + gparted gtk4 gvfs grim @@ -49,6 +51,7 @@ htop imagemagick imhex + kdenlive keepassxc libsForQt5.polkit-kde-agent libtool @@ -64,6 +67,8 @@ powertop praat prismlauncher + protonvpn-cli + protonvpn-gui qbittorrent signal-desktop slstatus @@ -72,9 +77,12 @@ texliveFull thunderbird tree + unzip wev wl-clipboard + xclip xdg-user-dirs + zip ]; # Home Manager is pretty good at managing dotfiles. The primary way to manage @@ -253,6 +261,7 @@ services = { blueman-applet.enable = true; network-manager-applet.enable = true; + emacs = { enable = true; package = pkgs.emacs-gtk; @@ -263,14 +272,17 @@ "-a emacs" ]; }; - startWithUserSession = true; + startWithUserSession = "graphical"; }; + gnome-keyring.enable = true; + gpg-agent = { enable = true; defaultCacheTtl = 1800; enableSshSupport = true; }; + nextcloud-client.enable = true; }; } diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index 84bf69e..af1adbb 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -36,7 +36,7 @@ exec-once = [ "wl-clipboard-history -t" "wl-paste -p --watch wl-copy -p ''" - # "ags" + "fcitx5 -d" ]; env = [ "WLR_NO_HARDWARE_CURSORS,1" diff --git a/modules/home-manager/fastfetch.nix b/modules/home-manager/fastfetch.nix index 126be0d..321de5e 100644 --- a/modules/home-manager/fastfetch.nix +++ b/modules/home-manager/fastfetch.nix @@ -49,6 +49,8 @@ "battery" "break" "colors" + "break" + "break" ]; }; }; diff --git a/modules/old_configs/emacs/config.org b/modules/old_configs/emacs/config.org index b07d068..01f4c05 100644 --- a/modules/old_configs/emacs/config.org +++ b/modules/old_configs/emacs/config.org @@ -26,6 +26,8 @@ - [[#markdown-mode][MARKDOWN MODE]] - [[#org-download][ORG DOWNLOAD]] - [[#pulse][PULSE]] +- [[#pdf-tools][PDF TOOLS]] +- [[#projectile][PROJECTILE]] - [[#rainbow-mode][RAINBOW MODE]] - [[#reload-emacs][RELOAD EMACS]] - [[#shells-and-terminals][SHELLS AND TERMINALS]] @@ -497,20 +499,18 @@ Enable zoom in/out with C-=/- and also for C-scrl-up/down * ORG DOWNLOAD #+begin_src emacs-lisp - ;; inspired by https://zzamboni.org/post/how-to-insert-screenshots-in-org-documents-on-macos/ - (use-package org-download :after org :defer nil :custom (org-download-method 'directory) - (org-download-image-dir "~/emacs/") + (org-download-image-dir "~/emacs/images/") (org-download-heading-lvl 0) (org-download-timestamp "org_%Y%m%d-%H%M%S_") - ;; (org-image-actual-width 400) - (org-download-screenshot-method "wl-paste -t image/png > '%s'") + (org-image-actual-width 400) + (org-download-screenshot-method "WAYLAND_DISPLAY=wayland-1 wl-paste -t image/png > '%s'.png") :bind - ("C-M-y" . org-download-screenshot) + ("C-M-y" . org-download-screenshot file) :config (require 'org-download)) #+end_src @@ -539,7 +539,13 @@ Pulse highlight a line on certain actions # (advice-add command :after #'pulse-line))) # #+end_src -# * PROJECTILE +* PDF TOOLS +#+begin_src emacs-lisp + (use-package pdf-tools) +#+end_src + + +* PROJECTILE [[https://github.com/bbatsov/projectile][Projectile]] is a project interaction library for Emacs. #+begin_src emacs-lisp diff --git a/modules/old_configs/nvim/lua/liamm/remap.lua b/modules/old_configs/nvim/lua/liamm/remap.lua index 41bcba7..26c5c01 100644 --- a/modules/old_configs/nvim/lua/liamm/remap.lua +++ b/modules/old_configs/nvim/lua/liamm/remap.lua @@ -21,8 +21,48 @@ vim.keymap.set("n", "Y", "\"+Y") vim.keymap.set("n", "x", "!chmod +x %", {silent = true}) --- put nvim to background -vim.keymap.set("n", "z", "") +-- put to background +vim.keymap.set("n", "bg", "") + +-- BUILD SCRIPT INVOKATIONS + +-- `build.sh` script binds +-- non-interactive binds +vim.keymap.set("n", "bb" , "./build.sh ") +vim.keymap.set("n", "br" , "./build.sh run ") +vim.keymap.set("n", "bRb" , "./build.sh release ") +vim.keymap.set("n", "bRr" , "./build.sh release run ") +vim.keymap.set("n", "bRr" , "./build.sh release run ") + +-- interactive binds +vim.keymap.set("n", "bo" , "./build.sh ") -- allow for adding extra flags/options +vim.keymap.set("n", "bor" , "./build.sh run") -- allow for adding extra flags/options +vim.keymap.set("n", "bRo" , "./build.sh release ") +vim.keymap.set("n", "bRor", "./build.sh release run ") + +-- `build.zig` script binds +-- non-interactive binds +vim.keymap.set("n", "zbb" , "zig build ") +vim.keymap.set("n", "zbr" , "zig build run ") +vim.keymap.set("n", "zbt" , "zig build test ") +vim.keymap.set("n", "zbR" , "zig build -Doptimize=ReleaseSafe ") +vim.keymap.set("n", "zbRs" , "zig build -Doptimize=ReleaseSmall ") +vim.keymap.set("n", "zbRf" , "zig build -Doptimize=ReleaseFast ") +vim.keymap.set("n", "zbRr" , "zig build run -Doptimize=ReleaseSafe ") +vim.keymap.set("n", "zbRsr", "zig build run -Doptimize=ReleaseSmall ") +vim.keymap.set("n", "zbRfr", "zig build run -Doptimize=ReleaseFast ") + +-- interactive binds +vim.keymap.set("n", "zbob" , "zig build ") +vim.keymap.set("n", "zbor" , "zig build run ") +vim.keymap.set("n", "zbot" , "zig build test ") +vim.keymap.set("n", "zboR" , "zig build -Doptimize=ReleaseSafe ") +vim.keymap.set("n", "zboRs" , "zig build -Doptimize=ReleaseSmall ") +vim.keymap.set("n", "zboRf" , "zig build -Doptimize=ReleaseFast ") +vim.keymap.set("n", "zboRr" , "zig build run -Doptimize=ReleaseSafe ") +vim.keymap.set("n", "zboRsr", "zig build run -Doptimize=ReleaseSmall ") +vim.keymap.set("n", "zboRfr", "zig build run -Doptimize=ReleaseFast ") + -- emacs-inspired binds -- all can be done w spacebar-w diff --git a/modules/old_configs/nvim/lua/liamm/set.lua b/modules/old_configs/nvim/lua/liamm/set.lua index ab65e1a..641307e 100644 --- a/modules/old_configs/nvim/lua/liamm/set.lua +++ b/modules/old_configs/nvim/lua/liamm/set.lua @@ -18,7 +18,7 @@ vim.opt.colorcolumn = "" vim.opt.smartindent = true -vim.opt.wrap = false +vim.opt.wrap = true vim.opt.swapfile = false vim.opt.backup = false diff --git a/modules/old_configs/waybar/config.jsonc b/modules/old_configs/waybar/config.jsonc index e9102ca..28dbd44 100644 --- a/modules/old_configs/waybar/config.jsonc +++ b/modules/old_configs/waybar/config.jsonc @@ -51,14 +51,14 @@ "clock": { "interval": 1, - "format": "\n{:%d/%m\n 󰥔 \n %R}", + "format": "\n{:%d/%m\n 󰥔 \n%R}", "tooltip": true, "tooltip-format": "{:%Y %B} {calendar}" }, "disk": { "interval": 30, "path": "/home", - "format": "\n {path}\n {percentage_used}%", + "format": "\n {path}\n {percentage_used}%", "alt-format": " {path}:{used}\/{total}", "tooltip-format": " {path}:{used}\/{total}", },