Compare commits

...

4 commits

Author SHA1 Message Date
Emmet 03111e3461 qutebrowser theme polarity respects stylix config 2024-05-27 14:28:26 -05:00
Emmet 0777afa655 wpa_supplicant unbroken now :) 2024-05-27 14:23:09 -05:00
Emmet 696d2d5a29 Trying local emacs crdt server for collaboration 2024-05-27 14:22:21 -05:00
Emmet 3141f4bfaa Fixes gpu/mesa/opengl version mismatches on hyprland 2024-05-27 14:21:17 -05:00
7 changed files with 96 additions and 14 deletions

View file

@ -56,7 +56,6 @@
# Networking
networking.hostName = systemSettings.hostname; # Define your hostname.
networking.networkmanager.enable = true; # Use networkmanager
networking.networkmanager.wifi.backend = "iwd"; # wpa_supplicant broken :(
# Timezone and locale
time.timeZone = systemSettings.timezone; # time zone

View file

@ -8,9 +8,9 @@
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "radeon" ];
boot.initrd.kernelModules = [ "radeon" ];
boot.kernelModules = [ "kvm-amd" "radeon" ];
boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ];
hardware.opengl.extraPackages = [ pkgs.amdvlk ];
hardware.opengl.extraPackages32 = [ pkgs.driversi686Linux.amdvlk ];

View file

@ -1,5 +1,6 @@
{ inputs, pkgs, ... }:
{ inputs, pkgs, lib, ... }: let
pkgs-hyprland = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system};
in
{
# Import wayland config
imports = [ ./wayland.nix
@ -30,4 +31,14 @@
portalPackage = pkgs.xdg-desktop-portal-hyprland;
};
};
# fixes opengl/mesa version mismatch
hardware.opengl = {
package = pkgs-hyprland.mesa.drivers;
# if you also want 32-bit support (e.g for Steam)
driSupport32Bit = true;
package32 = pkgs-hyprland.pkgsi686Linux.mesa.drivers;
};
services.xserver.displayManager.sddm.package = lib.mkForce pkgs-hyprland.sddm;
}

View file

@ -164,7 +164,9 @@ c.tabs.last_close = 'close'
c.tabs.position = 'left'
c.tabs.width = '3%'
c.window.transparent = True
c.colors.webpage.darkmode.enabled = True
c.colors.webpage.darkmode.enabled = ''+(if (config.stylix.polarity == "dark") then "True" else "False")+''
c.colors.webpage.preferred_color_scheme = "''+config.stylix.polarity+''"
c.colors.webpage.darkmode.policy.images = 'never'
c.url.default_page = str(config.configdir)+'/qute-home.html'
@ -312,7 +314,6 @@ c.colors.tabs.selected.odd.fg = base05
c.colors.tabs.selected.odd.bg = base02
c.colors.tabs.selected.even.fg = base05
c.colors.tabs.selected.even.bg = base02
c.colors.webpage.bg = base00
font = "''+userSettings.font+''"

View file

@ -626,6 +626,40 @@ If the path from LINK does not exist, nil is returned."
"e" #'org-jekyll-rename-post
)
(require 'crdt)
(setq crdt-default-tls nil)
(setq crdt-default-name "Emmet")
(if (file-exists-p "~/.emacs.d/crdt-private.el") (load! "~/.emacs.d/crdt-private.el"))
(defun crdt-connect-default ()
(interactive)
(crdt-connect crdt-default-server-address crdt-default-name)
)
(map! :leader
:desc "crdt"
:prefix ("C")
:desc "Connect to a crdt server"
"c" #'crdt-connect-default
:desc "Connect to default crdt server"
"C" #'crdt-connect-default
:desc "Disconnect from a crdt server"
"d" #'crdt-disconnect
:desc "Add buffer to a session"
"a" #'crdt-share-buffer
:desc "Stop sharing buffer to session"
"s" #'crdt-stop-share-buffer
:desc "List crdt buffers in a session"
"l" #'crdt-list-buffers
:desc "List crdt users in a session"
"u" #'crdt-list-users
)
;;;------ Org roam configuration ------;;;
(require 'org-roam)
(require 'org-roam-dailies)

View file

@ -756,6 +756,42 @@ exit
"e" #'org-jekyll-rename-post
)
#+end_src
*** Crdt
#+begin_src emacs-lisp :tangle config.el
(require 'crdt)
(setq crdt-default-tls nil)
(setq crdt-default-name "Emmet")
(if (file-exists-p "~/.emacs.d/crdt-private.el") (load! "~/.emacs.d/crdt-private.el"))
(defun crdt-connect-default ()
(interactive)
(crdt-connect crdt-default-server-address crdt-default-name)
)
(map! :leader
:desc "crdt"
:prefix ("C")
:desc "Connect to a crdt server"
"c" #'crdt-connect-default
:desc "Connect to default crdt server"
"C" #'crdt-connect-default
:desc "Disconnect from a crdt server"
"d" #'crdt-disconnect
:desc "Add buffer to a session"
"a" #'crdt-share-buffer
:desc "Stop sharing buffer to session"
"s" #'crdt-stop-share-buffer
:desc "List crdt buffers in a session"
"l" #'crdt-list-buffers
:desc "List crdt users in a session"
"u" #'crdt-list-users
)
#+end_src
** Org Roam Configuration
*** Standard Org Roam Configuration

View file

@ -1,5 +1,6 @@
{ inputs, config, lib, pkgs, userSettings, systemSettings, ... }:
{ inputs, config, lib, pkgs, userSettings, systemSettings, ... }: let
pkgs-hyprland = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system};
in
{
imports = [
../../app/terminal/alacritty.nix
@ -320,7 +321,7 @@
systemd.enable = true;
};
home.packages = with pkgs; [
home.packages = (with pkgs; [
alacritty
kitty
feh
@ -368,7 +369,6 @@
hyprland-protocols
hyprpicker
hypridle
hyprlock
swaybg
fnott
fuzzel
@ -449,8 +449,9 @@
terminal = false;
icon = "emacs";
type = "Application";
})
];
})])
++
(with pkgs-hyprland; [ hyprlock ]);
home.file.".config/nwg-dock-hyprland/style.css".text = ''
window {
background: rgba(''+config.lib.stylix.colors.base00-rgb-r+'',''+config.lib.stylix.colors.base00-rgb-g+'',''+config.lib.stylix.colors.base00-rgb-b+'',0.0);