From a3b13c47ef5561bb6961f99ef19674b7c007d3a5 Mon Sep 17 00:00:00 2001 From: DerGrumpf Date: Wed, 19 Nov 2025 21:06:46 +0100 Subject: [PATCH] Added --- flake.lock | 567 +++++++------------- flake.nix | 28 +- hosts/m920q/default.nix | 4 +- modules/fonts.nix | 16 +- modules/pipewire.nix | 2 +- modules/services.nix | 10 +- modules/system.nix | 2 +- overlays/tabiew.nix | 52 -- programs/wm/common/floorp.nix | 17 +- programs/wm/common/kitty.nix | 2 +- programs/wm/common/neovim/default.nix | 21 +- programs/wm/common/neovim/default.nix.back1 | 331 ------------ programs/wm/common/notifier/mako.nix | 19 +- programs/wm/common/rofi/default.nix | 2 +- programs/wm/gtk/gtk.nix | 6 +- users/phil/home.nix | 25 +- 16 files changed, 267 insertions(+), 837 deletions(-) delete mode 100644 overlays/tabiew.nix delete mode 100644 programs/wm/common/neovim/default.nix.back1 diff --git a/flake.lock b/flake.lock index 7bcd03f..d74bfb5 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1742213273, - "narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=", + "lastModified": 1762356719, + "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf", + "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7", "type": "github" }, "original": { @@ -38,11 +38,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1743801669, - "narHash": "sha256-RxQQQCGqywOPbdNrWGbFyFdcrdrXM4YBHW7vYt13OeI=", + "lastModified": 1763110997, + "narHash": "sha256-S2vF+3D/9vna3/vBV7LHiGUbp+ltPsQhvccIyim6VQg=", "owner": "catppuccin", "repo": "nix", - "rev": "07beb389d69a52c4dd5895da9553463c3740a26a", + "rev": "e6928cdd3dd20636326c2756d2bc8fd1cd825768", "type": "github" }, "original": { @@ -51,35 +51,14 @@ "type": "github" } }, - "devshell": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741473158, - "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", - "owner": "numtide", - "repo": "devshell", - "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -102,20 +81,6 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_3": { - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "revCount": 69, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -142,32 +107,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1762980239, + "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", "type": "github" }, "original": { @@ -194,32 +138,6 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore_2", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1757239681, - "narHash": "sha256-E9spYi9lxm2f1zWQLQ7xQt8Xs2nWgr1T4QM7ZjLFphM=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "ab82ab08d6bf74085bd328de2a8722c12d97bd9d", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -242,28 +160,6 @@ "type": "github" } }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "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" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -271,38 +167,15 @@ ] }, "locked": { - "lastModified": 1743387206, - "narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=", + "lastModified": 1763416652, + "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146", + "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -323,11 +196,11 @@ ] }, "locked": { - "lastModified": 1742215578, - "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=", + "lastModified": 1753964049, + "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719", + "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", "type": "github" }, "original": { @@ -352,11 +225,11 @@ ] }, "locked": { - "lastModified": 1739049071, - "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", + "lastModified": 1762462052, + "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", + "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162", "type": "github" }, "original": { @@ -370,8 +243,8 @@ "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", "hyprgraphics": "hyprgraphics", + "hyprland-guiutils": "hyprland-guiutils", "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", @@ -381,11 +254,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1742860753, - "narHash": "sha256-ItOsU1v6CZNe6spfKtJ+cpVr0S87jq69PYe3lpOLzjI=", + "lastModified": 1763540034, + "narHash": "sha256-TogNk567BTZib1XiYheW04ELxNB2bhee6G4SgphRqmA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f7ba86d1f335112ae0d13548947ddbd76b1477b6", + "rev": "fbb31503f1b69402eeda81ba75a547c862c88bf2", "type": "github" }, "original": { @@ -394,6 +267,52 @@ "type": "github" } }, + "hyprland-guiutils": { + "inputs": { + "aquamarine": [ + "hyprland", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprtoolkit": "hyprtoolkit", + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1762755186, + "narHash": "sha256-ZjjETUHtoEhVN7JI1Cbt3p/KcXpK8ZQaPHx7UkG1OgA=", + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "rev": "66356e20a8ed348aa49c1b9ceace786e224225b3", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "type": "github" + } + }, "hyprland-plugins": { "inputs": { "hyprland": [ @@ -411,11 +330,11 @@ ] }, "locked": { - "lastModified": 1742861859, - "narHash": "sha256-lbdHyp2+NoyciCJBtBt3Cgm2dDvoHvTdCRMbmwJoUmk=", + "lastModified": 1763484609, + "narHash": "sha256-rkxg7+bWmgOxCf4B9ED+Z4SuOO46sbtz9qgIBrYfZRc=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "1f332c09a2382cb23da0f69a6f504f8b33433831", + "rev": "1bc5b0253fc950c46145713ccb46750aba56ea6f", "type": "github" }, "original": { @@ -436,11 +355,11 @@ ] }, "locked": { - "lastModified": 1738422629, - "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", + "lastModified": 1759610243, + "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", + "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622", "type": "github" }, "original": { @@ -449,74 +368,6 @@ "type": "github" } }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprland-qtutils", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1737634706, - "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "8810df502cdee755993cb803eba7b23f189db795", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprland-qtutils", - "hyprlang", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739048983, - "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, "hyprlang": { "inputs": { "hyprutils": [ @@ -533,11 +384,11 @@ ] }, "locked": { - "lastModified": 1741191527, - "narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=", + "lastModified": 1763254292, + "narHash": "sha256-JNgz3Fz2KMzkT7aR72wsgu/xNeJB//LSmdilh8Z/Zao=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "72df3861f1197e41b078faa3e38eedd60e00018d", + "rev": "deea98d5b61d066bdc7a68163edd2c4bd28d3a6b", "type": "github" }, "original": { @@ -546,6 +397,58 @@ "type": "github" } }, + "hyprtoolkit": { + "inputs": { + "aquamarine": [ + "hyprland", + "hyprland-guiutils", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprland-guiutils", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprland-guiutils", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprland-guiutils", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprland-guiutils", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "hyprland-guiutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-guiutils", + "systems" + ] + }, + "locked": { + "lastModified": 1762463729, + "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=", + "owner": "hyprwm", + "repo": "hyprtoolkit", + "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprtoolkit", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -558,11 +461,11 @@ ] }, "locked": { - "lastModified": 1741534688, - "narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=", + "lastModified": 1763323331, + "narHash": "sha256-+Z0OfCo1MS8/aIutSAW5aJR9zTae1wz9kcJYMgpwN6M=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3", + "rev": "0c6411851cc779d551edc89b83966696201611aa", "type": "github" }, "original": { @@ -583,11 +486,11 @@ ] }, "locked": { - "lastModified": 1739870480, - "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", + "lastModified": 1755184602, + "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", + "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", "type": "github" }, "original": { @@ -624,28 +527,6 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743127615, - "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "nix-darwin-24.11", - "repo": "nix-darwin", - "type": "github" - } - }, "nixcord": { "inputs": { "flake-compat": "flake-compat_2", @@ -653,11 +534,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1755307498, - "narHash": "sha256-6AXJWZnW/Y9qxlblabRx3NeMtfeMGicndefYEolzgtg=", + "lastModified": 1763223362, + "narHash": "sha256-iH+tM4MmtYMfWuWoo6KIc7Al+zQL13f3ScJloqSKyAs=", "owner": "kaylorben", "repo": "nixcord", - "rev": "a171d05a26467a74c66138ac83f1dd1fb07e4a3e", + "rev": "35c173408a25cae1c5af23b9d4fd80a181a395d4", "type": "github" }, "original": { @@ -668,11 +549,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "type": "github" }, "original": { @@ -699,11 +580,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742669843, - "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", + "lastModified": 1763283776, + "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e5b653dff12029333a6546c11e108ede13052eb", + "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", "type": "github" }, "original": { @@ -731,43 +612,27 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1743576891, - "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "44a69ed688786e98a101f02b712c313f1ade37ab", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_5": { "locked": { - "lastModified": 1744536153, - "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -779,54 +644,27 @@ }, "nixvim": { "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_2", - "git-hooks": "git-hooks", - "home-manager": "home-manager_2", - "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" ], "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" + "systems": "systems_3" }, "locked": { - "lastModified": 1751725553, - "narHash": "sha256-bkvw8jXTdRBWRfO50IaxNuUIamnLllxfEFqUG/g3uwo=", + "lastModified": 1763565747, + "narHash": "sha256-FgCL7pEFgZjaYoiDbY+f9fAwHqgVNSZEkcLUvTnhwHw=", "owner": "nix-community", "repo": "nixvim", - "rev": "81d65e0cfb00df0269195b59f156c719cc045ab8", + "rev": "82bc02466cccb7594aef296aea128b9b59621efe", "type": "github" }, "original": { "owner": "nix-community", - "ref": "nixos-24.11", "repo": "nixvim", "type": "github" } }, - "nur": { - "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1758273929, - "narHash": "sha256-8ZhQaoeWOcCpe14PLgJ7ZEhWFFISA2qcVuXTGlNZGgU=", - "owner": "nix-community", - "repo": "NUR", - "rev": "2d644af21cc32d53594b9d17fa167c4eec6431cd", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils", @@ -837,11 +675,11 @@ ] }, "locked": { - "lastModified": 1756738487, - "narHash": "sha256-8QX7Ab5CcICp7zktL47VQVS+QeaU4YDNAjzty7l7TQE=", + "lastModified": 1761730856, + "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", "owner": "NuschtOS", "repo": "search", - "rev": "5feeaeefb571e6ca2700888b944f436f7c05149b", + "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", "type": "github" }, "original": { @@ -860,11 +698,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1763319842, + "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", "type": "github" }, "original": { @@ -882,41 +720,20 @@ "nixcord": "nixcord", "nixpkgs": "nixpkgs_4", "nixvim": "nixvim", - "nur": "nur", - "rust-overlay": "rust-overlay", - "spicetify-nix": "spicetify-nix", - "unstable": "unstable" - } - }, - "rust-overlay": { - "inputs": { - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1762828736, - "narHash": "sha256-RxtFHWZpKwVcWHhx88E2NhWuBbgYVqIoIDynGs5FoJs=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "8d5baa5628f6dbd7ce6beca3c299bae27755204c", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" + "spicetify-nix": "spicetify-nix" } }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_6", - "systems": "systems_3" + "nixpkgs": "nixpkgs_5", + "systems": "systems_4" }, "locked": { - "lastModified": 1751776600, - "narHash": "sha256-75wd/aSvSoXUVd/buwI+Gsqx6LdmBVMbdXw+tCV1u58=", + "lastModified": 1763267524, + "narHash": "sha256-CywB4iCpGr4CYZAD+WboFwBQ7Wnc7LdfSemFWuH/1Ro=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "54fad36eeae085f4a6ce4522bc351705b9c0c58a", + "rev": "cf33e39bd1a21993a28ffee8be433e212ecf346a", "type": "github" }, "original": { @@ -970,40 +787,18 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, + "systems_4": { "locked": { - "lastModified": 1756662192, - "narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "unstable": { - "locked": { - "lastModified": 1756787288, - "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", + "owner": "nix-systems", + "repo": "default", "type": "github" } }, @@ -1035,11 +830,11 @@ ] }, "locked": { - "lastModified": 1741934139, - "narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=", + "lastModified": 1761431178, + "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "150b0b6f52bb422a1b232a53698606fe0320dde0", + "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8125e4b..782a98d 100644 --- a/flake.nix +++ b/flake.nix @@ -15,17 +15,11 @@ inputs = { # Core - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; - unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nur = { - url = "github:nix-community/NUR"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Editor nixvim = { - url = "github:nix-community/nixvim/nixos-24.11"; - # If using a stable channel you can use `url = "github:nix-community/nixvim/nixos-"` + url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -42,10 +36,9 @@ catppuccin.url = "github:catppuccin/nix"; # User Config - home-manager.url = "github:nix-community/home-manager/release-24.11"; + home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - rust-overlay.url = "github:oxalica/rust-overlay"; }; outputs = @@ -55,7 +48,6 @@ home-manager, catppuccin, nixvim, - rust-overlay, ... }: @@ -98,7 +90,7 @@ sharedModules = [ inputs.catppuccin.homeModules.catppuccin inputs.nixcord.homeModules.nixcord - inputs.nixvim.homeManagerModules.nixvim + inputs.nixvim.homeModules.nixvim ]; }; }; @@ -132,11 +124,11 @@ (commonHomeManagerConfig { inherit username monitorSetup; }) ./modules/containerization - { - nixpkgs.overlays = [ - inputs.rust-overlay.overlays.default - ] ++ builtins.attrValues (import ./overlays); - } + # { + # nixpkgs.overlays = [ + # inputs.rust-overlay.overlays.default + # ] ++ builtins.attrValues (import ./overlays); + # } ] ++ extraModules; @@ -169,7 +161,7 @@ in { - # ISO Defaults + # ISO and Image Defaults packages.x86_64-linux.iso = self.nixosConfigurations.iso.config.system.build.isoImage; packages.x86_64-linux.default = self.packages.x86_64-linux.iso; diff --git a/hosts/m920q/default.nix b/hosts/m920q/default.nix index 87770e3..a7be6ac 100644 --- a/hosts/m920q/default.nix +++ b/hosts/m920q/default.nix @@ -19,7 +19,7 @@ ../../modules/appimage.nix ../../modules/qemu.nix ../../modules/thunderbird.nix - ../../modules/canon_eos_550d.nix + # ../../modules/canon_eos_550d.nix # Include the results of the hardware scan. ./hardware-configuration.nix ]; @@ -30,6 +30,8 @@ systemd-boot.enable = true; }; + boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; + networking = { hostName = "nix-desktop"; networkmanager.enable = false; diff --git a/modules/fonts.nix b/modules/fonts.nix index d398617..b0a2f09 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -1,20 +1,22 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { fonts = { packages = with pkgs; [ # icon fonts material-icons - material-black-colors + # material-black-colors material-design-icons icomoon-feather - # normal fonts - noto-fonts - noto-fonts-emoji - - nerdfonts + nerd-fonts.fira-code + nerd-fonts.fira-mono + nerd-fonts.adwaita-mono + nerd-fonts.jetbrains-mono + nerd-fonts.noto ]; + fontDir.enable = true; + # use fonts specified by user rather than default ones enableDefaultPackages = false; diff --git a/modules/pipewire.nix b/modules/pipewire.nix index d8ad844..760e0e1 100644 --- a/modules/pipewire.nix +++ b/modules/pipewire.nix @@ -2,7 +2,7 @@ { # Enable sound with pipewire. #sound.enable = true; - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; environment.systemPackages = with pkgs; [ pamixer ]; services.pipewire = { enable = true; diff --git a/modules/services.nix b/modules/services.nix index 1878952..8ae74cf 100644 --- a/modules/services.nix +++ b/modules/services.nix @@ -14,11 +14,11 @@ printing.enable = true; power-profiles-daemon.enable = true; - logind.extraConfig = '' - HandlePowerKey=ignore - HandleSuspendKey=ignore - HandleHibernateKey=ignore - ''; + #logind.settings.Login = '' + # HandlePowerKey=ignore + # HandleSuspendKey=ignore + # HandleHibernateKey=ignore + # ''; flatpak.enable = true; }; diff --git a/modules/system.nix b/modules/system.nix index 0275553..be869df 100644 --- a/modules/system.nix +++ b/modules/system.nix @@ -67,7 +67,7 @@ # Graphics libGL - glxinfo + mesa-demos # Rizz fastfetch diff --git a/overlays/tabiew.nix b/overlays/tabiew.nix deleted file mode 100644 index f04800e..0000000 --- a/overlays/tabiew.nix +++ /dev/null @@ -1,52 +0,0 @@ -# overlays/tabiew.nix -self: super: -let - # Try to use rust-bin if available, otherwise fall back to latest from nixpkgs-mozilla - rustToolchain = - if super ? rust-bin then - super.rust-bin.nightly.latest.default - else - super.latest.rustChannels.nightly.rust; - - rustPlatform = super.makeRustPlatform { - cargo = rustToolchain; - rustc = rustToolchain; - }; -in -{ - tabiew = rustPlatform.buildRustPackage rec { - pname = "tabiew"; - version = "0.11.1"; - - src = super.fetchFromGitHub { - owner = "shshemi"; - repo = "tabiew"; - rev = "v${version}"; - sha256 = "sha256-RvbHXnDaoqMHjA9u9kFs5MB6xeQG/E35PEu+1LIXIBU="; - }; - - cargoLock = { - lockFile = "${src}/Cargo.lock"; - }; - - # Build dependencies needed for openssl-sys - nativeBuildInputs = with super; [ - pkg-config - perl - ]; - - # Runtime dependencies - buildInputs = with super; [ - openssl - ]; - - # Disable cargo-auditable as it doesn't support edition2024 yet - auditable = false; - - meta = with super.lib; { - description = "A simple CSV viewer"; - homepage = "https://github.com/shshemi/tabiew"; - license = licenses.mit; - }; - }; -} diff --git a/programs/wm/common/floorp.nix b/programs/wm/common/floorp.nix index 803c859..5e88f23 100644 --- a/programs/wm/common/floorp.nix +++ b/programs/wm/common/floorp.nix @@ -5,7 +5,22 @@ { programs.floorp = { enable = true; - profiles.${username} = { }; + profiles.${username} = { + extensions.force = true; + settings = { + "browser.startup.homepage" = "https://www.cyperpunk.de"; + "browser.search.region" = "DE"; + "browser.search.isUS" = false; + "general.useragent.locale" = "de-DE"; + "browser.bookmarks.showMobileBookmarks" = true; + "browser.newtabpage.pinned" = [ + { + title = "Cyperpunk"; + url = "https://www.cyperpunk.de/"; + } + ]; + }; + }; }; } diff --git a/programs/wm/common/kitty.nix b/programs/wm/common/kitty.nix index d1a504c..971c7e8 100644 --- a/programs/wm/common/kitty.nix +++ b/programs/wm/common/kitty.nix @@ -69,7 +69,7 @@ style = "bold #a6e3a1"; truncation_length = 0; truncation_symbol = ""; - format = "[⤇ ](bold #f38ba8)[《$path》]($style)"; + format = "[⤇ ](bold #f38ba8)[《$path 》]($style)"; }; git_branch = { diff --git a/programs/wm/common/neovim/default.nix b/programs/wm/common/neovim/default.nix index 9dd952b..15de470 100644 --- a/programs/wm/common/neovim/default.nix +++ b/programs/wm/common/neovim/default.nix @@ -47,16 +47,17 @@ }) # Add telescope.vim as a custom plugin - (pkgs.vimUtils.buildVimPlugin { - name = "telescope-nvim"; - src = pkgs.fetchFromGitHub { - owner = "nvim-telescope"; - repo = "telescope.nvim"; - rev = "0.1.8"; - sha256 = "sha256-e1ulhc4IIvUgpjKQrSqPY4WpXuez6wlxL6Min9U0o5Q="; - }; - }) - + /* + (pkgs.vimUtils.buildVimPlugin { + name = "telescope-nvim"; + src = pkgs.fetchFromGitHub { + owner = "nvim-telescope"; + repo = "telescope.nvim"; + rev = "0.1.8"; + sha256 = "sha256-e1ulhc4IIvUgpjKQrSqPY4WpXuez6wlxL6Min9U0o5Q="; + }; + }) + */ ]; extraLuaConfig = builtins.readFile (./. + "/config.lua"); diff --git a/programs/wm/common/neovim/default.nix.back1 b/programs/wm/common/neovim/default.nix.back1 deleted file mode 100644 index 4489cae..0000000 --- a/programs/wm/common/neovim/default.nix.back1 +++ /dev/null @@ -1,331 +0,0 @@ -{ pkgs, ... }: -{ - programs.nixvim = { - enable = true; - defaultEditor = true; - viAlias = true; - vimAlias = true; - - # =================== - # Basic Options - # =================== - options = { - number = true; - cursorline = true; - showmode = false; - syntax = "enable"; - hlsearch = true; - incsearch = true; - tabstop = 4; - termguicolors = true; - }; - - globals.mapleader = " "; - - keymaps = [ - # Clipboard - { - mode = "n"; - key = "y"; - action = "\"+y"; - options.desc = "Yank to clipboard"; - } - { - mode = "v"; - key = "y"; - action = "\"+y"; - options.desc = "Yank to clipboard"; - } - { - mode = "n"; - key = "Y"; - action = "\"+Y"; - options.desc = "Yank line to clipboard"; - } - { - mode = "n"; - key = "d"; - action = "\"+d"; - options.desc = "Delete to clipboard"; - } - { - mode = "v"; - key = "d"; - action = "\"+d"; - options.desc = "Delete to clipboard"; - } - { - mode = "n"; - key = "D"; - action = "\"+D"; - options.desc = "Delete line to clipboard"; - } - { - mode = "n"; - key = "p"; - action = "\"+p"; - options.desc = "Paste from clipboard"; - } - { - mode = "v"; - key = "p"; - action = "\"+p"; - options.desc = "Paste from clipboard"; - } - ]; - - # =================== - # Plugins - # =================== - plugins = { - # Treesitter - treesitter = { - enable = true; - ensureInstalled = [ - "lua" - "nix" - "python" - "javascript" - "rust" - "rasi" - ]; - }; - - # Lint - lint.enable = true; - - # Mason + LSP - mason.enable = true; - mason-lspconfig = { - enable = true; - ensureInstalled = [ - "lua_ls" - "nil_ls" - "rust_analyzer" - "pylsp" - "stylelint_lsp" - ]; - }; - - lsp = { - enable = true; - servers = { - lua_ls.settings.Lua = { - runtime.version = "LuaJIT"; - diagnostics.globals = [ "vim" ]; - telemetry.enable = false; - }; - nil_ls.enable = true; - rust_analyzer.enable = true; - pylsp.enable = true; - stylelint_lsp = { - enable = true; - filetypes = [ - "css" - "scss" - "rasi" - ]; - cmd = [ - "stylelint-lsp" - "--stdio" - ]; - }; - }; - keymaps.lspBuf = { - gd = "definition"; - K = "hover"; - "rn" = "rename"; - "ca" = "code_action"; - }; - }; - - # Completion - cmp = { - enable = true; - sources = [ - { name = "nvim_lsp"; } - { name = "luasnip"; } - { name = "avante_commands"; } - { name = "avante_mentions"; } - { name = "buffer"; } - { name = "path"; } - ]; - }; - luasnip.enable = true; - - # Conform - conform-nvim = { - enable = true; - formattersByFt = { - lua = [ "stylua" ]; - nix = [ "nixfmt" ]; - python = [ "black" ]; - rust = [ "rustfmt" ]; - rasi = [ "prettierd" ]; - }; - formatOnSave = { - timeoutMs = 500; - lspFallback = true; - }; - }; - - # Telescope - telescope = { - enable = true; - keymaps = { - "ff" = "find_files"; - "fg" = "live_grep"; - "fb" = "buffers"; - "fh" = "help_tags"; - }; - }; - - # Toggleterm - toggleterm = { - enable = true; - settings = { - size = 20; - direction = "float"; - float_opts = { - border = "single"; - width = 200; - height = 40; - }; - }; - }; - - # Statusline - lualine = { - enable = true; - settings.options = { - theme = "catppuccin"; - component_separators = { - left = "|"; - right = "|"; - }; - section_separators = { - left = ""; - right = ""; - }; - }; - }; - - # Dashboard (alpha) - alpha = { - enable = true; - theme = "dashboard"; - layout.dashboard = { - section.header.val = [ - "⣿⣿⣿⣿⣿⣿⣿⣿⣿⢿⣯⣿⠿⣟⣷⣯⣛⢿⣿⣿⣾⣟⣿⣿⣿⣿⣿⣿⣿⣿⣿" - "⣿⣿⣿⣿⣿⣿⣿⡿⣵⣿⡿⣴⣽⡟⣳⢿⢽⣽⣕⣽⢿⡿⣿⣟⣿⣿⣿⣿⣿⣿⣿" - "⣿⣿⣿⣷⣿⣿⢟⣫⣿⢟⢟⣾⣾⣿⣿⣞⢳⣻⢞⣎⠿⢞⣊⣿⣞⣿⣿⣿⣿⣿⢽" - "⣿⣿⣿⣿⣿⣏⢯⣿⣏⣏⠔⢇⣿⢢⢆⢀⢆⣧⣼⢻⢰⡧⢻⣝⣏⡸⣧⣾⣿⣿⣿" - "⣿⣿⣿⣿⡟⣻⣿⣿⡾⡿⡼⢸⡝⣝⡳⢢⣧⢳⣳⢷⡇⣗⢺⡺⣿⡧⣿⣿⣿⢿⢿" - "⣿⡿⣿⣼⡼⣿⣿⡗⡧⣧⠁⡝⣧⣳⠅⡾⠈⣎⢮⣧⣿⣿⣗⣷⣻⢷⣏⣼⢏⣺⣿" - "⣿⣿⣿⣻⣿⣿⣿⢧⣿⢹⠉⢷⢿⣧⣲⡏⡀⡈⢆⠳⣿⡿⢿⣿⣱⢿⢫⣷⣝⣿⣿" - "⣿⣿⣿⡯⡟⣿⣿⢽⣡⠟⢿⣮⠁⠙⠛⠈⡴⢿⣿⡷⣬⣽⢽⠧⣷⡏⣿⡇⣧⣽⣿" - "⣿⠟⢻⡧⡇⣿⡇⣇⣆⢄⡜⢃⡀⡀⡀⡀⡀⢎⣁⠁⣸⣗⣸⣿⣧⣼⡿⢹⢿⢾⣿" - "⣿⣷⣾⣿⢻⣿⢧⢻⣽⡀⡀⡀⡀⢄⡀⡀⡀⡀⡀⢀⣷⡸⡟⣿⣶⣻⣧⡛⡱⢝⣿" - "⣿⣿⣿⣿⢸⡿⢚⡜⣿⣇⡀⡀⡀⡀⡀⡀⡀⡀⠚⢁⢣⣜⡿⣿⡇⢼⣿⠨⣸⣿⣿" - "⣿⣄⣿⣗⢾⢻⣧⢿⣾⣿⣦⡀⡀⠑⠚⠉⡀⡀⣤⣿⢨⣿⠗⣻⢣⣿⢹⢈⣽⣿⣿" - "⣿⣿⣿⣿⢎⡄⢿⣞⡇⣿⠹⣿⣶⣀⡀⣀⡴⡩⢸⢏⣿⣿⣶⢻⣾⢏⡞⠡⢽⣇⣾" - "⣿⣿⣿⣮⣼⢬⣦⢿⣳⣌⠧⡉⠈⣇⣛⣁⣈⣼⣿⡸⠫⠛⠐⠛⠕⣙⣻⣬⣼⣿⣿" - "⢟⢿⣿⣿⣿⡢⣃⣪⣭⣡⣤⣶⠟⡿⠿⠿⠿⠛⢁⣿⣿⢩⠉⡀⠈⠓⡝⣿⣿⣿⣿" - "⣾⣿⣿⣿⣿⠞⢔⡣⡴⣾⣿⠓⣤⢧⡼⣉⠠⢤⣿⣿⠇⠃⡀⡀⡀⡀⡸⢿⣾⣿⣿" - "⣿⣿⣿⡿⣺⡸⢗⢠⣇⣿⣿⠊⠃⡀⠉⡀⢠⣿⣿⠟⡸⡀⡀⡀⡀⡀⣃⣬⠽⠿⣿" - "⣿⣿⣿⣿⡇⡏⢸⣿⠟⣽⡇⡀⡀⡀⡀⣴⣟⢭⣾⣿⡇⠎⣠⠒⠉⠈⢀⡀⢨⡋⣿" - "⠛⠛⠛⠋⠃⠓⠚⠛⠘⠛⠃⡀⠊⡀⠛⠛⠛⠂⠛⠛⠓⠁⠚⡀⠂⠒⠒⠐⠒⠋⠛" - ]; - section.buttons.val = [ - { - shortcut = "e"; - text = "[+] New file"; - command = ":ene startinsert "; - } - { - shortcut = "f"; - text = "[?] Find file"; - command = ":Telescope find_files "; - } - { - shortcut = "r"; - text = "[~] Recent files"; - command = ":Telescope oldfiles "; - } - { - shortcut = "y"; - text = "[Y] Yazi"; - command = ":Yazi"; - } - { - shortcut = "m"; - text = "[M] Mason"; - command = ":Mason"; - } - { - shortcut = "q"; - text = "[X] Quit"; - command = ":qa"; - } - ]; - section.footer.val = "Circuits hum in anticipation of your will."; - }; - }; - - # Colorscheme - catppuccin = { - enable = true; - flavour = "mocha"; - transparentBackground = true; - integrations = { - treesitter = true; - mason = true; - cmp = true; - telescope = true; - toggleterm = true; - }; - }; - }; - - # =================== - # Plugins not in nixvim - # =================== - extraPlugins = with pkgs.vimPlugins; [ - yazi-nvim - cheatsheet-nvim - avante-nvim - plenary-nvim - nui-nvim - dressing-nvim - nvim-web-devicons - img-clip-nvim - render-markdown-nvim - (pkgs.vimUtils.buildVimPlugin { - name = "conform-nvim"; - src = pkgs.fetchFromGitHub { - owner = "stevearc"; - repo = "conform.nvim"; - rev = "stable"; - sha256 = "sha256-pUF9F5QoDzCZuVRcJEF91M8Qjkh/xosMkf9tRavkmJs="; - }; - }) - ]; - }; - - home.packages = with pkgs; [ - nixfmt-rfc-style - stylua - black - nodePackages.prettier - rustfmt - nodejs - prettierd - stylelint-lsp - lua-language-server - nil - rust-analyzer - python3Packages.python-lsp-server - curl - cargo - ]; -} diff --git a/programs/wm/common/notifier/mako.nix b/programs/wm/common/notifier/mako.nix index 255e5fe..96a32e3 100644 --- a/programs/wm/common/notifier/mako.nix +++ b/programs/wm/common/notifier/mako.nix @@ -2,18 +2,11 @@ { services.mako = { enable = true; - font = "FiraCodeNerdFontPropo 12"; - borderSize = 4; - borderRadius = 8; - defaultTimeout = 5000; - - extraConfig = '' - [app-name=Spotify] - border-color=#a6e3a1 - - [app-name=Thunderbird] - border-color=#94e2d5 - ''; - + settings = { + font = "FiraCodeNerdFontPropo 12"; + borderSize = 4; + borderRadius = 8; + defaultTimeout = 5000; + }; }; } diff --git a/programs/wm/common/rofi/default.nix b/programs/wm/common/rofi/default.nix index 0c80584..e0675d7 100644 --- a/programs/wm/common/rofi/default.nix +++ b/programs/wm/common/rofi/default.nix @@ -12,7 +12,7 @@ programs.rofi = { enable = true; cycle = false; - package = pkgs.rofi-wayland; + package = pkgs.rofi; font = "FiraCode Nerd Font Mono 12"; location = "center"; diff --git a/programs/wm/gtk/gtk.nix b/programs/wm/gtk/gtk.nix index f352802..fa7b11d 100644 --- a/programs/wm/gtk/gtk.nix +++ b/programs/wm/gtk/gtk.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { gtk = { enable = true; @@ -9,8 +9,8 @@ }; iconTheme = { - package = pkgs.adwaita-icon-theme; - name = "Adwaita"; + package = lib.mkForce pkgs.adwaita-icon-theme; + name = lib.mkForce "Adwaita"; }; font = { diff --git a/users/phil/home.nix b/users/phil/home.nix index 0f4e66e..558c698 100644 --- a/users/phil/home.nix +++ b/users/phil/home.nix @@ -26,8 +26,7 @@ home.packages = with pkgs; [ audacity blender - slic3r - kdePackages.okular + # slic3r obsidian element-desktop zapzap @@ -37,11 +36,12 @@ fstl sqlitebrowser kubectl + gimp # PDF Tools pandoc texlive.combined.scheme-full - wkhtmltopdf-bin + wkhtmltopdf # Games lutris @@ -49,7 +49,12 @@ xonotic # GUI Tools - anydesk + #anydesk + + # KDE Tools + kdePackages.okular + kdePackages.kdenlive + kdePackages.akregator ]; @@ -71,10 +76,18 @@ }; programs = { + delta.enable = true; + git = { enable = true; - userName = "DerGrumpf"; - userEmail = "p.keier@beyerstedt-it.de"; + settings = { + user.name = "DerGrumpf"; + user.email = "p.keier@beyerstedt-it.de"; + }; + lfs = { + enable = true; + skipSmudge = false; + }; }; nixcord = {