summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonardo Santiago <[email protected]>2025-02-11 09:37:33 -0300
committerLeonardo Santiago <[email protected]>2025-02-11 09:37:33 -0300
commitfbe7403175d63a605cb3d0e6cb01028f60ee4dbb (patch)
tree551d08bf180354682206ec48a9f8b595ee28b454
parent73db3f9699c9b7846de7f802e20886d84bae4f1d (diff)
more stuff
-rw-r--r--flake.lock373
-rw-r--r--modules/emacs/README.org21
-rw-r--r--modules/gnome/default.nix3
-rw-r--r--modules/gnome/gnome-config.nix3
4 files changed, 368 insertions, 32 deletions
diff --git a/flake.lock b/flake.lock
index 2f2df73..8b99f9a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -69,18 +69,17 @@
},
"emacs-overlay": {
"inputs": {
- "flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1716916086,
- "narHash": "sha256-n/uf+jsjrXDUuDE6npM2hFfmPRfoYmEcpcoUuPstwi8=",
+ "lastModified": 1737622935,
+ "narHash": "sha256-+4TRPKuiAichJ9xmEOiWb2+5vpZl2PoH3/HTUVz5niA=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "b6c62d8135f943ea1e2733aa644cbd146afe2d62",
+ "rev": "e2c7b1cdaa973f5bb3c905f4d236f598949a727d",
"type": "github"
},
"original": {
@@ -92,11 +91,11 @@
"firefox-gnome-theme": {
"flake": false,
"locked": {
- "lastModified": 1723137499,
- "narHash": "sha256-MOE9NeU2i6Ws1GhGmppMnjOHkNLl2MQMJmGhaMzdoJM=",
+ "lastModified": 1736899990,
+ "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
- "rev": "fb5b578a4f49ae8705e5fea0419242ed1b8dba70",
+ "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d",
"type": "github"
},
"original": {
@@ -121,16 +120,55 @@
"type": "github"
}
},
+ "flake-compat_2": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1696426674,
+ "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+ "type": "github"
+ },
+ "original": {
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
+ "flake-parts": {
+ "inputs": {
+ "nixpkgs-lib": [
+ "mixrank",
+ "nix-forall",
+ "nix",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1719994518,
+ "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
"flake-utils": {
"inputs": {
"systems": "systems_3"
},
"locked": {
- "lastModified": 1726560853,
- "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+ "lastModified": 1710146030,
+ "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+ "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
@@ -139,6 +177,63 @@
"type": "github"
}
},
+ "flake-utils_2": {
+ "inputs": {
+ "systems": "systems_4"
+ },
+ "locked": {
+ "lastModified": 1701680307,
+ "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "git-hooks-nix": {
+ "inputs": {
+ "flake-compat": [
+ "mixrank",
+ "nix-forall",
+ "nix"
+ ],
+ "gitignore": [
+ "mixrank",
+ "nix-forall",
+ "nix"
+ ],
+ "nixpkgs": [
+ "mixrank",
+ "nix-forall",
+ "nix",
+ "nixpkgs"
+ ],
+ "nixpkgs-stable": [
+ "mixrank",
+ "nix-forall",
+ "nix",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1734425854,
+ "narHash": "sha256-nzE5UbJ41aPEKf8R2ZFYtLkqPmF7EIUbNEdHMBLg0Ig=",
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "rev": "0ddd26d0925f618c3a5d85a4fa5eb1e23a09491d",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "type": "github"
+ }
+ },
"home-manager": {
"inputs": {
"nixpkgs": "nixpkgs_2"
@@ -157,17 +252,35 @@
"type": "github"
}
},
+ "libgit2": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1715853528,
+ "narHash": "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=",
+ "owner": "libgit2",
+ "repo": "libgit2",
+ "rev": "36f7e21ad757a3dacc58cf7944329da6bc1d6e96",
+ "type": "github"
+ },
+ "original": {
+ "owner": "libgit2",
+ "ref": "v1.8.1",
+ "repo": "libgit2",
+ "type": "github"
+ }
+ },
"mixrank": {
"inputs": {
+ "nix-forall": "nix-forall",
"nixpkgs_latest": "nixpkgs_latest",
"nixpkgs_old": "nixpkgs_old"
},
"locked": {
- "lastModified": 1737051665,
- "narHash": "sha256-Ms8QfAOPPt3WV03Y+BOm2bg/XxxgEocLP6WkX83/z8k=",
+ "lastModified": 1738850823,
+ "narHash": "sha256-z5azZ0ImtNWRsODCRmXiYRV8+PcH3B49pTXEIYSOqOw=",
"ref": "refs/heads/master",
- "rev": "38179df5bc93d1f22726e2f2ce7a7d321dc64497",
- "revCount": 69567,
+ "rev": "8d8b08f6fd641ddbe9597b274e0504833384958a",
+ "revCount": 70144,
"type": "git",
"url": "ssh://[email protected]/mixrank/mixrank"
},
@@ -176,6 +289,68 @@
"url": "ssh://[email protected]/mixrank/mixrank"
}
},
+ "nix": {
+ "inputs": {
+ "flake-compat": "flake-compat_2",
+ "flake-parts": "flake-parts",
+ "git-hooks-nix": "git-hooks-nix",
+ "libgit2": "libgit2",
+ "nixpkgs": "nixpkgs_3",
+ "nixpkgs-23-11": "nixpkgs-23-11",
+ "nixpkgs-regression": "nixpkgs-regression"
+ },
+ "locked": {
+ "lastModified": 1734438522,
+ "narHash": "sha256-zvgmkpoj1fHDQiH3Ltx7Fe6VV86Xitbv+naLBUbuvqU=",
+ "owner": "nixos",
+ "repo": "nix",
+ "rev": "00f08deb48f1c5eb38848a6590b42df29341af24",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "repo": "nix",
+ "type": "github"
+ }
+ },
+ "nix-filter": {
+ "locked": {
+ "lastModified": 1687178632,
+ "narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=",
+ "owner": "numtide",
+ "repo": "nix-filter",
+ "rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "nix-filter",
+ "type": "github"
+ }
+ },
+ "nix-forall": {
+ "inputs": {
+ "flake-utils": "flake-utils",
+ "nix": "nix",
+ "nixpkgs": "nixpkgs_4",
+ "nocargo": "nocargo",
+ "registry-crates-io": "registry-crates-io",
+ "rust-overlay": "rust-overlay"
+ },
+ "locked": {
+ "lastModified": 1738848110,
+ "narHash": "sha256-DD31I1koydBZ7nGoxutOZS3Aia/s+eeiGSAsedhaYhk=",
+ "owner": "deltaex",
+ "repo": "nix-forall",
+ "rev": "3ca0e6f0addadc0f3cf2b9979e0ad8368f9e24d2",
+ "type": "gitlab"
+ },
+ "original": {
+ "owner": "deltaex",
+ "repo": "nix-forall",
+ "type": "gitlab"
+ }
+ },
"nixos-hardware": {
"locked": {
"lastModified": 1724878143,
@@ -207,18 +382,50 @@
"type": "github"
}
},
+ "nixpkgs-23-11": {
+ "locked": {
+ "lastModified": 1717159533,
+ "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
+ "type": "github"
+ }
+ },
+ "nixpkgs-regression": {
+ "locked": {
+ "lastModified": 1643052045,
+ "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+ "type": "github"
+ }
+ },
"nixpkgs-stable": {
"locked": {
- "lastModified": 1729973466,
- "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
+ "lastModified": 1737404927,
+ "narHash": "sha256-e1WgPJpIYbOuokjgylcsuoEUCB4Jl2rQXa2LUD6XAG8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
+ "rev": "ae584d90cbd0396a422289ee3efb1f1c9d141dc3",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-24.05",
+ "ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
@@ -241,11 +448,43 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1736883708,
- "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
+ "lastModified": 1734202038,
+ "narHash": "sha256-LwcGIkORU8zfQ/8jAgptgPY8Zf9lGKB0vtNdQyEkaN8=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "bcba2fbf6963bf6bed3a749f9f4cf5bff4adb96d",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-24.05",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_4": {
+ "locked": {
+ "lastModified": 1722630782,
+ "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
+ "rev": "d04953086551086b44b6f3c6b7eeb26294f207da",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_5": {
+ "locked": {
+ "lastModified": 1737062831,
+ "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
"type": "github"
},
"original": {
@@ -257,17 +496,17 @@
},
"nixpkgs_latest": {
"locked": {
- "lastModified": 1720492477,
- "narHash": "sha256-PV6LKJpj43tuKAMEfmXiKZjlOW1IqZORUJ8WYcdLtGE=",
+ "lastModified": 1737072480,
+ "narHash": "sha256-xN1d8UQOoslAQgVt362xuYI3eDr7qWu0YrUzNKc3c2g=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "64f145f456b7a3953f191cad9e257cd88412044e",
+ "rev": "3a91526c073dc4ec6fb6a4b91c72231ed75f9d01",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "64f145f456b7a3953f191cad9e257cd88412044e",
+ "rev": "3a91526c073dc4ec6fb6a4b91c72231ed75f9d01",
"type": "github"
}
},
@@ -288,6 +527,51 @@
"type": "github"
}
},
+ "nocargo": {
+ "inputs": {
+ "flake-utils": "flake-utils_2",
+ "nix-filter": "nix-filter",
+ "nixpkgs": [
+ "mixrank",
+ "nix-forall",
+ "nixpkgs"
+ ],
+ "registry-crates-io": [
+ "mixrank",
+ "nix-forall",
+ "registry-crates-io"
+ ]
+ },
+ "locked": {
+ "lastModified": 1708360007,
+ "narHash": "sha256-KZQPkC7P8zo2d8oh2HFgU29bxQjo5xSMTx1K2wcAZ2w=",
+ "owner": "deltaex",
+ "repo": "nocargo",
+ "rev": "29dd16aba729d154defece153768e6b197d244b7",
+ "type": "gitlab"
+ },
+ "original": {
+ "owner": "deltaex",
+ "repo": "nocargo",
+ "type": "gitlab"
+ }
+ },
+ "registry-crates-io": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1737733755,
+ "narHash": "sha256-g15m8IfFGWO4MoFmzAj9nFDjorTM9N1viP/83mCWNbA=",
+ "owner": "rust-lang",
+ "repo": "crates.io-index",
+ "rev": "9dd148c9b916aa1aaf36d2b395b9428a385c0767",
+ "type": "github"
+ },
+ "original": {
+ "owner": "rust-lang",
+ "repo": "crates.io-index",
+ "type": "github"
+ }
+ },
"root": {
"inputs": {
"agenix": "agenix",
@@ -297,7 +581,29 @@
"home-manager": "home-manager",
"mixrank": "mixrank",
"nixos-hardware": "nixos-hardware",
- "nixpkgs": "nixpkgs_3"
+ "nixpkgs": "nixpkgs_5"
+ }
+ },
+ "rust-overlay": {
+ "inputs": {
+ "nixpkgs": [
+ "mixrank",
+ "nix-forall",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1733711706,
+ "narHash": "sha256-uDfJ/TrLLqrtoNzfPODDOVyZ+JWsJfd5T1r7xuE6h6g=",
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "rev": "4eb3f096e14431bd0ab4cca039f9c9d77331cbfc",
+ "type": "github"
+ },
+ "original": {
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "type": "github"
}
},
"systems": {
@@ -345,6 +651,21 @@
"type": "github"
}
},
+ "systems_4": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
"utils": {
"inputs": {
"systems": "systems_2"
diff --git a/modules/emacs/README.org b/modules/emacs/README.org
index 610bdc9..d9d081d 100644
--- a/modules/emacs/README.org
+++ b/modules/emacs/README.org
@@ -20,13 +20,19 @@ You can also use it as a ~nixosModule~, in order to add additional packages like
(tool-bar-mode -1)
(scroll-bar-mode -1)
-(global-display-line-numbers-mode 1)
+(setq gc-cons-threshold 100000000)
+
+(global-display-line-numbers-mode +1)
+(line-number-mode +1)
+(column-number-mode +1)
(setq default-frame-alist '((fullscreen . maximized)))
(setq use-short-answers t)
(setq inhibit-startup-message t)
+(setq-default indicate-empty-lines t)
(setq ring-bell-function 'ignore)
-(setq-default indent-tabs-mode nil)
+(setq-default tab-width 4
+ indent-tabs-mode nil)
(setq window-combination-resize t)
#+end_src
@@ -35,8 +41,10 @@ You can also use it as a ~nixosModule~, in order to add additional packages like
#+begin_src emacs-lisp :tangle yes
(use-package modus-themes
:ensure t)
+(use-package ef-themes
+ :ensure t)
;; (use-package kanagawa-theme)
-(load-theme 'modus-operandi-tinted t)
+(load-theme 'ef-day t)
(add-hook 'after-make-frame-functions
(lambda (frame)
@@ -56,6 +64,11 @@ You can also use it as a ~nixosModule~, in order to add additional packages like
#+end_src
* Utility
+** Diminish minor modes
+#+begin_src emacs-lisp :tangle yes
+(use-package diminish
+ :ensure t)
+#+end_src
** Searching
#+begin_src emacs-lisp :tangle yes
(use-package rg
@@ -189,6 +202,7 @@ Better help defaults
(use-package which-key
:ensure t
+ :dimish which-key-mode
:config (which-key-mode))
#+end_src
** Bind key
@@ -301,6 +315,7 @@ Try to use the package.
(use-package org
:ensure nil
:hook (org-mode . org-indent-mode)
+ :diminish org-indent-mode
:bind ("C-c a" . org-agenda)
:config
(add-to-list 'org-src-lang-modes '("rust" . rust-ts))
diff --git a/modules/gnome/default.nix b/modules/gnome/default.nix
index b0a1976..90b99b1 100644
--- a/modules/gnome/default.nix
+++ b/modules/gnome/default.nix
@@ -5,6 +5,7 @@
environment.systemPackages = with pkgs; [
gnome-tweaks
tela-icon-theme
+ hackneyed
] ++ (with gnomeExtensions; [
appindicator
vitals
@@ -12,7 +13,7 @@
graphite-gtk-theme
x11-gestures
gsconnect
- open-bar
+ openweather-refined
]);
environment.gnome.excludePackages = with pkgs; [
diff --git a/modules/gnome/gnome-config.nix b/modules/gnome/gnome-config.nix
index 73f779a..5e087ef 100644
--- a/modules/gnome/gnome-config.nix
+++ b/modules/gnome/gnome-config.nix
@@ -12,6 +12,7 @@ santi-modules:
font-antialiasing="grayscale";
font-hinting="slight";
gtk-theme="Adwaita";
+ cursor-theme="Hackneyed";
icon-theme="Tela-brown-light";
show-battery-percentage=true;
};
@@ -35,9 +36,7 @@ santi-modules:
"org/gnome/shell" = {
enabled-extensions = [
- "openbar@neuromorph"
];
disabled-extensions= [