From 0f9d39a08b1c43fa69d35a4364b3a7d7a7de6ddc Mon Sep 17 00:00:00 2001 From: insert Date: Wed, 5 Jun 2024 10:17:55 -0400 Subject: [PATCH] make sway default --- configuration.nix | 10 +++- home-files.nix | 20 ++++--- home.nix | 107 ++++++++++++++++++++++++++++++++++++-- special/insertlaptop.nix | 2 + special/insertpclinux.nix | 2 + 5 files changed, 130 insertions(+), 11 deletions(-) diff --git a/configuration.nix b/configuration.nix index dfc9d81..5642fe8 100644 --- a/configuration.nix +++ b/configuration.nix @@ -57,7 +57,7 @@ enable = true; settings = { default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --asterisks --remember-session --cmd Hyprland"; + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --asterisks --remember-session --cmd sway"; user = "greeter"; }; }; @@ -71,6 +71,14 @@ ''; }; + environment.variables = rec { + NIXOS_OZONE_WL = "1"; + KUBECONFIG = "/home/insert/Desktop/k3s.yaml"; + QT_QPA_PLATFORMTHEME = "qt5ct"; + ELECTRON_OZONE_PLATFORM_HINT = "auto"; + WLR_NO_HARDWARE_CURSORS = "1"; + NO_HARDWARE_CURSORS = "true"; + }; # Configure keymap in X11 services.xserver = { diff --git a/home-files.nix b/home-files.nix index 829450b..16a5f86 100644 --- a/home-files.nix +++ b/home-files.nix @@ -35,25 +35,27 @@ border-color=#ef9f76''; "height": 0, "modules-left": [ "clock", - "hyprland/workspaces" + "sway/workspaces" ], - "modules-center": ["hyprland/window"], + "modules-center": ["sway/window"], "modules-right": [ "wlr/taskbar", + "sway/mode", "temperature", "cpu", "memory", "tray" ], - "hyprland/window": { + "sway/mode": { + "format": " {}", + "max-length": 50 + }, + "sway/window": { "format": "{}" }, - "hyprland/workspaces": { - "on-scroll-up": "hyprctl dispatch workspace e+1", - "on-scroll-down": "hyprctl dispatch workspace e-1", + "sway/workspaces": { "all-outputs": true, - "tooltip": true, "on-click": "activate" }, "wlr/taskbar": { @@ -208,6 +210,10 @@ border-color=#ef9f76''; #memory { color: @green; } +#mode { + color: @red; +} + #battery.charging { color: @green; diff --git a/home.nix b/home.nix index d7b5acf..8303199 100644 --- a/home.nix +++ b/home.nix @@ -95,6 +95,17 @@ }; }; + + home.pointerCursor = { + name = "Catppuccin-Frappe-Blue-Cursors"; + package = pkgs.catppuccin-cursors.frappeBlue; + size = 24; + x11 = { + enable = true; + defaultCursor = "Catppuccin-Frappe-Blue-Cursors"; + }; + }; + programs.nnn = { enable = true; #plugins = { "launch", "imgview" }; @@ -204,19 +215,109 @@ }; }; + home.sessionVariables = { + NIXOS_OZONE_WL = "1"; + KUBECONFIG = "/home/insert/Desktop/k3s.yaml"; + QT_QPA_PLATFORMTHEME = "qt5ct"; + ELECTRON_OZONE_PLATFORM_HINT = "auto"; + WLR_NO_HARDWARE_CURSORS = "1"; + NO_HARDWARE_CURSORS = "true"; + }; + + programs.swaylock.enable = false; wayland.windowManager.sway = { enable = true; + wrapperFeatures.gtk = true; + checkConfig = true; extraOptions = [ "--unsupported-gpu" ]; config = rec { - modifier = "Mod1"; - # Use kitty as default terminal - terminal = "kitty"; + menu = "wofi --show drun --allow-images"; + defaultWorkspace = "workspace number 1"; + floating.border = 4; + window.border = 4; + terminal = "kitty"; + gaps = { + inner = 5; + outer = 10; + }; + colors = { + background = "#303446"; + focused = { + childBorder = "#ca9ee6"; + background = "#ca9ee6"; + text = "#c6d0f5"; + indicator = "#ca9ee6"; + border = "#ca9ee6"; + }; + unfocused = { + childBorder = "#949cbb"; + background = "#626880"; + text = "#c6d0f5"; + indicator = "#949cbb"; + border = "#949cbb"; + }; + focusedInactive = { + childBorder = "#949cbb"; + background = "#626880"; + text = "#c6d0f5"; + indicator = "#949cbb"; + border = "#949cbb"; + }; + urgent = { + childBorder = "#ef9f76"; + background = "#626880"; + text = "#ef9f76"; + indicator = "#ef9f76"; + border = "#ef9f76"; + }; + placeholder = { + childBorder = "#949cbb"; + background = "#626880"; + text = "#c6d0f5"; + indicator = "#949cbb"; + border = "#949cbb"; + }; + + }; startup = [ # Launch Firefox on start {command = "wayvnc 100.120.210.58";} + {command = "swww-daemon";} + {command = "mako";} + #{command = "watch waybar";} + ]; + bars = [ + {command = "waybar"; position = "top"; } ]; }; + #https://github.com/catppuccin/i3/blob/main/themes/catppuccin-frappe + extraConfig = ''set $rosewater #f2d5cf +set $flamingo #eebebe +set $pink #f4b8e4 +set $mauve #ca9ee6 +set $red #e78284 +set $maroon #ea999c +set $peach #ef9f76 +set $yellow #e5c890 +set $green #a6d189 +set $teal #81c8be +set $sky #99d1db +set $sapphire #85c1dc +set $blue #8caaee +set $lavender #babbf1 +set $text #c6d0f5 +set $subtext1 #b5bfe2 +set $subtext0 #a5adce +set $overlay2 #949cbb +set $overlay1 #838ba7 +set $overlay0 #737994 +set $surface2 #626880 +set $surface1 #51576d +set $surface0 #414559 +set $base #303446 +set $mantle #292c3c +set $crust #232634''; }; home.stateVersion = "23.05"; diff --git a/special/insertlaptop.nix b/special/insertlaptop.nix index 6cd3cf6..b7d6c30 100644 --- a/special/insertlaptop.nix +++ b/special/insertlaptop.nix @@ -5,8 +5,10 @@ environment.systemPackages = [ pkgs.acpi pkgs.brightnessctl + pkgs.cifs-utils ]; + home-manager.users.insert.wayland.windowManager.sway.config.modifier = "Mod4"; home-manager.users.insert.home.file.".config/hypr/hyprland.conf" = { text = ''autogenerated = 0 # remove this line to remove the warning diff --git a/special/insertpclinux.nix b/special/insertpclinux.nix index 5a89a51..278ae16 100644 --- a/special/insertpclinux.nix +++ b/special/insertpclinux.nix @@ -106,6 +106,8 @@ /home/insert/Documents/personal-vaultwarden/cert.pem ]; + home-manager.users.insert.wayland.windowManager.sway.config.modifier = "Mod1"; + home-manager.users.insert.home.file.".config/hypr/hyprland.conf" = { text = ''autogenerated = 0 # remove this line to remove the warning