From faab731506f6b74b8c311651a2996fc47a1be3a0 Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 5 Jul 2024 13:22:52 +0200 Subject: [PATCH 1/2] Programs: delete micro --- roles/common/programs/default.nix | 1 - roles/common/programs/micro.nix | 14 -------------- roles/desktop/programs/default.nix | 1 - roles/desktop/programs/micro.nix | 18 ------------------ 4 files changed, 34 deletions(-) delete mode 100644 roles/common/programs/micro.nix delete mode 100644 roles/desktop/programs/micro.nix diff --git a/roles/common/programs/default.nix b/roles/common/programs/default.nix index 948cf95..d4428e5 100755 --- a/roles/common/programs/default.nix +++ b/roles/common/programs/default.nix @@ -2,7 +2,6 @@ imports = [ ./htop.nix ./nix.nix - ./micro.nix ./nix-index.nix ./command-not-found.nix ./comma.nix diff --git a/roles/common/programs/micro.nix b/roles/common/programs/micro.nix deleted file mode 100644 index 75df151..0000000 --- a/roles/common/programs/micro.nix +++ /dev/null @@ -1,14 +0,0 @@ -{...}: { - home-manager = { - users.toast = {...}: { - programs.micro = { - enable = true; - settings = { - clipboard = "internal"; - indentchar = "|"; - softwrap = true; - }; - }; - }; - }; -} diff --git a/roles/desktop/programs/default.nix b/roles/desktop/programs/default.nix index 30c6c6f..7d6c257 100755 --- a/roles/desktop/programs/default.nix +++ b/roles/desktop/programs/default.nix @@ -2,7 +2,6 @@ imports = [ ./discord.nix ./firefox.nix - ./micro.nix ./keepassxc.nix ./jamesdsp.nix ./vscode.nix diff --git a/roles/desktop/programs/micro.nix b/roles/desktop/programs/micro.nix deleted file mode 100644 index d934774..0000000 --- a/roles/desktop/programs/micro.nix +++ /dev/null @@ -1,18 +0,0 @@ -{lib, ...}: { - home-manager = { - users.toast = {pkgs, ...}: { - programs.micro = { - enable = true; - settings = { - # Use xclip/wl-clipboard for copying and pasting - clipboard = lib.mkForce "external"; - }; - }; - /* - On a kde wayland session micro uses xsel or xclip instead of wl-clipboard - which doesn't work, so I only install wl-clipboard here to make micro use it - */ - home.packages = with pkgs; [wl-clipboard]; - }; - }; -} From c8863554a2fcc85751ef211a116915b2c69e98d7 Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 5 Jul 2024 13:33:37 +0200 Subject: [PATCH 2/2] Flake: update lock file --- flake.lock | 78 +++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index a914b91..75ecf6c 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1719059483, - "narHash": "sha256-JUGjp4P7Yi3ToxLW5iMSz7CI7mffprF8GsK1hkFdKzs=", + "lastModified": 1719915848, + "narHash": "sha256-zq+CMkdT8A9z74HonwspXp8HsX4OvP4uaVdD98AO6as=", "owner": "catppuccin", "repo": "nix", - "rev": "b6c854508d8c03f3ff06bf658d12b0ae8052d7a5", + "rev": "9345073d27d91ab66c1b6ab65df322906992aa59", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1719037157, - "narHash": "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8=", + "lastModified": 1720167120, + "narHash": "sha256-K9JYdlPiyaXp33JRg7CT8rMwH56e4ncXSsXW/YKnNXc=", "owner": "nix-community", "repo": "home-manager", - "rev": "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511", + "rev": "bbe6e94737289c8cb92d4d8f9199fbfe4f11c0ba", "type": "github" }, "original": { @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1718530513, - "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", + "lastModified": 1720042825, + "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "owner": "nix-community", "repo": "home-manager", - "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", + "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "type": "github" }, "original": { @@ -161,11 +161,11 @@ ] }, "locked": { - "lastModified": 1719032789, - "narHash": "sha256-MIPobSKR53T0Yrb8wu2fbjSVokhJeJy5AF6B1Hzckso=", + "lastModified": 1720025282, + "narHash": "sha256-I70ARXPm1YjGJ0efykd5zsapUZtmVZ/sIgwJ0F0j17w=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "495a672a2024bdc0e86af95f4e338827f9bfb865", + "rev": "8dd0f8383bd60b8ed66cd27c1b49cdbf7be4ad9d", "type": "github" }, "original": { @@ -214,11 +214,11 @@ }, "nix-impermanence": { "locked": { - "lastModified": 1719067779, - "narHash": "sha256-c8UPWKErzLtukeZ2xdyeZZTkEtg7cP8ApvMgYvjT1ss=", + "lastModified": 1719091691, + "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=", "owner": "nix-community", "repo": "impermanence", - "rev": "363b3e8622e964a96db90ab6430ddcc338212e79", + "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1718507237, - "narHash": "sha256-xBEWCxWeRpWQggFFp8ugJCDa63cOJsVvx71R9F0Eowg=", + "lastModified": 1719832725, + "narHash": "sha256-dr8DkeS74KVNTgi8BE0BiUKALb+EKlMIV86G2xPYO64=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "6af2c5e58c20311276f59d247341cafeebfcb6f4", + "rev": "2917972ed34ce292309b3a4976286f8b5c08db27", "type": "github" }, "original": { @@ -254,11 +254,11 @@ ] }, "locked": { - "lastModified": 1718507237, - "narHash": "sha256-xBEWCxWeRpWQggFFp8ugJCDa63cOJsVvx71R9F0Eowg=", + "lastModified": 1719832725, + "narHash": "sha256-dr8DkeS74KVNTgi8BE0BiUKALb+EKlMIV86G2xPYO64=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "6af2c5e58c20311276f59d247341cafeebfcb6f4", + "rev": "2917972ed34ce292309b3a4976286f8b5c08db27", "type": "github" }, "original": { @@ -269,11 +269,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1719069430, - "narHash": "sha256-d9KzCJv3UG6nX9Aur5OSEf4Uj+ywuxojhiCiRKYVzXA=", + "lastModified": 1719895800, + "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e8232c132a95ddc62df9d404120ad4ff53862910", + "rev": "6e253f12b1009053eff5344be5e835f604bb64cd", "type": "github" }, "original": { @@ -301,11 +301,11 @@ }, "nixpkgs-raw": { "locked": { - "lastModified": 1718835956, - "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=", + "lastModified": 1719956923, + "narHash": "sha256-nNJHJ9kfPdzYsCOlHOnbiiyKjZUW5sWbwx3cakg3/C4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309", + "rev": "706eef542dec88cc0ed25b9075d3037564b2d164", "type": "github" }, "original": { @@ -316,11 +316,11 @@ }, "nixpkgs-unstable-raw": { "locked": { - "lastModified": 1718895438, - "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nur": { "locked": { - "lastModified": 1719081887, - "narHash": "sha256-xAmq1hOGDF5t5+bKgU/zaSsuv5Nbo+KdzK2BFvLL56w=", + "lastModified": 1720176372, + "narHash": "sha256-T1EOgGxdT0cRFahK2RoY3tQ1c9WklguVEvC+zGvd5zo=", "owner": "nix-community", "repo": "NUR", - "rev": "768bf25fd49b2b2d95dd477fccfacf7f8638212a", + "rev": "a7f3a4b394375acdd26a1a8c7aecacc71c824fbc", "type": "github" }, "original": { @@ -354,11 +354,11 @@ ] }, "locked": { - "lastModified": 1714390161, - "narHash": "sha256-hWPGLUGNr7IR2FT4xS0VlhTW3S6xpw0hU3LJJC3CaKo=", + "lastModified": 1719876998, + "narHash": "sha256-NPKL3Ri2dbOOtvsgezTiUYutEgZUjcIXpwKCgt4Eu4E=", "owner": "toast003", "repo": "plasma-manager", - "rev": "d9754f6f5dcf96969ad40496326213d5344846e5", + "rev": "d12cb0ed42a81ff84330b5cc94bff6abfeeb6da8", "type": "github" }, "original": { @@ -444,11 +444,11 @@ ] }, "locked": { - "lastModified": 1719019506, - "narHash": "sha256-2lpbK6W3QHxc7BFeEDPumcBoNBx7dO7UE+ypwFVEOOc=", + "lastModified": 1720142793, + "narHash": "sha256-KhKF1VEMT5vz0vv1HZy0IOTEp2ZU1UD4ZgJAkOFbhIg=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "935d522e2a0306083d15e09c7d17a9358c141f29", + "rev": "8d57c84024068180130f3c0a2103dda967a0ddc2", "type": "github" }, "original": {