diff --git a/profiles/work/configuration.nix b/profiles/work/configuration.nix index e1104f0..d6b61eb 100644 --- a/profiles/work/configuration.nix +++ b/profiles/work/configuration.nix @@ -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 diff --git a/system/hardware-configuration.nix b/system/hardware-configuration.nix index 910aa09..daf2657 100644 --- a/system/hardware-configuration.nix +++ b/system/hardware-configuration.nix @@ -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 ]; diff --git a/system/wm/hyprland.nix b/system/wm/hyprland.nix index fe5ac65..cd7fb2f 100644 --- a/system/wm/hyprland.nix +++ b/system/wm/hyprland.nix @@ -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; } diff --git a/user/app/browser/qutebrowser.nix b/user/app/browser/qutebrowser.nix index cf19f13..7722223 100644 --- a/user/app/browser/qutebrowser.nix +++ b/user/app/browser/qutebrowser.nix @@ -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+''" diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el index 913818e..5f6c1f6 100644 --- a/user/app/doom-emacs/config.el +++ b/user/app/doom-emacs/config.el @@ -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) diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org index bb328a3..ada60e2 100644 --- a/user/app/doom-emacs/doom.org +++ b/user/app/doom-emacs/doom.org @@ -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 diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index f37db05..4b83b10 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -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);