aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--home-manager/programs/emacs/default.nix16
-rw-r--r--home-manager/programs/emacs/init.el1
-rw-r--r--home-manager/programs/firefox/default.nix3
-rw-r--r--home-manager/programs/fish/default.nix2
-rw-r--r--home-manager/programs/waybar/style.css14
-rw-r--r--home-manager/wm/hyprland/hyprland.conf2
-rw-r--r--nixos/hardware-configuration.nix6
-rw-r--r--pkgs/default.nix1
-rw-r--r--pkgs/tdlib/default.nix40
9 files changed, 74 insertions, 11 deletions
diff --git a/home-manager/programs/emacs/default.nix b/home-manager/programs/emacs/default.nix
index 920a42c..27688fa 100644
--- a/home-manager/programs/emacs/default.nix
+++ b/home-manager/programs/emacs/default.nix
@@ -51,6 +51,22 @@ let
:fetcher github)
'';
})
+ (epkgs.melpaBuild rec {
+ pname = "telega";
+ version = "0.8.216";
+ src = fetchFromGitHub {
+ owner = "zevlg";
+ repo = "telega.el";
+ rev = "3899aa8648b9e6deddbb34a2a817ca18acb9d97a";
+ sha256 = "05xrm86gp185mgwb62w720hcbn87salk8z0whq6zf2r2f24l6xbw";
+ };
+ commit = "3899aa8648b9e6deddbb34a2a817ca18acb9d97a";
+ recipe = writeText "recipe" ''
+ (telega :fetcher github
+ :repo "zevlg/telega.el"
+ :files (:defaults "etc" "server" "contrib" "Makefile"))
+ '';
+ })
# (epkgs.melpaBuild rec {
# pname = "orgnote";
# version = "0.7.17";
diff --git a/home-manager/programs/emacs/init.el b/home-manager/programs/emacs/init.el
index 6f5da1a..1103b57 100644
--- a/home-manager/programs/emacs/init.el
+++ b/home-manager/programs/emacs/init.el
@@ -684,6 +684,7 @@
(use-package helm)
(use-package helm-fish-completion)
+(use-package telega)
(setq gc-cons-threshold (* 2 1000 1000))
(setq read-process-output-max (* 1024 1024))
diff --git a/home-manager/programs/firefox/default.nix b/home-manager/programs/firefox/default.nix
index 1414d2b..b08ae0c 100644
--- a/home-manager/programs/firefox/default.nix
+++ b/home-manager/programs/firefox/default.nix
@@ -6,13 +6,14 @@ let
};
extensions = with nur.repos.rycee.firefox-addons; [
bitwarden
- ghostery
+ ublock-origin
switchyomega
sponsorblock
return-youtube-dislikes
firefox-color
tampermonkey
duckduckgo-privacy-essentials
+ sidebery
];
userConfig = builtins.readFile ./user.js;
configOverrides = ''
diff --git a/home-manager/programs/fish/default.nix b/home-manager/programs/fish/default.nix
index 88bfe3b..9cde39d 100644
--- a/home-manager/programs/fish/default.nix
+++ b/home-manager/programs/fish/default.nix
@@ -29,7 +29,7 @@ let
shellAliases = {
rn = "ranger_func";
ls = "ls --hyperlink=auto --color=auto";
- iamatomic = "sudo nixos-rebuild switch --flake ~/.nixfiles#ltrr";
+ iamatomic = "sudo nixos-rebuild switch --flake ~/nixfiles#ltrr";
};
in
diff --git a/home-manager/programs/waybar/style.css b/home-manager/programs/waybar/style.css
index f06d557..7f64ae3 100644
--- a/home-manager/programs/waybar/style.css
+++ b/home-manager/programs/waybar/style.css
@@ -1,14 +1,13 @@
* {
font-family: Material Design Icons, Rubik Medium;
font-size: 14px;
- color: #6e6a86;
+ color: #939ab7;
}
window#waybar {
border-radius: 10px;
- background: #1f1d2e;
- opacity: 0.7;
- border: 3px solid #363a4f;
+ background: rgba(36, 39, 58, 0.7);
+ border: 3px solid rgba(183, 189, 248, 0.2);
}
#battery {
@@ -17,11 +16,16 @@ window#waybar {
#workspaces button label {
font-size: 15px;
+ color: #cad3f5;
transition: all 100ms ease-out;
}
#workspaces button.active label {
font-weight: bolder;
- color: #908caa;
+ color: #f0c6c6;
transition: all 100ms ease-out;
}
+
+#battery {
+ color: #f0c6c6;
+}
diff --git a/home-manager/wm/hyprland/hyprland.conf b/home-manager/wm/hyprland/hyprland.conf
index 4d4fc41..a950187 100644
--- a/home-manager/wm/hyprland/hyprland.conf
+++ b/home-manager/wm/hyprland/hyprland.conf
@@ -1,4 +1,4 @@
-blurls = ags
+layerrule = blur, waybar
monitor = eDP-1,preferred,auto,1
monitor = ,highres,auto,1,mirror,eDP-1
diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix
index 73472f8..d829fdb 100644
--- a/nixos/hardware-configuration.nix
+++ b/nixos/hardware-configuration.nix
@@ -14,17 +14,17 @@
boot.extraModulePackages = [ ];
fileSystems."/" =
- { device = "/dev/disk/by-uuid/6a01c356-7ba4-4499-84be-d3f94af19c71";
+ { device = "/dev/disk/by-uuid/b4d5e165-3c5d-494f-b6f4-dad51c470f4b";
fsType = "ext4";
};
fileSystems."/boot" =
- { device = "/dev/disk/by-uuid/AFC7-387A";
+ { device = "/dev/disk/by-uuid/4075-1CD3";
fsType = "vfat";
};
swapDevices =
- [ { device = "/dev/disk/by-uuid/c52d36a0-3755-4407-a15c-1b021a12f32b"; }
+ [ { device = "/dev/disk/by-uuid/92692e2e-0394-4d43-b309-d0d650af1e21"; }
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 1f436d8..fa41c73 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -5,4 +5,5 @@
ansel = pkgs.callPackage ./ansel { };
g-ls = pkgs.callPackage ./g-ls { };
draw = pkgs.callPackage ./draw { };
+ tdlib = pkgs.callPackage ./tdlib { };
}
diff --git a/pkgs/tdlib/default.nix b/pkgs/tdlib/default.nix
new file mode 100644
index 0000000..d81747e
--- /dev/null
+++ b/pkgs/tdlib/default.nix
@@ -0,0 +1,40 @@
+{ fetchFromGitHub, gperf, openssl, readline, zlib, cmake, lib, stdenv }:
+
+stdenv.mkDerivation rec {
+ pname = "tdlib";
+ version = "1.8.23";
+
+ src = fetchFromGitHub {
+ owner = "tdlib";
+ repo = "td";
+
+ # The tdlib authors do not set tags for minor versions, but
+ # external programs depending on tdlib constrain the minor
+ # version, hence we set a specific commit with a known version.
+ rev = "404761c525d933df813702c863828058cd26111a";
+ hash = "sha256-wyuGsLZFDRgziBPD9kvn2BJpPcVQCY2kU4j7Qy+9H6o==";
+ };
+
+ buildInputs = [ gperf openssl readline zlib ];
+ nativeBuildInputs = [ cmake ];
+
+ # https://github.com/tdlib/td/issues/1974
+ postPatch = ''
+ substituteInPlace CMake/GeneratePkgConfig.cmake \
+ --replace 'function(generate_pkgconfig' \
+ 'include(GNUInstallDirs)
+ function(generate_pkgconfig' \
+ --replace '\$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \
+ --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR}
+ '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
+ sed -i "/vptr/d" test/CMakeLists.txt
+ '';
+
+ meta = with lib; {
+ description = "Cross-platform library for building Telegram clients";
+ homepage = "https://core.telegram.org/tdlib/";
+ license = [ licenses.boost ];
+ platforms = platforms.unix;
+ maintainers = [ maintainers.vyorkin ];
+ };
+}
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-24 13:36:03 +0000