diff --git a/common.nix b/common.nix index bf05683..eaee490 100644 --- a/common.nix +++ b/common.nix @@ -158,11 +158,13 @@ users.users.jade = { inkscape-with-extensions virglrenderer ddccontrol-db glab firebird-emu obs-studio kdenlive openal mullvad mullvad-vpn - sl lolcat ifuse bitwarden bitwarden-cli + sl lolcat ifuse fspy spacenav-cube-example cava appimage-run spacenavd libspnav fluent-reader #prismlauncher + evolution + godot gitg gnome-builder git-crypt gpick qdirstat file whois ffmpeg_5 scribus p7zip file nmap cmatrix tree socat libreoffice ]; @@ -178,7 +180,7 @@ users.users.jade = { xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; fonts.fonts = with pkgs; [ - nerdfonts montserrat noto-fonts + nerdfonts montserrat noto-fonts atkinson-hyperlegible ]; programs.mtr.enable = true; diff --git a/modules/desktop.nix b/modules/desktop.nix index e7f6bf0..676fb19 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -16,6 +16,26 @@ let ocr-screenshot = pkgs.writeShellScriptBin "ocr-screenshot.sh" (builtins.readFile ../scripts/desktop/ocr-screenshot.sh); # rofi calculator copied from https://github.com/barbuk/menu-qalc menu-qalc = pkgs.writeShellScriptBin "menu-qalc" (builtins.readFile ../scripts/desktop/menu-qalc.sh); + #bitw = pkgs.buildGo118Module rec { + #pname = "bitw"; + #version = "0.1.0"; + #src = pkgs.fetchFromGitHub { + #owner = "mvdan"; + #repo = "bitw"; + #rev = "9da6ca0287ae8e4b1aa7fcdf7c4e8c2736718c3b"; + #sha256 = "sha256-qe9y6BEsfsEiPFXlM/SFliSd+2fnfDMHyw/O6EE5hpA="; + #}; + #nativeBuildInputs = with pkgs; [ gitMinimal ]; + #doCheck = false; + #vendorHash = "sha256-KQr0DtyH3xzlFwsDl3MGLRRLQC4+EtdTOG7IhmNCzV4="; + #vendorHash = null; + #GOFLAGS = "-mod=readonly"; + #proxyVendor = true; + #deleteVendor = true; + #preBuild = '' + #go mod vendor + #''; + #}; in with lib; { options.jade.desktop = { enable = mkEnableOption "Enable the i3 setup"; @@ -35,6 +55,10 @@ in with lib; { libqalculate # needed by menu-qalc ddgr jq # needed by searchwolf brillo # kb backlight + + # pw manager + bitwarden bitwarden-cli + # custom scripts window-screenshot desktop-ctl em-record em-play em-play-loop ocr-screenshot menu-qalc pc-get pc-set searchwolf @@ -166,7 +190,7 @@ in with lib; { # }}} # Visuals {{{ fonts = { - names = [ "Montserrat" ]; + names = [ "Atkinson Hyperlegible" ]; style = "Regular"; size = 9.0; }; @@ -374,11 +398,11 @@ in with lib; { name = "phinger-cursors"; size = 30; }; - #font = { - #package = pkgs.montserrat; - #name = "Montserrat"; - #size = 11; - #}; + font = { + package = pkgs.atkinson-hyperlegible; + name = "Atkinson Hyperlegible"; + size = 11.5; + }; iconTheme = { package = pkgs.gruvbox-dark-icons-gtk; name = "gruvbox-dark-icons"; diff --git a/other/rofi-themes/applauncher.rasi b/other/rofi-themes/applauncher.rasi index 987ab55..f099de8 100644 --- a/other/rofi-themes/applauncher.rasi +++ b/other/rofi-themes/applauncher.rasi @@ -44,7 +44,7 @@ listview { element { border: 0; padding: 10px; - font: "Mono 8"; + font: "Atkinson Hyperlegible 8"; orientation: vertical; border-radius: 10px; } @@ -68,7 +68,7 @@ element-text selected, element-icon selected { element-text, element-icon { font-size: 2em; - font: "Montserrat"; + font: "Atkinson Hyperlegible"; horizontal-align: 0.5; }