diff --git a/configs/home-manager/ghostty.nix b/configs/home-manager/ghostty.nix new file mode 100644 index 0000000..8b5b7d0 --- /dev/null +++ b/configs/home-manager/ghostty.nix @@ -0,0 +1,25 @@ +{ + config, + pkgs, + lib, + ... +}: { + home.packages = with pkgs; [ + fira-code + # monocraft + # miracode + nerd-fonts.symbols-only + ]; + + programs.ghostty = { + enable = true; + settings = { + font-family = "Fira Code"; + theme = "Gruvbox Dark"; + font-size = 12; + background-opacity = 0.8; + background-blur = true; + window-decoration = "server"; + }; + }; +} diff --git a/configs/home-manager/kitty.nix b/configs/home-manager/kitty.nix index bdf33b7..bc069d6 100644 --- a/configs/home-manager/kitty.nix +++ b/configs/home-manager/kitty.nix @@ -13,7 +13,7 @@ programs.kitty = { enable = true; - font.name = "FiraCode"; + font.name = "Fira Code"; themeFile = "gruvbox-dark"; settings = { background_opacity = "0.8"; diff --git a/configs/home-manager/picom.nix b/configs/home-manager/picom.nix index 3553e24..0222178 100644 --- a/configs/home-manager/picom.nix +++ b/configs/home-manager/picom.nix @@ -6,7 +6,8 @@ }: { services.picom = { enable = true; - # backend = "glx"; + backend = "glx"; + extraArgs = ["--transparent-clipping"]; }; xsession.windowManager.i3.config.startup = [ { diff --git a/configs/nixos/i3/default.nix b/configs/nixos/i3/default.nix index dca57c9..c8d9e6c 100644 --- a/configs/nixos/i3/default.nix +++ b/configs/nixos/i3/default.nix @@ -22,6 +22,8 @@ }; xkb.options = "ctrl:nocaps,compose:rctrl"; }; + fonts.fontDir.enable = true; + fonts.enableDefaultPackages = true; home-manager.users.${config.host.details.user} = {config, ...}: { home.packages = with pkgs; [ maim @@ -49,7 +51,7 @@ enable = true; config = { modifier = mod; - terminal = "kitty"; + terminal = "ghostty"; menu = "rofi -show drun"; defaultWorkspace = "workspace ${ws1}"; keybindings = { @@ -234,7 +236,7 @@ }; }; imports = [ - ../../home-manager/kitty.nix + ../../home-manager/ghostty.nix ../../home-manager/rofi.nix ../../home-manager/dunst.nix ../../home-manager/feh.nix diff --git a/configs/nixos/i3/i3status-rust.nix b/configs/nixos/i3/i3status-rust.nix index 3024afc..f510b30 100644 --- a/configs/nixos/i3/i3status-rust.nix +++ b/configs/nixos/i3/i3status-rust.nix @@ -4,6 +4,13 @@ lib, ... }: { + fonts.packages = with pkgs; [ + fira-code + monocraft + miracode + nerd-fonts.symbols-only + ]; + services.upower.enable = config.host.details.isLaptop; home-manager.users.${config.host.details.user} = { config, osConfig, @@ -13,8 +20,7 @@ xsession.windowManager.i3.config.bars = [ { fonts = { - names = ["FiraCode Nerd Font"]; - style = "Mono"; + names = ["Fira Code"]; size = 10.0; }; position = "bottom"; diff --git a/configs/nixos/i3/lockscreen.nix b/configs/nixos/i3/lockscreen.nix index 0e7b7ca..1dbbb4d 100644 --- a/configs/nixos/i3/lockscreen.nix +++ b/configs/nixos/i3/lockscreen.nix @@ -4,15 +4,16 @@ lib, ... }: { - environment.systemPackages = with pkgs; [ - betterlockscreen - ]; home-manager.users.${config.host.details.user} = { config, osConfig, lib, ... }: { + home.packages = with pkgs; [ + betterlockscreen + ]; + xsession.windowManager.i3.config = { keybindings = let mod = config.xsession.windowManager.i3.config.modifier; diff --git a/configs/nixos/jellyfin.nix b/configs/nixos/jellyfin.nix index 9fa39c5..a4d5ca3 100644 --- a/configs/nixos/jellyfin.nix +++ b/configs/nixos/jellyfin.nix @@ -9,7 +9,7 @@ ./nginx.nix ]; -#allow us to manage jellyfins media. + #allow us to manage jellyfins media. users.users.${config.host.details.user}.extraGroups = ["jellyfin"]; services.jellyfin = { diff --git a/hosts/harmatan/default.nix b/hosts/harmatan/default.nix index f1e5c97..c8b274f 100644 --- a/hosts/harmatan/default.nix +++ b/hosts/harmatan/default.nix @@ -38,6 +38,12 @@ inputs.nixpkgs.lib.nixosSystem { networking.hostName = "harmatan"; networking.hostId = "7a42af26"; + services.xserver.dpi = 180; + environment.variables = { + GDK_SCALE = "2"; + GDK_DPI_SCALE = "0.5"; + }; + home-manager.sharedModules = [ inputs.sops-nix.homeManagerModules.sops ]; diff --git a/roles/nixos/embedded-dev.nix b/roles/nixos/embedded-dev.nix index 40bfe59..1546c1b 100644 --- a/roles/nixos/embedded-dev.nix +++ b/roles/nixos/embedded-dev.nix @@ -14,7 +14,7 @@ ]; }; - users.users.${config.host.details.user}.extraGroups = [ "dialout" ]; + users.users.${config.host.details.user}.extraGroups = ["dialout"]; programs.nix-ld = { enable = true;