diff --git a/.editorconfig b/.editorconfig index 94e6600..e3207ea 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,6 +1,5 @@ root = true [*] -end_of_line = lf indent_style = space indent_size = 2 \ No newline at end of file diff --git a/README.md b/README.md index 216c7ff..3bc2d5c 100755 --- a/README.md +++ b/README.md @@ -19,7 +19,6 @@ each host should have these files: - move common config such as bootloader and networking settings to [`default.nix`](./default.nix) or some other common spot - multi architecture configuration ([nix-systems](https://github.com/nix-systems/nix-systems)?) - bitwarden - - divide steam and gamemode? - - laptop specific configuration (power profiles daemon, battery, etc) - sddm cursors no work :( - - try out the [new sddm options](https://search.nixos.org/options?channel=unstable&from=0&size=50&sort=relevance&type=packages&query=sddm) \ No newline at end of file + - setup editorconfig everywhere + - divide steam and gamemode? \ No newline at end of file diff --git a/config/waybar.css b/config/waybar.css index 305d5a1..b3bad77 100644 --- a/config/waybar.css +++ b/config/waybar.css @@ -6,8 +6,11 @@ window#waybar { color: @text; + /*background: alpha(@base, 0.6);*/ background: @base; border-radius: 1em; + /*font-family: VictorMono, Iosevka Nerd Font, Noto Sans CJK;*/ + /*font-family: 'Atkinson Hyperlegible', FontAwesome, Noto Sans CJK;*/ font-family: CozetteVector, FontAwesome, Noto Sans CJK; font-size: 13px; font-style: normal; @@ -79,6 +82,10 @@ window#waybar.floating #window { color: @lavender; } +#network { + color: @sapphire; +} + #pulseaudio { color: @pink; } diff --git a/flake.lock b/flake.lock index d538ec3..6cc536e 100644 --- a/flake.lock +++ b/flake.lock @@ -137,26 +137,26 @@ "hyprland": { "inputs": { "hyprcursor": "hyprcursor", + "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang_2", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_3", "systems": "systems_3", + "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1715027791, - "narHash": "sha256-9wO+A4oOWpf0WtJ/iIzxy1mwXXfWuKHPW+E3wmsCI0k=", - "ref": "refs/heads/main", - "rev": "0c446ec5f4c39599ea97cb703dd3ac7718fb9169", - "revCount": 4621, - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" + "lastModified": 1714084064, + "narHash": "sha256-WUEFYyOzgWOr6pK2/1fCohUUF77wuj1zIeP8jvPL0LU=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "1d40af64d352bd5a87c7d53a52707fc5cfc6940e", + "type": "github" }, "original": { - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" + "owner": "hyprwm", + "repo": "Hyprland", + "type": "github" } }, "hyprland-catppuccin": { @@ -179,21 +179,19 @@ "inputs": { "nixpkgs": [ "hyprland", - "xdph", "nixpkgs" ], "systems": [ "hyprland", - "xdph", "systems" ] }, "locked": { - "lastModified": 1714869498, - "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", + "lastModified": 1691753796, + "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", + "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", "type": "github" }, "original": { @@ -342,11 +340,11 @@ ] }, "locked": { - "lastModified": 1714755542, - "narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=", + "lastModified": 1713989318, + "narHash": "sha256-WSsEQQxZQ+bsAWRhi1iXvP8sxgRyNtY3X1V3CfFdP5Q=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828", + "rev": "1cfe2d26a82ce794fd33ec06fa022e68501c5a45", "type": "github" }, "original": { @@ -423,11 +421,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "lastModified": 1713714899, + "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "type": "github" }, "original": { @@ -673,9 +671,29 @@ "type": "github" } }, + "wlroots": { + "flake": false, + "locked": { + "lastModified": 1713731601, + "narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=", + "owner": "hyprwm", + "repo": "wlroots-hyprland", + "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "wlroots-hyprland", + "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", + "type": "github" + } + }, "xdph": { "inputs": { - "hyprland-protocols": "hyprland-protocols", + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], "hyprlang": [ "hyprland", "hyprlang" @@ -690,11 +708,11 @@ ] }, "locked": { - "lastModified": 1714060055, - "narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=", + "lastModified": 1713724432, + "narHash": "sha256-dtU1y4oj/0Y42oauzm93ucFg1AoqETnQ21bmXTIUng0=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a", + "rev": "9ace6f969ce495185df34cc6254fb9d297765478", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ed965f2..6037fbd 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ waybar.url = "github:Alexays/Waybar"; - hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + hyprland.url = "github:hyprwm/Hyprland"; hyprlock.url = "github:hyprwm/hyprlock"; hypridle.url = "github:hyprwm/hypridle"; hyprpaper.url = "github:hyprwm/hyprpaper"; diff --git a/hosts/goopnet-interface/default.nix b/hosts/goopnet-interface/default.nix index 52ed123..9cb92c5 100755 --- a/hosts/goopnet-interface/default.nix +++ b/hosts/goopnet-interface/default.nix @@ -9,7 +9,7 @@ # archives zip xz unzip p7zip zstd # utils - ffmpeg ripgrep jq libqalculate + ripgrep jq libqalculate # nix nix-output-monitor # system @@ -17,11 +17,9 @@ # debug strace ltrace lsof # apps - firefox mpv qalculate-gtk krita - # compatibility - wineWowPackages.waylandFull winetricks + firefox mpv qalculate-gtk # misc - bat file which tree prismlauncher yt-dlp gpu-screen-recorder gpu-screen-recorder-gtk + bat file which tree prismlauncher yt-dlp ffmpeg gpu-screen-recorder gpu-screen-recorder-gtk ] ++ (with pkgs.my; [ # none yet ]) ++ (with pkgs.gnome; [ diff --git a/hosts/goopnet-interface/hardware.nix b/hosts/goopnet-interface/hardware.nix index ecca96a..a48c94c 100755 --- a/hosts/goopnet-interface/hardware.nix +++ b/hosts/goopnet-interface/hardware.nix @@ -21,9 +21,6 @@ efi.canTouchEfiVariables = true; }; - # thermald proactively prevents overheating on intel CPUs and works well with other tools - services.thermald.enable = true; - # nvidia driver services.xserver.videoDrivers = [ "nvidia" ]; @@ -53,8 +50,6 @@ # TODO: remove this once nvidia gets their shit together # https://forums.developer.nvidia.com/t/cueglstreamproducerconnect-returns-error-801-on-525-53-driver/233610/20 NVD_BACKEND = "direct"; - # VA-API on firefox - MOZ_DISABLE_RDD_SANDBOX = "1"; }; fileSystems."/" = diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index c80020d..d595309 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -15,9 +15,6 @@ in { { modules.desktop.fonts.enable = true; modules.desktop.fonts.baseFonts = true; - - # mounting and trash functionality, the recommended solution for most file managers - services.gvfs.enable = true; } (mkIf (cfg.envProto == "wayland") { environment.sessionVariables = { @@ -26,7 +23,6 @@ in { _JAVA_AWT_WM_NONEREPARENTING = "1"; GDK_BACKEND = "wayland,x11"; ANKI_WAYLAND = "1"; - MOZ_ENABLE_WAYLAND = "1"; ELECTRON_OZONE_PLATFORM_HINT = "wayland"; XDG_SESSION_TYPE = "wayland"; SDL_VIDEODRIVER = "wayland"; diff --git a/modules/desktop/fonts.nix b/modules/desktop/fonts.nix index 8bd66f0..f170546 100644 --- a/modules/desktop/fonts.nix +++ b/modules/desktop/fonts.nix @@ -45,19 +45,19 @@ in { package = pkgs.cozette; family = "CozetteVector"; - size = 13; + size = 10; }; monospaceBitmap = mkFontOption "bitmap monospace" { package = pkgs.cozette; family = "Cozette"; - size = 13; + size = 10; }; emoji = mkFontOption "emoji" { package = pkgs.twitter-color-emoji; family = "Twitter Color Emoji"; - size = 13; # not applicable, but whatever + size = 10; # not applicable, but whatever }; }; }; diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index 67e5465..f37a1ba 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -62,14 +62,8 @@ in { "$mod, Q, killactive, " "$mod, V, togglefloating, " - "$mod, P, pseudo, " # dwindle - "$mod, J, togglesplit, " # dwindle - - # move focus with mod + arrow keys - "$mod, left, movefocus, l" - "$mod, right, movefocus, r" - "$mod, up, movefocus, u" - "$mod, down, movefocus, d" + "$mod, P, pseudo, " + "$mod, J, togglesplit, " # scroll through workspaces with mod + scroll "$mod, mouse_down, workspace, e+1" @@ -95,13 +89,12 @@ in { kb_layout = "us"; follow_mouse = 1; - - sensitivity = 0; # -1.0 - 1.0, 0 means no modification }; monitor= [ "DVI-D-1, 1920x1080@60, 0x0, 1" "DP-2, 1920x1080@60, 1920x0, 1" + # "DP-2, modeline 712.75 3840 4160 4576 5312 2160 2163 2168 2237 -hsync +vsync, 1920x0, 1, bitdepth, 10" ]; exec-once = [ "${lib.getExe pkgs.networkmanagerapplet}" ]; @@ -137,8 +130,6 @@ in { "float, initialTitle:^Save As$" "size 1100 730, initialTitle:^Save As$" - "float, class:\.exe$" - # fix focus "stayfocused, class:^pinentry-" "stayfocused, class:^polkit-" @@ -150,11 +141,6 @@ in { "workspace 4, class:vesktop" ]; - layerrule = [ - "animation slide, notifications" - "animation slide, waybar" - ]; - blurls = [ "gtk-layer-shell" # nwg-drawer "waybar" @@ -171,8 +157,8 @@ in { }; drop_shadow = false; - #shadow_range = 30; - #shadow_render_power = 3; + #shadow_range = 4; + #shadow_render_power = true; }; animations = { @@ -193,7 +179,8 @@ in { }; dwindle = { - pseudotile = "yes"; # master swtich for pseudotiling. enabling is mod + P in the keybinds section + pseudotile = "yes"; + preserve_split = "yes"; }; diff --git a/modules/desktop/waybar.nix b/modules/desktop/waybar.nix index 0e4df6d..e91dd5a 100644 --- a/modules/desktop/waybar.nix +++ b/modules/desktop/waybar.nix @@ -26,7 +26,7 @@ in { mainBar = { layer = "top"; position = "top"; - spacing = 4; + #spacing = 4; height = 30; margin-top = 6; margin-left = 6; @@ -116,7 +116,7 @@ in { rewrite = { "(.*) — Mozilla Firefox" = "$1"; # the dash here is SLIGHTLY different. Wow "(.*) - Visual Studio Code" = "$1"; - "(.*\\.nix\\s.*)" = " $1"; + #"(.*\\.nix\\s.*)" = ""; "(\\S+\\.html\\s.*)" = " $1"; "(\\S+\\.css\\s.*)" = " $1"; "(\\S+\\.js\\s.*)" = " $1"; diff --git a/modules/software/editors/vscode.nix b/modules/software/editors/vscode.nix index f2ade51..b5015ce 100644 --- a/modules/software/editors/vscode.nix +++ b/modules/software/editors/vscode.nix @@ -15,7 +15,7 @@ in { jnoortheen.nix-ide oderwat.indent-rainbow usernamehw.errorlens - editorconfig.editorconfig + vadimcn.vscode-lldb ms-vsliveshare.vsliveshare ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ { @@ -30,10 +30,10 @@ in { enableUpdateCheck = false; userSettings = with config.modules.desktop.fonts.fonts; { "editor.fontFamily" = "'${monospace.family}', monospace"; - "editor.fontSize" = monospace.size; + "editor.fontSize" = monospace.size + 3; # needed?? "terminal.integrated.fontFamily" = "\"${monospace.family}\""; - "terminal.integrated.fontSize" = monospace.size; + "terminal.integrated.fontSize" = monospace.size + 3; # needed?? "telemetry.telemetryLevel" = "off";