From a09b132545926e782ae8dfa0198b8b1f1da1e6ee Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Tue, 21 May 2024 21:40:00 +0200 Subject: [PATCH] HYPRLAND FINALLY WORKS NICE BABY --- flake.lock | 66 +++++++++++++++---------------- hosts/vali/mars/configuration.nix | 6 +-- modules/gui/foot.nix | 41 ++++++++++--------- modules/gui/stylix.nix | 14 +++---- modules/wms/wayland/variables.nix | 4 +- options/common/gpu/nvidia.nix | 16 ++++---- 6 files changed, 73 insertions(+), 74 deletions(-) diff --git a/flake.lock b/flake.lock index 347528e..9aee3d5 100644 --- a/flake.lock +++ b/flake.lock @@ -239,11 +239,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1716196045, - "narHash": "sha256-WLxzdjUlIuf56IYdILyrDUtyUhRlWsiCF7xuhunErMA=", + "lastModified": 1716311169, + "narHash": "sha256-hCt9zCXnuvra2X0+fQiejAfpr6nNdR1hSfl63UxmVbM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "96e0ae1f75b858ce26b84fb2b4bb2a0249dab918", + "rev": "04c759ffb7af09dbce3c9068c4da7f2f0343da89", "type": "github" }, "original": { @@ -260,11 +260,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1716186410, - "narHash": "sha256-U/5eHWooIohw8uF0cQd8ZQll8gMZxb0QeaVEGrXJCgY=", + "lastModified": 1716272846, + "narHash": "sha256-MtL0YhG20cngHsS6PIdpA3bkLnSx6XJBd2V8R9RaEc4=", "owner": "nix-community", "repo": "fenix", - "rev": "49bf3506637ee9f30ab589104f479ec61db5924c", + "rev": "063d7e5fac454edd35b7e2cedb6ca9fb1410c79b", "type": "github" }, "original": { @@ -825,11 +825,11 @@ ] }, "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": { @@ -875,11 +875,11 @@ ] }, "locked": { - "lastModified": 1715879663, - "narHash": "sha256-/DwglRvj4XF4ECdNtrCIbthleszAZBwOiXG5A6r0K/c=", + "lastModified": 1716058375, + "narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "f5181a068c1b06f2db51f6222e50a0c665a2b0c3", + "rev": "3afed4364790aebe0426077631af1e164a9650cc", "type": "github" }, "original": { @@ -1084,11 +1084,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1716061101, - "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", + "lastModified": 1716218643, + "narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", + "rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee", "type": "github" }, "original": { @@ -1106,11 +1106,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1716196864, - "narHash": "sha256-yNldG6R/7b5Ji1Y6aq0FBqOM+Bs2wO7fV3pe9+oJApU=", + "lastModified": 1716315695, + "narHash": "sha256-F6mniYkD9gZTo8ufpjtKf16+63+xnnpbcfdB0rTGbfM=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "27b79ae5d67073135c289f0e86bd9ffcc6413ca4", + "rev": "2b6362ef6935cf4b1514a4d4b1f29a7dd8a14b36", "type": "github" }, "original": { @@ -1137,11 +1137,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1715961556, - "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=", + "lastModified": 1716137900, + "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64", + "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", "type": "github" }, "original": { @@ -1153,11 +1153,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1715787315, - "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", + "lastModified": 1716137900, + "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", + "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", "type": "github" }, "original": { @@ -1265,11 +1265,11 @@ }, "nur": { "locked": { - "lastModified": 1716192985, - "narHash": "sha256-UHUsp79I9VMXvv5HIJxyoi3OBBAE6i/N+LdaOrwcF6s=", + "lastModified": 1716316781, + "narHash": "sha256-ybuEOdUtk7/X9GjZp72npoSk5GHT+9jpL7aPoXaTu7A=", "owner": "nix-community", "repo": "NUR", - "rev": "8af28f3dbe63e2fd0df3dec6dc4d30dff12b06b8", + "rev": "83bfd9ae2490c05fac7381100a13211cd27c3109", "type": "github" }, "original": { @@ -1424,11 +1424,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1716037261, - "narHash": "sha256-eF0A36GdegKkEiwFArjCysGU/XEYvzj7x5jfkFMtmqM=", + "lastModified": 1716206302, + "narHash": "sha256-5Qc3aQGVyPEOuN82zVamStaV81HebHvLjk3fGfpyCPY=", "owner": "danth", "repo": "stylix", - "rev": "76e7daf5a16d442ac98e844582f7dc1354610886", + "rev": "81df8443556335016d6f0bc22630a95776a56d8b", "type": "github" }, "original": { @@ -1600,11 +1600,11 @@ ] }, "locked": { - "lastModified": 1715788457, - "narHash": "sha256-32HOkjSIyANphV0p5gIwP4ONU/CcinhwOyVFB+tL/d0=", + "lastModified": 1716290197, + "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "af7c87a32f5d67eb2ada908a6a700f4e74831943", + "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", "type": "github" }, "original": { diff --git a/hosts/vali/mars/configuration.nix b/hosts/vali/mars/configuration.nix index 849a539..3e55efc 100644 --- a/hosts/vali/mars/configuration.nix +++ b/hosts/vali/mars/configuration.nix @@ -23,7 +23,7 @@ programs.kdeconnect.enable = true; programs.dconf.enable = true; # boot.kernelModules = [ "v4l2loopback" ]; - boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = pkgs.linuxPackages_zen; # boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ]; # services.picom.enable = true; services.emacs.enable = true; @@ -63,8 +63,8 @@ }; editors = { emacs = { - enable = true; - doom.enable = false; + enable = false; + doom.enable = false; }; helix.enable = true; kakoune.enable = true; diff --git a/modules/gui/foot.nix b/modules/gui/foot.nix index bd632c7..96c5be6 100644 --- a/modules/gui/foot.nix +++ b/modules/gui/foot.nix @@ -19,30 +19,29 @@ in { server.enable = cfg.server; settings = { main = { - # term = "foot"; - # app-id = "foot"; - # title = "foot"; - # locked-title = "no"; + term = "foot"; + app-id = "foot"; + title = "foot"; + locked-title = "no"; - # font = "JetBrains Mono Nerd Font:size=14"; - # line-height = 20; - # letter-spacing = 0; - # horizontal-letter-offset = 0; - # vertical-letter-offset = -0.75; - # box-drawings-uses-font-glyphs = "no"; - # dpi-aware = "no"; + line-height = 20; + letter-spacing = 0; + horizontal-letter-offset = 0; + vertical-letter-offset = -0.75; + box-drawings-uses-font-glyphs = "no"; + dpi-aware = "no"; - # initial-window-size-chars = "104x36"; - # initial-window-mode = "windowed"; - # pad = "5x5 center"; - # resize-delay-ms = 100; + initial-window-size-chars = "104x36"; + initial-window-mode = "windowed"; + pad = "5x5 center"; + resize-delay-ms = 100; - # notify = - # "${pkgs.libnotify}/bin/notify-send -a \${app-id} -i \${app-id} \${title} \${body}"; + notify = + "${pkgs.libnotify}/bin/notify-send -a \${app-id} -i \${app-id} \${title} \${body}"; - # bold-text-in-bright = "no"; - # word-delimiters = '',│`|:"'()[]{}<>''; - # selection-target = "primary"; + bold-text-in-bright = "no"; + word-delimiters = '',│`|:"'()[]{}<>''; + selection-target = "primary"; }; bell = { urgent = "yes"; @@ -66,7 +65,7 @@ in { abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[]''; }; cursor = { - style = "block"; + style = "beam"; blink = "no"; }; mouse = { diff --git a/modules/gui/stylix.nix b/modules/gui/stylix.nix index 9ea9b00..0b6d906 100644 --- a/modules/gui/stylix.nix +++ b/modules/gui/stylix.nix @@ -23,7 +23,7 @@ in { kitty.enable = true; lazygit.enable = true; rofi.enable = true; - foot.enable = false; + foot.enable = true; tmux.enable = true; waybar.enable = true; vim.enable = true; @@ -54,14 +54,12 @@ in { name = "JetBrainsMono"; }; serif = { - package = - (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }); - name = "JetBrainsMono"; + package = pkgs.noto-fonts; + name = "Noto Serif"; }; sansSerif = { - package = - (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }); - name = "JetBrainsMono"; + package = pkgs.lexend; + name = "Lexend"; }; emoji = { package = pkgs.noto-fonts-emoji; @@ -74,6 +72,8 @@ in { image = ../../assets/wallpapers/FreeBSD.png; polarity = "dark"; targets.plymouth.enable = false; + base16Scheme = + "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; }; }; } diff --git a/modules/wms/wayland/variables.nix b/modules/wms/wayland/variables.nix index 8d70786..58e8dc7 100644 --- a/modules/wms/wayland/variables.nix +++ b/modules/wms/wayland/variables.nix @@ -25,8 +25,8 @@ in { DISABLE_QT_COMPAT = "0"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; MOZ_ENABLE_WAYLAND = "1"; - WLR_BACKEND = "vulkan"; - WLR_RENDERER = "vulkan"; + # WLR_BACKEND = "vulkan"; + # WLR_RENDERER = "vulkan"; XDG_SESSION_TYPE = "wayland"; SDL_VIDEODRIVER = "wayland"; CLUTTER_BACKEND = "wayland"; diff --git a/options/common/gpu/nvidia.nix b/options/common/gpu/nvidia.nix index a843b83..b6f06e3 100644 --- a/options/common/gpu/nvidia.nix +++ b/options/common/gpu/nvidia.nix @@ -12,14 +12,14 @@ powerManagement.enable = false; powerManagement.finegrained = false; nvidiaSettings = false; - # package = config.boot.kernelPackages.nvidiaPackages.beta; - package = config.boot.kernelPackages.nvidiaPackages.mkDriver { - version = "555.42.02"; - sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk="; - openSha256 = "sha256-3/eI1VsBzuZ3Y6RZmt3Q5HrzI2saPTqUNs6zPh5zy6w="; - settingsSha256 = ""; - persistencedSha256 = ""; - }; + #package = config.boot.kernelPackages.nvidiaPackages.beta; + package = config.boot.kernelPackages.nvidiaPackages.mkDriver { + version = "555.42.02"; + sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk="; + openSha256 = "sha256-3/eI1VsBzuZ3Y6RZmt3Q5HrzI2saPTqUNs6zPh5zy6w="; + settingsSha256 = ""; + persistencedSha256 = ""; + }; }; }