From 97a37cdaddd148597f86d7b73695a72429309dce Mon Sep 17 00:00:00 2001 From: Kate Temkin Date: Sun, 12 Jan 2025 21:42:34 +0100 Subject: [PATCH] updates & capture trailblazer tweaks --- flake.lock | 138 +++++++++++++++++++++++----------- nixos/configs/fonts-linux.nix | 2 +- nixos/configuration.linux.nix | 3 +- nixos/packages/gui.pkgs.nix | 6 +- wezterm/wezterm.lua | 2 +- 5 files changed, 104 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index eeb07ec..81b986f 100644 --- a/flake.lock +++ b/flake.lock @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1733570843, - "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", + "lastModified": 1736085891, + "narHash": "sha256-bTl9fcUo767VaSx4Q5kFhwiDpFQhBKna7lNbGsqCQiA=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a35b08d09efda83625bef267eb24347b446c80b8", + "rev": "ba9b3173b0f642ada42b78fb9dfc37ca82266f6c", "type": "github" }, "original": { @@ -373,6 +373,59 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "stylix", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "stylix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "stylix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "stylix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "gnome-shell": { "flake": false, "locked": { @@ -418,11 +471,11 @@ ] }, "locked": { - "lastModified": 1734622215, - "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", + "lastModified": 1736066484, + "narHash": "sha256-uTstP36WaFrw+TEHb8nLF14hFPzQBOhmIxzioHCDaL8=", "owner": "nix-community", "repo": "home-manager", - "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", + "rev": "5ad12b6ea06b84e48f6b677957c74f32d47bdee0", "type": "github" }, "original": { @@ -440,11 +493,11 @@ ] }, "locked": { - "lastModified": 1733085484, - "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=", + "lastModified": 1735774425, + "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=", "owner": "nix-community", "repo": "home-manager", - "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163", + "rev": "5f6aa268e419d053c3d5025da740e390b12ac936", "type": "github" }, "original": { @@ -462,11 +515,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1733932114, - "narHash": "sha256-LN4pgLjGWztTlJ4oDcKWvDuTFeUUVgbmXoZ2EXG20Gw=", + "lastModified": 1735572323, + "narHash": "sha256-Wjt+PK15IdaOUoI0sgsRzaNMxKQGSROLe9sOd44+fwM=", "ref": "refs/heads/main", - "rev": "92ed9fee7d169febf53ea85961174fc0a22c2115", - "revCount": 16599, + "rev": "5c7ea4f446de58aa64f78087bb4ec26b9c4111aa", + "revCount": 16600, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -505,11 +558,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1734749715, - "narHash": "sha256-YHUevU8Y6dchCUGsDxJzkzNZnBcNQjAIxMdQJ1NMIek=", + "lastModified": 1736077679, + "narHash": "sha256-psC+8mng3Gy7fjCkFGW9b4/YTcK781LEbCxCnfNHtGw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "4165fa3e7070c1252254ca61f8efeafdd2113293", + "rev": "0bf98d5938dc5f0a7103132945aa301236284401", "type": "github" }, "original": { @@ -538,11 +591,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1734270275, - "narHash": "sha256-FfpxEVDPQ1qSDoLOqnSK2laM6oPklgZhd2YWzxOB8Ns=", + "lastModified": 1736073506, + "narHash": "sha256-c8UMa0Yb8hYm9D3Q/k+GsRxsk8oTYy2OJywCHjWXrlU=", "owner": "YaLTeR", "repo": "niri", - "rev": "d35ad73e3572b0ac704b0c08928f53d0cfd1951f", + "rev": "89678c7b1e6ebe6ec5411db5a2b99bd6bea63565", "type": "github" }, "original": { @@ -634,11 +687,11 @@ }, "nix-hardware": { "locked": { - "lastModified": 1734352517, - "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=", + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "type": "github" }, "original": { @@ -693,11 +746,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1734352517, - "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=", + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "type": "github" }, "original": { @@ -787,16 +840,16 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1734529975, - "narHash": "sha256-ze3IJksru9dN0keqUxY0WNf8xrwfs8Ty/z9v/keyBbg=", + "lastModified": 1735922141, + "narHash": "sha256-vk0xwGZSlvZ/596yxOtsk4gxsIx2VemzdjiU8zhjgWw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "72d11d40b9878a67c38f003c240c2d2e1811e72a", + "rev": "d29ab98cd4a70a387b8ceea3e930b3340d41ac5a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -850,11 +903,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -866,11 +919,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -897,10 +950,10 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1733581040, - "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", - "path": "/nix/store/avxvalb7xf8x4avmrbcvn1vr5yy46kxs-source", - "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "path": "/nix/store/6zgbbqlr7nnfxpzkyj7fsl4fpg89jbw0-source", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "path" }, "original": { @@ -1064,6 +1117,7 @@ "base16-vim": "base16-vim", "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_5", + "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", "nixpkgs": [ @@ -1075,11 +1129,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1734531336, - "narHash": "sha256-BWwJTAiWmZudUdUbyets7e3zQfjvZYtkU51blBnUBjw=", + "lastModified": 1736011580, + "narHash": "sha256-8gmk/i9ZA5C6LGRnqHb5sZ8UKaqT5GnS6XxeSPMSz+s=", "owner": "danth", "repo": "stylix", - "rev": "a2d66f25478103ac9b4adc6d6713794f7005221e", + "rev": "7dfcdb410118dcd02ba1d85a2179a6f1c877403f", "type": "github" }, "original": { diff --git a/nixos/configs/fonts-linux.nix b/nixos/configs/fonts-linux.nix index 4223a8c..86be0ae 100644 --- a/nixos/configs/fonts-linux.nix +++ b/nixos/configs/fonts-linux.nix @@ -10,7 +10,7 @@ deprekages.font-monolisa deprekages.font-codicon deprekages.font-manrope - pkgs.terminus-nerdfont + pkgs.nerd-fonts.terminess-ttf pkgs.terminus_font ]; diff --git a/nixos/configuration.linux.nix b/nixos/configuration.linux.nix index 0ab4323..4523f80 100644 --- a/nixos/configuration.linux.nix +++ b/nixos/configuration.linux.nix @@ -15,8 +15,7 @@ # # Generic system settings. # - time.timeZone = "America/Denver"; - #time.timeZone = "Europe/Amsterdam"; + time.timeZone = "Europe/Amsterdam"; i18n.defaultLocale = "en_GB.utf8"; # Allow use of e.g. 'nix search' and flakes. diff --git a/nixos/packages/gui.pkgs.nix b/nixos/packages/gui.pkgs.nix index e34cfac..ae374ee 100644 --- a/nixos/packages/gui.pkgs.nix +++ b/nixos/packages/gui.pkgs.nix @@ -92,6 +92,10 @@ with pkgs; obsidian onboard + # Development. + jetbrains.rust-rover + jetbrains.clion + # Xwayland support. xwayland cage @@ -133,7 +137,7 @@ with pkgs; gvfs # Music stuffs. - ardour + #ardour linvstmanager # 3D stuffs. diff --git a/wezterm/wezterm.lua b/wezterm/wezterm.lua index 49f34ce..f492fb4 100644 --- a/wezterm/wezterm.lua +++ b/wezterm/wezterm.lua @@ -210,7 +210,7 @@ font_overrides = { hinata = 16, valere = 12, utol = 13, - trailblazer = 10, + trailblazer = 11, kanbaru = 12, aigis = 12; }