Compare commits

..

7 commits

9 changed files with 49 additions and 7 deletions

View file

@ -148,6 +148,10 @@ with builtins; {
# keyboard.uhk.enable = true; # keyboard.uhk.enable = true;
}; };
services.avahi = {
enable = true;
};
security.rtkit.enable = true; security.rtkit.enable = true;
users.users.jade = { users.users.jade = {

View file

@ -36,7 +36,13 @@
devShells."x86_64-linux".default = pkgs.mkShell { devShells."x86_64-linux".default = pkgs.mkShell {
buildInputs = [ buildInputs = [
(pkgs.haskellPackages.ghcWithPackages (pkgs.haskellPackages.ghcWithPackages
(pkgs: with pkgs; [xmonad xmonad-contrib xmobar])) (pkgs:
with pkgs; [
xmonad
xmonad-contrib
xmobar
statgrab
]))
pkgs.haskell-language-server pkgs.haskell-language-server
]; ];
}; };

View file

@ -1,4 +1,5 @@
import Xmobar import Xmobar
import System.Statgrab
-- TODOS: -- TODOS:
-- - custom cpu module -- - custom cpu module
@ -10,12 +11,14 @@ import Xmobar
-- - mail/message monitoring -- - mail/message monitoring
-- - if possible, different bars per workspace -- - if possible, different bars per workspace
data CustomCpu = CustomCpu data CustomCpu = CustomCpu
deriving (Read, Show) deriving (Read, Show)
instance Exec CustomCpu where instance Exec CustomCpu where
alias CustomCpu = "cpu" alias CustomCpu = "cpu"
run CustomCpu = return "meow" run CustomCpu = do
-- return (show :: IO String (snapshot :: Stats CPUPercent))
return "meow"
fc code content = "<fc=" ++ code ++ ">" ++ content ++ "</fc>" fc code content = "<fc=" ++ code ++ ">" ++ content ++ "</fc>"
@ -31,7 +34,7 @@ config =
bgColor = "#282828", bgColor = "#282828",
fgColor = "#ebdbb2", fgColor = "#ebdbb2",
commands = commands =
[ Run $ Memory ["t", "Mem: <usedratio>%"] 10, [ Run $ Xmobar.Memory ["t", "Mem: <usedratio>%"] 10,
Run $ CustomCpu, Run $ CustomCpu,
Run $ Date (icon "\983277" ++ " %Y" ++ sep "-" ++ "%m" ++ sep "-" ++ "%d " ++ icon "\988236" ++ " %H" ++ sep ":" ++ "%M" ++ sep ":" ++ "%S ") "date" 10 Run $ Date (icon "\983277" ++ " %Y" ++ sep "-" ++ "%m" ++ sep "-" ++ "%d " ++ icon "\988236" ++ " %H" ++ sep ":" ++ "%M" ++ sep ":" ++ "%S ") "date" 10
], ],

View file

@ -43,6 +43,22 @@
systemd.services."ModemManager".wants = ["NetworkManager.service"]; systemd.services."ModemManager".wants = ["NetworkManager.service"];
systemd.services."ModemManager".wantedBy = ["multi-user.target"]; systemd.services."ModemManager".wantedBy = ["multi-user.target"];
environment.variables = {
VDPAU_DRIVER = lib.mkIf config.hardware.opengl.enable (lib.mkDefault "va_gl");
};
hardware.opengl = {
enable = true;
extraPackages = with pkgs; [
intel-ocl
intel-media-driver
intel-vaapi-driver
intel-compute-runtime
libvdpau-va-gl
mesa.drivers
];
};
programs.wireshark.enable = true; programs.wireshark.enable = true;
boot.resumeDevice = "/dev/disk/by-uuid/4f9e8afa-f8d7-40bf-b3ea-17e8e8fbb694"; boot.resumeDevice = "/dev/disk/by-uuid/4f9e8afa-f8d7-40bf-b3ea-17e8e8fbb694";

View file

@ -13,7 +13,7 @@
]; ];
boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
boot.initrd.kernelModules = []; boot.initrd.kernelModules = ["i915"];
boot.kernelModules = ["kvm-intel"]; boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = []; boot.extraModulePackages = [];

View file

@ -24,6 +24,8 @@
fspy fspy
scribus scribus
fontforge-gtk
libreoffice libreoffice
typst typst

View file

@ -29,6 +29,8 @@
"darkreader" "darkreader"
"sponsorblock" "sponsorblock"
"youtube-mrbeastify" "youtube-mrbeastify"
"return-youtube-dislikes"
"multi-account-containers"
]; ];
Extensions.Uninstall = [ Extensions.Uninstall = [
"google@search.mozilla.org" "google@search.mozilla.org"

View file

@ -8,7 +8,11 @@
pkgs, pkgs,
... ...
}: let }: let
xmobarGhc = pkgs.haskellPackages.ghcWithPackages (pkgs: with pkgs; [xmobar]); xmobarGhc = pkgs.haskellPackages.ghcWithPackages (pkgs:
with pkgs; [
xmobar
statgrab
]);
in { in {
home.packages = [xmobarGhc pkgs.xmonadctl]; home.packages = [xmobarGhc pkgs.xmonadctl];
programs.xmobar = { programs.xmobar = {

View file

@ -812,7 +812,7 @@ def ed [
] { ] {
let ext = $file | path parse | get extension; let ext = $file | path parse | get extension;
match $ext { match $ext {
"typ" => {|| zellij run --direction down -- typst watch $file --open ($cmdargs | str join ' ') } "typ" => {|| zellij run --direction down -- typst watch $file ($cmdargs | prepend '--open' | str join ' ') }
}; };
hx $file hx $file
} }
@ -829,3 +829,8 @@ alias gp = git push;
alias gl = git pull; alias gl = git pull;
alias gs = git status; alias gs = git status;
alias clip = xclip -selection c; alias clip = xclip -selection c;
alias cr = cargo run;
alias cl = cargo clippy;
alias cb = cargo build;
alias cch = cargo check;