From 3fc61d5cd640e2995973d3caf02c6f22135decbd Mon Sep 17 00:00:00 2001 From: Markus Heurung Date: Wed, 19 Jun 2024 15:25:40 +0200 Subject: [PATCH 1/6] update flake --- flake.lock | 88 +++++++++++++++++++++++++++--------------------------- home.nix | 4 +-- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/flake.lock b/flake.lock index ce4a095..61ed72c 100644 --- a/flake.lock +++ b/flake.lock @@ -101,15 +101,15 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1663659192, - "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", - "owner": "chriskempson", + "lastModified": 1716150083, + "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "owner": "tinted-theming", "repo": "base16-vim", - "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", + "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", "type": "github" }, "original": { - "owner": "chriskempson", + "owner": "tinted-theming", "repo": "base16-vim", "type": "github" } @@ -123,11 +123,11 @@ ] }, "locked": { - "lastModified": 1713532798, - "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", "owner": "numtide", "repo": "devshell", - "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", "type": "github" }, "original": { @@ -190,11 +190,11 @@ ] }, "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -251,11 +251,11 @@ ] }, "locked": { - "lastModified": 1716213921, - "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "type": "github" }, "original": { @@ -310,11 +310,11 @@ ] }, "locked": { - "lastModified": 1717525419, - "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", + "lastModified": 1718788307, + "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", "owner": "nix-community", "repo": "home-manager", - "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", + "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", "type": "github" }, "original": { @@ -332,11 +332,11 @@ ] }, "locked": { - "lastModified": 1717052710, - "narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=", + "lastModified": 1718526747, + "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", "owner": "nix-community", "repo": "home-manager", - "rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae", + "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792", "type": "github" }, "original": { @@ -353,11 +353,11 @@ ] }, "locked": { - "lastModified": 1714981474, - "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "owner": "nix-community", "repo": "home-manager", - "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "type": "github" }, "original": { @@ -374,11 +374,11 @@ ] }, "locked": { - "lastModified": 1716993688, - "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", + "lastModified": 1718662658, + "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", + "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf", "type": "github" }, "original": { @@ -389,11 +389,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717196966, - "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "lastModified": 1718530797, + "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "rev": "b60ebf54c15553b393d144357375ea956f89e9a9", "type": "github" }, "original": { @@ -404,11 +404,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1717265169, - "narHash": "sha256-IITcGd6xpNoyq9SZBigCkv4+qMHSqot0RDPR4xsZ2CA=", + "lastModified": 1718478900, + "narHash": "sha256-v43N1gZLcGkhg3PdcrKUNIZ1L0FBzB2JqhIYEyKAHEs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc", + "rev": "c884223af91820615a6146af1ae1fea25c107005", "type": "github" }, "original": { @@ -432,11 +432,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1717574948, - "narHash": "sha256-8C2S1WWC4ty1LePzFWp+D6re/pggCJj9tWslddJ/wUw=", + "lastModified": 1718739916, + "narHash": "sha256-VgRcAEeS8/ZSZgcwg1hYltavagEo47ZsmR7cRZ6VbRY=", "owner": "nix-community", "repo": "nixvim", - "rev": "a54ee8ad64c91b587c3460126bad25a441c1118c", + "rev": "0e93a59567d0850e54cea26b1b5c541a7182c7cf", "type": "github" }, "original": { @@ -462,11 +462,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1717455931, - "narHash": "sha256-8Q6mKSsto8gaGczXd4G0lvawdAYLa5Dlh3/g4hl5CaM=", + "lastModified": 1718506969, + "narHash": "sha256-Pm9I/BMQHbsucdWf6y9G3xBZh3TMlThGo4KBbeoeczg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d4555e80d80d2fa77f0a44201ca299f9602492a0", + "rev": "797ce4c1f45a85df6dd3d9abdc53f2691bea9251", "type": "github" }, "original": { @@ -492,11 +492,11 @@ ] }, "locked": { - "lastModified": 1717593209, - "narHash": "sha256-Hc8yIj1CDuVOpUV13ZWvR+5CPXysBmuUqqB8bJ7/CgQ=", + "lastModified": 1718789425, + "narHash": "sha256-YJvgBThIUPeywoTjnFk+F73c0l2oaAENIrz2uldqb5A=", "owner": "danth", "repo": "stylix", - "rev": "1d3826ceed91ae67562f28ee2e135813a11e47a6", + "rev": "7dcab0711bfc103a1fb05ba643ee7a3bd309fbe4", "type": "github" }, "original": { @@ -528,11 +528,11 @@ ] }, "locked": { - "lastModified": 1715940852, - "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", + "lastModified": 1718522839, + "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", + "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index dcea351..50f8dad 100644 --- a/home.nix +++ b/home.nix @@ -492,8 +492,8 @@ stylix = { image = /home/muhh/Sync/Backgrounds/wald.jpg; polarity = "dark"; - # base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; - base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-city-terminal-dark.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; + #base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-city-terminal-dark.yaml"; }; wayland.windowManager = { From 4d107d3e4a163ec2a49a07f253e47776639a62a4 Mon Sep 17 00:00:00 2001 From: Markus Heurung Date: Wed, 19 Jun 2024 15:26:01 +0200 Subject: [PATCH 2/6] activate i2c for brightness control of displays --- hosts/cube-hardware-configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/cube-hardware-configuration.nix b/hosts/cube-hardware-configuration.nix index 9cfc148..724ac8c 100644 --- a/hosts/cube-hardware-configuration.nix +++ b/hosts/cube-hardware-configuration.nix @@ -50,4 +50,5 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.i2c.enable = true; } From 8926441e6213647d3808ab440a42aa09c01e83f5 Mon Sep 17 00:00:00 2001 From: Markus Heurung Date: Wed, 19 Jun 2024 15:26:43 +0200 Subject: [PATCH 3/6] configure fonts via stylix --- home.nix | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/home.nix b/home.nix index 50f8dad..7fbdde1 100644 --- a/home.nix +++ b/home.nix @@ -194,10 +194,10 @@ kitty = { enable = true; shellIntegration.enableFishIntegration = true; - font = { - name = lib.mkForce "Iosevka Nerd Font"; - size = lib.mkForce 14; - }; + # font = { + # name = lib.mkForce "Iosevka Nerd Font"; + # size = lib.mkForce 14; + # }; keybindings = { "ctrl+shift+g" = "show_last_command_output"; "ctrl+alt+enter" = "launch --cwd=current"; @@ -490,10 +490,23 @@ }; stylix = { + enable = true; image = /home/muhh/Sync/Backgrounds/wald.jpg; polarity = "dark"; - base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; - #base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-city-terminal-dark.yaml"; + # base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-city-terminal-dark.yaml"; + fonts = { + monospace = { + package = (pkgs.nerdfonts.override { fonts = [ "Iosevka" ]; }); + name = "Iosevka Nerd Font"; + }; + sizes = { + applications = 12; + desktop = 10; + popups = 10; + terminal = 14; + }; + }; }; wayland.windowManager = { From b4846ce36cb62fbd279961b7a3f36ddd7878aad3 Mon Sep 17 00:00:00 2001 From: Markus Heurung Date: Wed, 19 Jun 2024 15:27:01 +0200 Subject: [PATCH 4/6] nixvim config update --- home.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home.nix b/home.nix index 7fbdde1..c91ba6a 100644 --- a/home.nix +++ b/home.nix @@ -243,8 +243,10 @@ }; nixvim = { enable = true; + defaultEditor = true; vimAlias = true; viAlias = true; + vimdiffAlias = true; clipboard.providers.wl-copy.enable = true; globals.mapleader = " "; globals.maplocalleader = " "; From 75949d20dafef93dcf751d5515f0b14aacae173c Mon Sep 17 00:00:00 2001 From: Markus Heurung Date: Wed, 19 Jun 2024 15:27:15 +0200 Subject: [PATCH 5/6] sway tooling and config --- home.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/home.nix b/home.nix index c91ba6a..5373294 100644 --- a/home.nix +++ b/home.nix @@ -54,6 +54,8 @@ wl-clipboard wl-mirror sway-launcher-desktop + swaynotificationcenter + swayosd xdg-utils zellij zulip @@ -392,7 +394,7 @@ mainBar = { layer = "top"; position = "top"; - height = 36; + height = 24; spacing = 3; output = [ "DP-1" ]; modules-left = [ @@ -467,8 +469,13 @@ } ]; }; + swaync = { + enable = true; + + }; swayosd = { enable = true; + display = "DP-1"; }; syncthing = { enable = true; From d758d1c6b0d41f302ec6b9aaff8902a30ba04182 Mon Sep 17 00:00:00 2001 From: Markus Heurung Date: Wed, 19 Jun 2024 15:28:01 +0200 Subject: [PATCH 6/6] cleanup --- home.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/home.nix b/home.nix index 5373294..54db2ff 100644 --- a/home.nix +++ b/home.nix @@ -196,10 +196,6 @@ kitty = { enable = true; shellIntegration.enableFishIntegration = true; - # font = { - # name = lib.mkForce "Iosevka Nerd Font"; - # size = lib.mkForce 14; - # }; keybindings = { "ctrl+shift+g" = "show_last_command_output"; "ctrl+alt+enter" = "launch --cwd=current"; @@ -334,7 +330,6 @@ telescope = { enable = true; extensions = { - # file_browser.enable = true; fzf-native.enable = true; }; };