From abd567a8a5da0e8eb2e12716469ef266e146e128 Mon Sep 17 00:00:00 2001 From: Amneesh Singh Date: Mon, 25 Aug 2025 18:03:38 +0530 Subject: [PATCH] home: amneesh: move ubuntu->arch and use existing config Signed-off-by: Amneesh Singh --- flake.lock | 318 +++++++++++------- home/README | 2 +- home/amneesh/default.nix | 27 +- home/amneesh/pkgs.nix | 17 + home/default.nix | 33 +- .../config => natto/config/emacs}/README.org | 0 .../config => natto/config/emacs}/config.org | 0 .../config => natto/config/emacs}/init.el | 0 home/natto/config/hypr/hyprland.conf | 6 +- home/natto/cursor.nix | 13 + home/natto/default.nix | 2 + .../emacs/default.nix => natto/emacs.nix} | 2 +- home/natto/stuff.nix | 12 - 13 files changed, 267 insertions(+), 165 deletions(-) create mode 100644 home/amneesh/pkgs.nix rename home/{common/emacs/config => natto/config/emacs}/README.org (100%) rename home/{common/emacs/config => natto/config/emacs}/config.org (100%) rename home/{common/emacs/config => natto/config/emacs}/init.el (100%) create mode 100644 home/natto/cursor.nix rename home/{common/emacs/default.nix => natto/emacs.nix} (95%) diff --git a/flake.lock b/flake.lock index 5b0defd..47792ee 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1747575206, - "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", + "lastModified": 1754433428, + "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", "owner": "ryantm", "repo": "agenix", - "rev": "4835b1dc898959d8547a871ef484930675cb47f1", + "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", "type": "github" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1749155310, - "narHash": "sha256-t0HfHg/1+TbSra5s6nNM0o4tnb3uqWedShSpZXsUMYY=", + "lastModified": 1755632680, + "narHash": "sha256-EjaD8+d7AiAV2fGRN4NTMboWDwk8szDfwbzZ8DL1PhQ=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "94981cf75a9f11da0b6dd6a1abbd7c50a36ab2d3", + "rev": "50637ed23e962f0db294d6b0ef534f37b144644b", "type": "github" }, "original": { @@ -139,11 +139,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1749891893, - "narHash": "sha256-ueGM58ChJG8vsZuZy5x2E9XhVseUWZ/Dt7JeNnH00iw=", + "lastModified": 1756087945, + "narHash": "sha256-+abiBhtddmBlNrxko1r4Z6oKSKszBkzemrt2k//NXGk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4f4629359dac41cf5227a786936e069410abd213", + "rev": "9e3a5b9a0c79e66b4a1e2490be606a058a6712fe", "type": "github" }, "original": { @@ -192,11 +192,11 @@ "flake-compat_2": { "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": { @@ -240,11 +240,11 @@ "flake-compat_5": { "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": { @@ -258,11 +258,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1754487366, + "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", "type": "github" }, "original": { @@ -276,11 +276,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1748821116, - "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", + "lastModified": 1754487366, + "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", + "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", "type": "github" }, "original": { @@ -297,11 +297,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1754487366, + "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", "type": "github" }, "original": { @@ -319,11 +319,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1754487366, + "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", "type": "github" }, "original": { @@ -361,6 +361,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": [ @@ -374,11 +392,11 @@ ] }, "locked": { - "lastModified": 1749636823, - "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "623c56286de5a3193aa38891a6991b28f9bab056", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -397,11 +415,11 @@ ] }, "locked": { - "lastModified": 1749636823, - "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", + "lastModified": 1755960406, + "narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "623c56286de5a3193aa38891a6991b28f9bab056", + "rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2", "type": "github" }, "original": { @@ -485,11 +503,11 @@ ] }, "locked": { - "lastModified": 1748000383, - "narHash": "sha256-EaAJhwfJGBncgIV/0NlJviid2DP93cTMc9h0q6P6xXk=", + "lastModified": 1755233722, + "narHash": "sha256-AavrbMltJKcC2Fx0lfJoZfmy7g87ebXU0ddVenhajLA=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "231726642197817d20310b9d39dd4afb9e899489", + "rev": "99e03e72e3f7e13506f80ef9ebaedccb929d84d0", "type": "github" }, "original": { @@ -526,11 +544,11 @@ ] }, "locked": { - "lastModified": 1749821119, - "narHash": "sha256-X3WAS322EsebI4ohJcXhKpiyG1v+7wE4VOiXy1pxM/c=", + "lastModified": 1756022458, + "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=", "owner": "nix-community", "repo": "home-manager", - "rev": "79dfd9aa295e53773aad45480b44c131da29f35b", + "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740", "type": "github" }, "original": { @@ -555,11 +573,11 @@ ] }, "locked": { - "lastModified": 1749155331, - "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=", + "lastModified": 1753964049, + "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80", + "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", "type": "github" }, "original": { @@ -584,11 +602,11 @@ ] }, "locked": { - "lastModified": 1749238452, - "narHash": "sha256-8qiKEWcxUrjpUpK+WyFNg/72C8rp70LUuyTD23T+SdQ=", + "lastModified": 1754305013, + "narHash": "sha256-u+M2f0Xf1lVHzIPQ7DsNCDkM1NYxykOSsRr4t3TbSM4=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "c7225d73755a6c4c7c72f4d4f3925ea426e325a8", + "rev": "4c1d63a0f22135db123fc789f174b89544c6ec2d", "type": "github" }, "original": { @@ -613,11 +631,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1749820652, - "narHash": "sha256-O14+NilMfyObBpqiQHi2YR/ZpV96bQgFGJBvh0I8LxQ=", + "lastModified": 1756069181, + "narHash": "sha256-FPur4yuDwzM9uHhPFJW6KD3Xys5fz0xmRmZqFfWQD3Y=", "ref": "refs/heads/main", - "rev": "ad85406220d88c3de9ceba32f17a25caf101bb45", - "revCount": 6186, + "rev": "0ed880f3f7dc2c746bf3590eee266c010d737558", + "revCount": 6393, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -633,11 +651,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1749799794, - "narHash": "sha256-1LHIK//KmTLV+P5/bAshz5QBs2/0gFuGheJ/z4kAYrY=", + "lastModified": 1755680610, + "narHash": "sha256-g7/g5o0spemkZCzPa8I21RgCmN0Kv41B5z9Z5HQWraY=", "owner": "hyprwm", "repo": "contrib", - "rev": "26c72abe70bf149684dee838618dbb388f54d27d", + "rev": "04721247f417256ca96acf28cdfe946cf1006263", "type": "github" }, "original": { @@ -726,11 +744,11 @@ ] }, "locked": { - "lastModified": 1749155776, - "narHash": "sha256-t1PM0wxQLQwv2F2AW23uA7pm5giwmcgYEWbNIRct9r4=", + "lastModified": 1753819801, + "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "396e8aa1c06274835b69da7f9a015fff9a9b7522", + "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc", "type": "github" }, "original": { @@ -755,11 +773,11 @@ ] }, "locked": { - "lastModified": 1749145882, - "narHash": "sha256-qr0KXeczF8Sma3Ae7+dR2NHhvG7YeLBJv19W4oMu6ZE=", + "lastModified": 1753622892, + "narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "1bfb84f54d50c7ae6558c794d3cfd5f6a7e6e676", + "rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809", "type": "github" }, "original": { @@ -780,11 +798,11 @@ ] }, "locked": { - "lastModified": 1749135356, - "narHash": "sha256-Q8mAKMDsFbCEuq7zoSlcTuxgbIBVhfIYpX0RjE32PS0=", + "lastModified": 1755416120, + "narHash": "sha256-PosTxeL39YrLvCX5MqqPA6NNWQ4T5ea5K55nmN7ju9Q=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e36db00dfb3a3d3fdcc4069cb292ff60d2699ccb", + "rev": "e631ea36ddba721eceda69bfee6dd01068416489", "type": "github" }, "original": { @@ -805,11 +823,11 @@ ] }, "locked": { - "lastModified": 1749145760, - "narHash": "sha256-IHaGWpGrv7seFWdw/1A+wHtTsPlOGIKMrk1TUIYJEFI=", + "lastModified": 1755184602, + "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "817918315ea016cc2d94004bfb3223b5fd9dfcc6", + "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", "type": "github" }, "original": { @@ -829,11 +847,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1749856827, - "narHash": "sha256-HOhyPMWlt+UQIaVqYG/uq/RDGN6W7r3E4/wh8ncF54o=", + "lastModified": 1755996068, + "narHash": "sha256-+KP2Lu813lX0sfKTP6Nc4ulaE/EDIDmWUQVX9S850Yg=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "e0ab4eeb673391ac148f7c6951fe1181a61f1fdb", + "rev": "cc5f1804270d138f268a6f2d64c383fb4cf59ad0", "type": "gitlab" }, "original": { @@ -850,11 +868,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1749823715, - "narHash": "sha256-HeqmrM6hKB6qyTYyPslQ9LltsYmVhDahXgPl7+HswPc=", + "lastModified": 1753282938, + "narHash": "sha256-kNTa6gDII6U5dBxWW5CLTUc5SXbZFuQ0zeFinVR6h20=", "owner": "nbfc-linux", "repo": "nbfc-linux", - "rev": "db4ec1e85e92421d67c71ca83d84392b32f6d304", + "rev": "daabceff76aace8ef1a71ed7bf8086b75cb35b62", "type": "github" }, "original": { @@ -866,11 +884,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1749828608, - "narHash": "sha256-IjuZG+49dRU3hPoyeVlrdKDpWZXriX8uI/K+JJJJi94=", + "lastModified": 1756079028, + "narHash": "sha256-u58rAgWhxtfr3G6ol2aTW20ZbL9sJmaIX4lzo+tukXc=", "owner": "neovim", "repo": "neovim", - "rev": "76d213efbee8e6857b3aa397827fa8756a327430", + "rev": "bccec33f5a011fac7f0a90260c72c2ac2f4c334f", "type": "github" }, "original": { @@ -885,11 +903,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1749847109, - "narHash": "sha256-9i/A5yrjyYT63YZ6wOxOFru/kzQPIKZVSVWS1Clerr4=", + "lastModified": 1756087120, + "narHash": "sha256-VP7wb0KZLVX+kK0nmvIUcMf1WbGl/PdUpNPxlkqBR6A=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "9a9f441bb894ee929e93596f0dc0f23c3d9a7532", + "rev": "0ca8d5927960555f78b495a14aab4e2be08f202b", "type": "github" }, "original": { @@ -898,29 +916,48 @@ "type": "github" } }, + "nixgl": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_10" + }, + "locked": { + "lastModified": 1752054764, + "narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=", + "owner": "nix-community", + "repo": "nixGL", + "rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixGL", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1745391562, - "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "lastModified": 1754028485, + "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", + "rev": "59e69648d345d6e8fef86158c555730fa12af9de", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-25_05": { "locked": { - "lastModified": 1749727998, - "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", + "lastModified": 1753749649, + "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", + "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", "type": "github" }, "original": { @@ -932,11 +969,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "lastModified": 1753579242, + "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e", "type": "github" }, "original": { @@ -947,11 +984,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "lastModified": 1753579242, + "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e", "type": "github" }, "original": { @@ -962,11 +999,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1749668643, - "narHash": "sha256-gaWJEWGBW/g1u6o5IM4Un0vluv86cigLuBnjsKILffc=", + "lastModified": 1751274312, + "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1965fd20a39c8e441746bee66d550af78f0c0a7b", + "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", "type": "github" }, "original": { @@ -978,11 +1015,26 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1749776303, - "narHash": "sha256-OHibOvVwKqO1qvRg0r3agtd1EagW4THBcoWT7QGgcNo=", + "lastModified": 1746378225, + "narHash": "sha256-OeRSuL8PUjIfL3Q0fTbNJD/fmv1R+K2JAOqWJd3Oceg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6e7721e37bf00fa7ea44ac3cfc9d2411284ec3ef", + "rev": "93e8cdce7afc64297cfec447c311470788131cd9", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1756035328, + "narHash": "sha256-vC7SslUBCtdT3T37ZH3PLIWYmTkSeppL5BJJByUjYCM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6b0b1559e918d4f7d1df398ee1d33aeac586d4d6", "type": "github" }, "original": { @@ -992,13 +1044,13 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { - "lastModified": 1749776303, - "narHash": "sha256-OHibOvVwKqO1qvRg0r3agtd1EagW4THBcoWT7QGgcNo=", + "lastModified": 1755829505, + "narHash": "sha256-4/Jd+LkQ2ssw8luQVkqVs9spDBVE6h/u/hC/tzngsPo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e7721e37bf00fa7ea44ac3cfc9d2411284ec3ef", + "rev": "f937f8ecd1c70efd7e9f90ba13dfb400cf559de4", "type": "github" }, "original": { @@ -1010,11 +1062,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { @@ -1026,11 +1078,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { @@ -1090,11 +1142,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1749143949, - "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -1122,11 +1174,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1749213349, - "narHash": "sha256-UAaWOyQhdp7nXzsbmLVC67fo+QetzoTm9hsPf9X3yr4=", + "lastModified": 1755829505, + "narHash": "sha256-4/Jd+LkQ2ssw8luQVkqVs9spDBVE6h/u/hC/tzngsPo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a4ff0e3c64846abea89662bfbacf037ef4b34207", + "rev": "f937f8ecd1c70efd7e9f90ba13dfb400cf559de4", "type": "github" }, "original": { @@ -1143,15 +1195,15 @@ "git-hooks": "git-hooks_2", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1749893708, - "narHash": "sha256-amqUnuCPHjpf6N5AF/xYRuj+ssGt6gcqmjGSeMORL6I=", + "lastModified": 1756080870, + "narHash": "sha256-kxClZk/T/Z3vGCo2At5n/clqQY7RwPULkOdtPEkkzmI=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "844040d34df075319d4fc4f82870a5658d5401da", + "rev": "7a6894dbb8e81e33fd437b2bf96f26aab848cd2e", "type": "github" }, "original": { @@ -1170,11 +1222,11 @@ ] }, "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", + "lastModified": 1755446520, + "narHash": "sha256-I0Ok1OGDwc1jPd8cs2VvAYZsHriUVFGIUqW+7uSsOUM=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "rev": "4b04db83821b819bbbe32ed0a025b31e7971f22e", "type": "github" }, "original": { @@ -1196,7 +1248,8 @@ "mailserver": "mailserver", "nbfc": "nbfc", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_10", + "nixgl": "nixgl", + "nixpkgs": "nixpkgs_11", "nvim-overlay": "nvim-overlay", "stable": "stable" } @@ -1323,6 +1376,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1331,11 +1399,11 @@ ] }, "locked": { - "lastModified": 1749194973, - "narHash": "sha256-eEy8cuS0mZ2j/r/FE0/LYBSBcIs/MKOIVakwHVuqTfk=", + "lastModified": 1755934250, + "narHash": "sha256-CsDojnMgYsfshQw3t4zjRUkmMmUdZGthl16bXVWgRYU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "a05be418a1af1198ca0f63facb13c985db4cb3c5", + "rev": "74e1a52d5bd9430312f8d1b8b0354c92c17453e5", "type": "github" }, "original": { @@ -1405,11 +1473,11 @@ ] }, "locked": { - "lastModified": 1749155346, - "narHash": "sha256-KIkJu3zF8MF3DuGwzAmo3Ww9wsWXolwV30SjJRTAxYE=", + "lastModified": 1755354946, + "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "44bf29f1df45786098920c655af523535a9191ae", + "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0", "type": "github" }, "original": { diff --git a/home/README b/home/README index e5101f3..7c70088 100644 --- a/home/README +++ b/home/README @@ -4,5 +4,5 @@ bat : default user for remilia (Oracle VM - NixOS Unstable) spin : default user for hina (Oracle VM - NixOS Unstable) spark : default user for marisa (RPi4 - NixOS Unstable) kero : default user for suwako (ARM OracleVM - NixOS Unstable) -amneesh : default user for nightbug (Workplace PC - Ubuntu 22.04) +amneesh : default user for nightbug (Workplace PC - Arch Linux) diff --git a/home/amneesh/default.nix b/home/amneesh/default.nix index b416bdd..465bb06 100644 --- a/home/amneesh/default.nix +++ b/home/amneesh/default.nix @@ -9,16 +9,25 @@ homeDirectory = "/home/amneesh"; username = "amneesh"; stateVersion = "24.05"; - - packages = with pkgs; [ - htop - nattovim - clang-tools - llvmPackages.clang - ]; }; - xdg.mime.enable = true; targets.genericLinux.enable = true; - programs.bash.enable = true; + + imports = [ + ./pkgs.nix + + # From personal + ../natto/ags + ../natto/emacs.nix + ../natto/browser.nix + ../natto/dunst.nix + ../natto/gtk.nix + ../natto/cursor.nix + + # When wayland + ../natto/wayland.nix + ../natto/hyprland.nix + ../natto/tofi.nix + ../natto/foot.nix + ]; } diff --git a/home/amneesh/pkgs.nix b/home/amneesh/pkgs.nix new file mode 100644 index 0000000..911bfd6 --- /dev/null +++ b/home/amneesh/pkgs.nix @@ -0,0 +1,17 @@ +{ + pkgs, + inputs, + ... +}: +{ + + xdg.mime.enable = true; + programs.bash.enable = true; + + home.packages = with pkgs; [ + htop + clang-tools + llvmPackages.clang + (nattovim.override { nvimPackage = inputs.nvim-overlay.packages.${pkgs.system}.neovim; }) + ]; +} diff --git a/home/default.nix b/home/default.nix index 6c60e02..1334323 100644 --- a/home/default.nix +++ b/home/default.nix @@ -9,6 +9,8 @@ let { programs.home-manager.enable = true; } ./common/zsh ./common/direnv + ./common/laptop.nix + inputs.agenix.homeManagerModules.default ]; mkPkgs = @@ -29,26 +31,21 @@ in flake.homeConfigurations = let - nattoModules = [ - ./natto - ./common/fonts - ./common/emacs - ./common/laptop.nix - inputs.agenix.homeManagerModules.default - ] ++ common; in { natto-laptop = inputs.home-manager.lib.homeManagerConfiguration { inherit extraSpecialArgs; - modules = nattoModules ++ [ + modules = [ + ./natto { isLaptop = true; } - ]; + ] + ++ common; pkgs = mkPkgs "x86_64-linux"; }; natto = inputs.home-manager.lib.homeManagerConfiguration { inherit extraSpecialArgs; - modules = nattoModules; + modules = [ ./natto ]; pkgs = mkPkgs "x86_64-linux"; }; @@ -65,7 +62,8 @@ in stateVersion = "23.05"; }; } - ] ++ common; + ] + ++ common; pkgs = mkPkgs "aarch64-linux"; }; @@ -79,7 +77,8 @@ in stateVersion = "23.05"; }; } - ] ++ common; + ] + ++ common; pkgs = mkPkgs "x86_64-linux"; }; @@ -93,7 +92,8 @@ in stateVersion = "23.05"; }; } - ] ++ common; + ] + ++ common; pkgs = mkPkgs "x86_64-linux"; }; @@ -107,16 +107,17 @@ in stateVersion = "24.05"; }; } - ] ++ common; + ] + ++ common; pkgs = mkPkgs "aarch64-linux"; }; amneesh = inputs.home-manager.lib.homeManagerConfiguration { inherit extraSpecialArgs; modules = [ - ./common/emacs ./amneesh - ] ++ common; + ] + ++ common; pkgs = mkPkgs "x86_64-linux"; }; }; diff --git a/home/common/emacs/config/README.org b/home/natto/config/emacs/README.org similarity index 100% rename from home/common/emacs/config/README.org rename to home/natto/config/emacs/README.org diff --git a/home/common/emacs/config/config.org b/home/natto/config/emacs/config.org similarity index 100% rename from home/common/emacs/config/config.org rename to home/natto/config/emacs/config.org diff --git a/home/common/emacs/config/init.el b/home/natto/config/emacs/init.el similarity index 100% rename from home/common/emacs/config/init.el rename to home/natto/config/emacs/init.el diff --git a/home/natto/config/hypr/hyprland.conf b/home/natto/config/hypr/hyprland.conf index 25866d5..adba0df 100644 --- a/home/natto/config/hypr/hyprland.conf +++ b/home/natto/config/hypr/hyprland.conf @@ -1,4 +1,4 @@ -monitor=, highrr, auto, 1, bitdepth, 10 +monitor=, highrr, auto, 1 input { kb_layout = us,us @@ -59,6 +59,10 @@ animations { animation = workspaces, 1, 6, overshot } +cursor { + no_hardware_cursors = true +} + dwindle { pseudotile = yes preserve_split = yes diff --git a/home/natto/cursor.nix b/home/natto/cursor.nix new file mode 100644 index 0000000..e221354 --- /dev/null +++ b/home/natto/cursor.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: +{ + home.pointerCursor = { + package = pkgs.catppuccin-cursors.mochaFlamingo; + name = "catppuccin-mocha-flamingo-cursors"; + size = 32; + x11 = { + enable = true; + defaultCursor = "crosshair"; + }; + gtk.enable = true; + }; +} diff --git a/home/natto/default.nix b/home/natto/default.nix index 1a4b2cb..cc69d9b 100644 --- a/home/natto/default.nix +++ b/home/natto/default.nix @@ -20,6 +20,8 @@ ./music.nix ./zsh.nix ./games.nix + ./cursor.nix + ./emacs.nix # when xserver # ./xsession.nix diff --git a/home/common/emacs/default.nix b/home/natto/emacs.nix similarity index 95% rename from home/common/emacs/default.nix rename to home/natto/emacs.nix index b827e95..6f20e7d 100644 --- a/home/common/emacs/default.nix +++ b/home/natto/emacs.nix @@ -1,7 +1,7 @@ { pkgs, inputs, ... }: let emacs = pkgs.emacs-git-pgtk; - configFile = ./config/config.org; + configFile = ./config/emacs/config.org; enable = true; in { diff --git a/home/natto/stuff.nix b/home/natto/stuff.nix index d544c3d..9a11766 100644 --- a/home/natto/stuff.nix +++ b/home/natto/stuff.nix @@ -13,23 +13,11 @@ age.identityPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ]; home = { - pointerCursor = { - package = pkgs.catppuccin-cursors.mochaFlamingo; - name = "catppuccin-mocha-flamingo-cursors"; - size = 32; - x11 = { - enable = true; - defaultCursor = "crosshair"; - }; - gtk.enable = true; - }; - sessionVariables = { QT_X11_NO_MITSHM = "1"; HM_CONF_DIR = "/etc/nixos"; QT_QPA_PLATFORMTHEME = "gtk2"; }; - }; i18n = { inputMethod = {