From 8be9000dc1432b412e0e20d88986aa99ae22369d Mon Sep 17 00:00:00 2001 From: victor Date: Wed, 7 Sep 2022 13:57:45 +0200 Subject: [PATCH] laptop cfg --- flake.lock | 18 ++++++------- nixos/hosts/thalassa/null/configuration.nix | 9 +++---- nixos/hosts/thalassa/null/home/default.nix | 2 +- nixos/hosts/thalassa/null/home/eww/eww.scss | 28 ++++++++++++++++++-- nixos/hosts/thalassa/null/home/theme.nix | 29 --------------------- 5 files changed, 40 insertions(+), 46 deletions(-) diff --git a/flake.lock b/flake.lock index c2c01a5..e98d180 100644 --- a/flake.lock +++ b/flake.lock @@ -187,11 +187,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1662381277, - "narHash": "sha256-ytrms5bE5d/XLkge/b91yLTh5iA9YuPz3Wp7/ZqWdnw=", + "lastModified": 1662472236, + "narHash": "sha256-epA5KzVUxw9ZV+st2aU4oFfJGyIcYleTpX28wsCQQP4=", "owner": "nix-community", "repo": "home-manager", - "rev": "de079ec3714e7b201c17cbe03b62be8d6dc7b3c0", + "rev": "de94878b6b83f7f2cfda9cdff005417a6d7ac82c", "type": "github" }, "original": { @@ -206,11 +206,11 @@ "wlroots": "wlroots" }, "locked": { - "lastModified": 1662378652, - "narHash": "sha256-+GN9ZKyCh3p0fVsVYqPaq0csJlIFOohCCqG3QuQJemg=", + "lastModified": 1662487199, + "narHash": "sha256-U4M9TdcGU/YMMP4pCcTldxiecPb40X4hHvuyH6+oSiU=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "a74b8033ca97bdfc53a0a8aaf3aec9aec56fa410", + "rev": "789eedd115917bc0ae7e5ee7317af67295439fd8", "type": "github" }, "original": { @@ -369,11 +369,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1662296777, - "narHash": "sha256-NE/f95zRetFGw+H5fpvB3ye9AM72mc9x/71YL9Fkzpk=", + "lastModified": 1662488521, + "narHash": "sha256-+Lg/WMWyvpgsk0eSq0/0I1jkZ70oOCc2W3LMYk6pHTU=", "owner": "NULLx76", "repo": "nixpkgs", - "rev": "e027345597b2a62e38f31d76fa71efccf5cbd8a2", + "rev": "ab265225e8c1abb533f9d650c3f68a090001ebd0", "type": "github" }, "original": { diff --git a/nixos/hosts/thalassa/null/configuration.nix b/nixos/hosts/thalassa/null/configuration.nix index b5a16ce..c0e2291 100644 --- a/nixos/hosts/thalassa/null/configuration.nix +++ b/nixos/hosts/thalassa/null/configuration.nix @@ -16,7 +16,7 @@ let ''; run-hyprland = pkgs.writeShellScriptBin "run-hyprland" '' export _JAVA_AWT_WM_NONREPARENTING=1 - export XCURSOR_SIZE=24 + export XCURSOR_SIZE=32 export CLUTTER_BACKEND=wayland export XDG_SESSION_TYPE=wayland @@ -26,6 +26,7 @@ let export WLR_BACKEND=vulkan export QT_QPA_PLATFORM=wayland export GDK_BACKEND=wayland + export SDL_VIDEODRIVER=wayland exec Hyprland ''; @@ -131,22 +132,20 @@ in }; environment.loginShellInit = '' - if [[ "$(tty)" == /dev/tty1 ]]; then + if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then ${run-hyprland}/bin/run-hyprland fi ''; services.xserver = { - # enable = true; + enable = false; layout = "us"; xkbVariant = "altgr-intl"; xkbOptions = "caps:swapescape"; videoDrivers = [ "nvidia" ]; }; - # hardware.nvidia.modesetting.enable = true; hardware.nvidia = { - # open = true; prime = { offload.enable = true; intelBusId = "PCI:0:2:0"; diff --git a/nixos/hosts/thalassa/null/home/default.nix b/nixos/hosts/thalassa/null/home/default.nix index d1f16c9..19c4cf0 100644 --- a/nixos/hosts/thalassa/null/home/default.nix +++ b/nixos/hosts/thalassa/null/home/default.nix @@ -18,6 +18,7 @@ element-desktop-wayland fluxcd fusee-launcher + gcc gimp gnome.eog gnome.file-roller @@ -41,7 +42,6 @@ wf-recorder # Screenrecorder wl-clipboard # Clipboard manager wofi # Wayland rofi - ]; programs.foot = { diff --git a/nixos/hosts/thalassa/null/home/eww/eww.scss b/nixos/hosts/thalassa/null/home/eww/eww.scss index ff48fd2..877db8f 100644 --- a/nixos/hosts/thalassa/null/home/eww/eww.scss +++ b/nixos/hosts/thalassa/null/home/eww/eww.scss @@ -1,5 +1,29 @@ -@import url(./colours.scss); - +$rosewater: #f2d5cf; +$flamingo: #eebebe; +$pink: #f4b8e4; +$mauve: #ca9ee6; +$red: #e78284; +$maroon: #ea999c; +$peach: #ef9f76; +$yellow: #e5c890; +$green: #a6d189; +$teal: #81c8be; +$sky: #99d1db; +$sapphire: #85c1dc; +$blue: #8caaee; +$lavender: #babbf1; +$text: #c6d0f5; +$subtext1: #b5bfe2; +$subtext0: #a5adce; +$overlay2: #949cbb; +$overlay1: #838ba7; +$overlay0: #737994; +$surface2: #626880; +$surface1: #51576d; +$surface0: #414559; +$base: #303446; +$mantle: #292c3c; +$crust: #232634; $light-gray: #9699b7; * { diff --git a/nixos/hosts/thalassa/null/home/theme.nix b/nixos/hosts/thalassa/null/home/theme.nix index c74e81a..a4f2ee1 100644 --- a/nixos/hosts/thalassa/null/home/theme.nix +++ b/nixos/hosts/thalassa/null/home/theme.nix @@ -33,35 +33,6 @@ let }; in { - home.file.".config/eww/colours.scss".text = '' - $rosewater: #${colour.rosewater}; - $flamingo: #${colour.flamingo}; - $pink: #${colour.pink}; - $mauve: #${colour.mauve}; - $red: #${colour.red}; - $maroon: #${colour.maroon}; - $peach: #${colour.peach}; - $yellow: #${colour.yellow}; - $green: #${colour.green}; - $teal: #${colour.teal}; - $sky: #${colour.sky}; - $sapphire: #${colour.sapphire}; - $blue: #${colour.blue}; - $lavender: #${colour.lavender}; - $text: #${colour.text}; - $subtext1: #${colour.subtext1}; - $subtext0: #${colour.subtext0}; - $overlay2: #${colour.overlay2}; - $overlay1: #${colour.overlay1}; - $overlay0: #${colour.overlay0}; - $surface2: #${colour.surface2}; - $surface1: #${colour.surface1}; - $surface0: #${colour.surface0}; - $base: #${colour.base}; - $mantle: #${colour.mantle}; - $crust: #${colour.crust}; - ''; - # Note, pink and blue are switched programs.foot.settings.colors = { foreground = colour.text; # Text