diff --git a/common/ghostty.nix b/common/ghostty.nix new file mode 100644 index 00000000..8bdcd5d3 --- /dev/null +++ b/common/ghostty.nix @@ -0,0 +1,23 @@ +{ + pkgs, + device, + inputs, + ... +}: { + programs.ghostty = { + enable = pkgs.stdenv.isLinux; + installBatSyntax = false; + settings = { + theme = "catppuccin-mocha"; + # font-family = [ + # "" + # "Hasklug Nerd Font Mono" + # ]; + window-decoration = false; + title = ""; + command = "fish"; + background-opacity = 0.8; + }; + package = pkgs.ghostty; + }; +} diff --git a/common/gui.nix b/common/gui.nix index eadb7c10..f0883a57 100644 --- a/common/gui.nix +++ b/common/gui.nix @@ -20,7 +20,7 @@ lib.attrsets.optionalAttrs device.hasGui { WantedBy = ["graphical-session.target"]; }; }; - imports = [./kitty.nix]; + imports = [./kitty.nix ./ghostty.nix]; programs = { # Only for checking markdown previews @@ -32,14 +32,6 @@ lib.attrsets.optionalAttrs device.hasGui { asvetliakov.vscode-neovim ]; }; - ghostty = { - enable = pkgs.stdenv.isLinux; - installBatSyntax = false; - settings = { - theme = "catppuccin-mocha"; - }; - package = pkgs.ghostty; - }; }; home.packages = with pkgs; [] diff --git a/common/kitty.nix b/common/kitty.nix index 4317a815..46fb714d 100644 --- a/common/kitty.nix +++ b/common/kitty.nix @@ -8,9 +8,9 @@ enable = device.hasGui; # enable = false; font = { - name = "FiraCode Nerd Font Mono"; + # name = "FiraCode Nerd Font Mono"; # name = "Hasklug Nerd Font Mono"; - # name = "Monaspace Krypton Var Light"; + name = "Monaspace Krypton Var Light"; size = 13; }; settings = { diff --git a/linux/foot.nix b/linux/foot.nix index 9494fd58..9a84872b 100644 --- a/linux/foot.nix +++ b/linux/foot.nix @@ -15,7 +15,7 @@ }; colors = { foreground = "f8f8f2"; - background = 0; + background = "FFFFFF"; alpha = 0.8; "136" = "af8700"; diff --git a/nixos/ryu/configuration.nix b/nixos/ryu/configuration.nix index e34fce84..09d24e18 100644 --- a/nixos/ryu/configuration.nix +++ b/nixos/ryu/configuration.nix @@ -37,6 +37,9 @@ }; systemd.services.NetworkManager-wait-online.enable = lib.mkForce false; + systemd.tmpfiles.rules = [ + "L+ /run/gdm/.config/monitors.xml - - - - ${./monitors.xml}" + ]; security = { sudo.wheelNeedsPassword = false; polkit.enable = true; @@ -94,14 +97,19 @@ devmon.enable = true; gvfs.enable = true; udisks2.enable = true; - gnome.gnome-keyring.enable = true; - - # Configure keymap in X11 - xserver.xkb = { - layout = "us"; - variant = ""; + gnome = { + gnome-keyring.enable = true; + gnome-settings-daemon.enable = true; + }; + xserver = { + # Configure keymap in X11 + xkb = { + layout = "us"; + variant = ""; + }; + displayManager.gdm.enable = true; + desktopManager.gnome.enable = true; }; - xserver.displayManager.gdm.enable = true; pipewire = { enable = true; alsa.enable = true; @@ -263,6 +271,23 @@ NIXOS_OZONE_WL = "1"; }; # etc + gnome.excludePackages = with pkgs; [ + atomix # puzzle game + cheese # webcam tool + epiphany # web browser + evince # document viewer + geary # email reader + gedit # text editor + gnome-characters + gnome-music + gnome-photos + gnome-terminal + gnome-tour + hitori # sudoku game + iagno # go game + tali # poker game + totem # video player + ]; }; musnix.enable = true; diff --git a/nixos/ryu/monitors.xml b/nixos/ryu/monitors.xml new file mode 100644 index 00000000..9fa39ad7 --- /dev/null +++ b/nixos/ryu/monitors.xml @@ -0,0 +1,68 @@ + + + physical + + 0 + 0 + 1 + + left + no + + + + DP-3 + ACR + XV272U KV + 331312FB44203 + + + 2560 + 1440 + 170.001 + + + + + 4000 + 0 + 1 + + right + no + + + + DP-1 + GBT + M27Q + 20120B000001 + + + 2560 + 1440 + 169.831 + + + + + 1440 + 1120 + 1 + yes + + + HDMI-1 + GBT + AORUS FO27Q3 + 0x01010101 + + + 2560 + 1440 + 359.979 + + + + + diff --git a/nixos/ryu/services/samba.nix b/nixos/ryu/services/samba.nix index 3455f7ff..cd1fce81 100644 --- a/nixos/ryu/services/samba.nix +++ b/nixos/ryu/services/samba.nix @@ -2,7 +2,6 @@ services = { samba = { enable = true; - securityType = "user"; openFirewall = true; settings = { global = {