From 0e77ba38e0da108dd0f23196e634e27943656209 Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Sat, 11 Feb 2023 12:58:28 +0100 Subject: [PATCH] switched to foot --- flake.lock | 30 +++++++------- hosts/thinkpad/modules/networks/default.nix | 2 +- users/rouven/modules/alacritty/default.nix | 45 --------------------- users/rouven/modules/default.nix | 2 +- users/rouven/modules/foot/default.nix | 39 ++++++++++++++++++ users/rouven/modules/hyprland/hyprland.conf | 2 +- 6 files changed, 57 insertions(+), 63 deletions(-) delete mode 100644 users/rouven/modules/alacritty/default.nix create mode 100644 users/rouven/modules/foot/default.nix diff --git a/flake.lock b/flake.lock index 4a35541..f2b020c 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1675855108, - "narHash": "sha256-KSiF7aTXTLlocFjMj+61USedaaiscD1ek6f/anFqr3Q=", + "lastModified": 1675935446, + "narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=", "owner": "nix-community", "repo": "home-manager", - "rev": "e631d78ddfbf808fd1cfc4d79039a1b3acda5bed", + "rev": "2dce7f1a55e785a22d61668516df62899278c9e4", "type": "github" }, "original": { @@ -47,11 +47,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1675689419, - "narHash": "sha256-UyCVZVhkZiisMPjfDTAzQIe0YpIkN1Gic97bie3Kf0A=", + "lastModified": 1676066608, + "narHash": "sha256-wUfFD5kZ4+MSX92Zruy/W64m7E5CzORfiVdLOuyJ15o=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "863812a0979646fbc1a51b6593fa25fbad77a7be", + "rev": "bda8208aaa3d7eb9f14d49691b919f8f2e9f5594", "type": "github" }, "original": { @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1675595446, - "narHash": "sha256-Xja7IC1EACtvZMkxJ2HKdvqsT7Zt7rTOYXefsMQWEaQ=", + "lastModified": 1676033584, + "narHash": "sha256-MeF1nR09cUdkCd1KNjzxImwhqsP2cbn/0M6z87fNJAk=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "3e7ba8500f966f6985714326d8371377a563a0cf", + "rev": "44a38bfedc009bcc05eed571e80a397a80075a9f", "type": "github" }, "original": { @@ -122,11 +122,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1675763311, - "narHash": "sha256-bz0Q2H3mxsF1CUfk26Sl9Uzi8/HFjGFD/moZHz1HebU=", + "lastModified": 1675942811, + "narHash": "sha256-/v4Z9mJmADTpXrdIlAjFa1e+gkpIIROR670UVDQFwIw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fab09085df1b60d6a0870c8a89ce26d5a4a708c2", + "rev": "724bfc0892363087709bd3a5a1666296759154b1", "type": "github" }, "original": { @@ -185,11 +185,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1675758931, - "narHash": "sha256-RqYnUQ4I+CUjkYe1MrWSyt6vYKEZ7sHhTw7vrsjJyvc=", + "lastModified": 1675872570, + "narHash": "sha256-RPH3CeTv7ixC2WcYiKyhmIgoH/9tur4Kr+3Vg/pleQk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5dc9710905bcd8d3fa4b8912a120d9a2f9fe25e5", + "rev": "8fec29b009c19538e68d5d814ec74e04f662fbd1", "type": "github" }, "original": { diff --git a/hosts/thinkpad/modules/networks/default.nix b/hosts/thinkpad/modules/networks/default.nix index b0f4f42..ca2cc0f 100644 --- a/hosts/thinkpad/modules/networks/default.nix +++ b/hosts/thinkpad/modules/networks/default.nix @@ -52,7 +52,7 @@ networks."10-wireless-home" = { matchConfig = { Name = "wlp9s0"; - SSID = "Smoerrebroed"; + BSSID = "3c:a6:2f:6f:63:eb 3c:a6:2f:6f:63:ea"; }; networkConfig = { DHCP = "yes"; diff --git a/users/rouven/modules/alacritty/default.nix b/users/rouven/modules/alacritty/default.nix deleted file mode 100644 index 2a18fc7..0000000 --- a/users/rouven/modules/alacritty/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ config, pkgs, nix-colors, ... }: -{ - programs.alacritty = { - enable = true; - settings = { - env = { - TERM = "xterm-256color"; - }; - font = { - size = 10; - }; - shell.program = "${pkgs.zsh}/bin/zsh"; - window.opacity = 0.0; - - colors = { - primary = { - background = "#${config.colorScheme.colors.base00}"; - foreground = "#${config.colorScheme.colors.base05}"; - }; - cursor = { - text = "CellBackground"; - cursor = "CellForeground"; - }; - vi_mode_cursor = { - text = "CellBackground"; - cursor = "CellForeground"; - }; - selection = { - text = "CellForeground"; - background = "#${config.colorScheme.colors.base03}"; - }; - normal = { - black = "#${config.colorScheme.colors.base01}"; - red = "#${config.colorScheme.colors.base08}"; - green = "#${config.colorScheme.colors.base0A}"; - yellow = "#${config.colorScheme.colors.base0B}"; - blue = "#${config.colorScheme.colors.base0D}"; - magenta = "#${config.colorScheme.colors.base0E}"; - cyan = "#${config.colorScheme.colors.base0C}"; - white = "#${config.colorScheme.colors.base05}"; - }; - }; - }; - }; -} diff --git a/users/rouven/modules/default.nix b/users/rouven/modules/default.nix index 98f6728..d09c311 100644 --- a/users/rouven/modules/default.nix +++ b/users/rouven/modules/default.nix @@ -3,7 +3,7 @@ imports = [ ./accounts - ./alacritty + ./foot ./fzf ./git ./gpg diff --git a/users/rouven/modules/foot/default.nix b/users/rouven/modules/foot/default.nix new file mode 100644 index 0000000..45a695b --- /dev/null +++ b/users/rouven/modules/foot/default.nix @@ -0,0 +1,39 @@ +{ config, pkgs, nix-colors, ... }: +{ + home.packages = with pkgs; [ + libsixel + ]; + programs.foot = { + enable = true; + server.enable = true; + settings = rec { + main = { + shell = "${pkgs.zsh}/bin/zsh"; + dpi-aware = "yes"; + font = "monospace:size=8"; + }; + cursor.color = "${colors.background} ${colors.foreground}"; + colors = { + alpha = 0.0; + background = config.colorScheme.colors.base00; + foreground = config.colorScheme.colors.base05; + regular0 = config.colorScheme.colors.base00; + regular1 = config.colorScheme.colors.base01; + regular2 = config.colorScheme.colors.base02; + regular3 = config.colorScheme.colors.base03; + regular4 = config.colorScheme.colors.base04; + regular5 = config.colorScheme.colors.base05; + regular6 = config.colorScheme.colors.base06; + regular7 = config.colorScheme.colors.base07; + bright0 = config.colorScheme.colors.base08; + bright1 = config.colorScheme.colors.base09; + bright2 = config.colorScheme.colors.base0A; + bright3 = config.colorScheme.colors.base0B; + bright4 = config.colorScheme.colors.base0C; + bright5 = config.colorScheme.colors.base0D; + bright6 = config.colorScheme.colors.base0E; + bright7 = config.colorScheme.colors.base0F; + }; + }; + }; +} diff --git a/users/rouven/modules/hyprland/hyprland.conf b/users/rouven/modules/hyprland/hyprland.conf index ae87afb..e806da7 100644 --- a/users/rouven/modules/hyprland/hyprland.conf +++ b/users/rouven/modules/hyprland/hyprland.conf @@ -95,7 +95,7 @@ windowrulev2 = opacity 1.0 1.0, fullscreen:1 $mainMod = SUPER # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more -bind = $mainMod, Return, exec, alacritty +bind = $mainMod, Return, exec, footclient bind = $mainMod SHIFT, Q, killactive, bind = $mainMod, Space, togglefloating, bind = $mainMod, F, fullscreen, 0 # fullscreen