From fe08509e4d75b89cd65c7d3e9696e56e0064d5a4 Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Sun, 2 Jun 2024 01:02:31 +0200 Subject: [PATCH] worf/all: update unstable, fix alacritty, update worf --- README.md | 2 ++ flake.lock | 6 +++--- flake.nix | 23 ++++++++++++++++------- home/alacritty.nix | 27 +++++++++------------------ hosts/worf/home.nix | 13 +------------ 5 files changed, 31 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index d2dccfa..785e0e8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ ## Felixalbs nixos config +![](https://github.com/NixOS/nixos-artwork/blob/master/releases/24.05-uakari/uakari.png?raw=true) + Contains configurations for some nixos servers, some nixos desktops and a [nix-darwin](https://github.com/LnL7/nix-darwin) host. Secrets are managed with [sops-nix](https://github.com/Mic92/sops-nix). diff --git a/flake.lock b/flake.lock index 3c7baec..9c00f93 100644 --- a/flake.lock +++ b/flake.lock @@ -227,11 +227,11 @@ }, "unstable": { "locked": { - "lastModified": 1710631334, - "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index de7ba83..7e58a78 100644 --- a/flake.nix +++ b/flake.nix @@ -33,8 +33,17 @@ , voyager-addons , ... }@inputs: let - overlay-unstable = final: prev: { + pkgs-overlay = final: prev: { unstable = unstable.legacyPackages.${prev.system}; + + python311 = prev.python311.override { + packageOverrides = self: super: { + # k5test is broken on darwin, as of 24.05 + gssapi = super.gssapi.overrideAttrs (old: { + doInstallCheck = false; + }); + }; + }; }; in { @@ -46,7 +55,7 @@ }; modules = [ # Overlays-module makes "pkgs.unstable" available in configuration.nix - ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) + ({ config, pkgs, ... }: { nixpkgs.overlays = [ pkgs-overlay ]; }) ./hosts/voyager/configuration.nix voyager-addons.nixosModules.default @@ -65,7 +74,7 @@ }; modules = [ # Overlays-module makes "pkgs.unstable" available in configuration.nix - ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) + ({ config, pkgs, ... }: { nixpkgs.overlays = [ pkgs-overlay ]; }) ./hosts/defiant/configuration.nix sops-nix.nixosModules.sops @@ -84,7 +93,7 @@ }; modules = [ # Overlays-module makes "pkgs.unstable" available in configuration.nix - ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) + ({ config, pkgs, ... }: { nixpkgs.overlays = [ pkgs-overlay ]; }) ./hosts/edison/configuration.nix sops-nix.nixosModules.sops @@ -102,7 +111,7 @@ }; modules = [ # Overlays-module makes "pkgs.unstable" available in configuration.nix - ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) + ({ config, pkgs, ... }: { nixpkgs.overlays = [ pkgs-overlay ]; }) ./hosts/burnham/configuration.nix sops-nix.nixosModules.sops @@ -120,7 +129,7 @@ }; modules = [ ./hosts/redshirt/configuration.nix - ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) + ({ config, pkgs, ... }: { nixpkgs.overlays = [ pkgs-overlay ]; }) sops-nix.nixosModules.sops ]; }; @@ -133,7 +142,7 @@ }; modules = [ ./hosts/worf/configuration.nix - ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) + ({ config, pkgs, ... }: { nixpkgs.overlays = [ pkgs-overlay ]; }) home-manager.darwinModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; diff --git a/home/alacritty.nix b/home/alacritty.nix index da3f574..976ef2e 100644 --- a/home/alacritty.nix +++ b/home/alacritty.nix @@ -14,6 +14,7 @@ }; dynamic_padding = true; + dynamic_title = true; decorations = "none"; # full/none/transparent/buttonless @@ -46,9 +47,9 @@ size = 14; }; - draw_bold_text_with_bright_colors = true; colors = { + draw_bold_text_with_bright_colors = true; # # Tomorrow Night Bright # primary = { # background = "0x141414"; @@ -150,10 +151,10 @@ # indexed_colors: [] }; - visual_bell = { - animation = "EaseOutExpo"; + bell = { + animation = "Ease"; color = "0xffffff"; - duration = 200; + duration = 100; }; # Key bindings @@ -308,29 +309,19 @@ # - { key: Delete, chars: "\x1b[3~" } - - mouse = { - double_click = { threshold = 300; }; - triple_click = { threshold = 300; }; - hide_when_typing = false; - }; - selection = { semantic_escape_chars = ",│`|:\"' ()[]{}<>"; save_to_clipboard = false; }; - mouse_bindings = [ - { mouse = "Middle"; action = "PasteSelection"; } - ]; - cursor = { - style = "Block"; - blinking = true; + style = { + shape = "Block"; + blinking = "on"; + }; unfocused_hollow = true; }; - dynamic_title = true; }; }; } diff --git a/hosts/worf/home.nix b/hosts/worf/home.nix index c0f73c4..d7ab4a6 100644 --- a/hosts/worf/home.nix +++ b/hosts/worf/home.nix @@ -11,11 +11,9 @@ ]; home.packages = with pkgs; [ - # alacritty emacs-macport iterm2 - prismlauncher - ripes + # prismlauncher spotify borgbackup @@ -23,20 +21,11 @@ gnutar nix-index nodejs - pinentry - rbw tldr unstable.snicat zellij - (python311.withPackages (ps: with ps; [ - pygments - - jupyter - numpy - scipy - pwntools pycryptodome requests