From 3099f8b97a5be7b35b2eb03506adf1167270878e Mon Sep 17 00:00:00 2001 From: Akshay Date: Tue, 23 Jul 2024 16:03:05 +0100 Subject: stuff --- flake.lock | 546 +-------------------------------- flake.nix | 24 +- hosts/myrtle/configuration.nix | 3 +- hosts/myrtle/home.nix | 133 ++++++++ hosts/olive/configuration.nix | 147 --------- hosts/olive/hardware-configuration.nix | 36 --- hosts/olive/qmk.rules | 74 ----- programs/atuin.nix | 6 + programs/default.nix | 3 +- programs/git.nix | 13 +- programs/init.vim | 4 +- services/sxhkd.nix | 13 +- 12 files changed, 173 insertions(+), 829 deletions(-) create mode 100644 hosts/myrtle/home.nix delete mode 100644 hosts/olive/configuration.nix delete mode 100644 hosts/olive/hardware-configuration.nix delete mode 100644 hosts/olive/qmk.rules create mode 100644 programs/atuin.nix diff --git a/flake.lock b/flake.lock index 572eb13..e948b57 100644 --- a/flake.lock +++ b/flake.lock @@ -1,38 +1,5 @@ { "nodes": { - "attic": { - "inputs": { - "crane": [ - "chaotic", - "crane" - ], - "flake-compat": [ - "chaotic", - "flake-compat" - ], - "flake-utils": [ - "chaotic", - "flake-utils" - ], - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1711742460, - "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", - "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", - "revCount": 197, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/zhaofengli/attic/0.1.197%2Brev-4dbdbee45728d8ce5788db6461aaaa89d98081f0/018e8bce-1229-7d78-a052-5121272f0341/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/zhaofengli/attic/0.1.%2A.tar.gz" - } - }, "better-text-objs": { "inputs": { "nixpkgs": [ @@ -53,207 +20,6 @@ "url": "https://git.peppe.rs/vim/better-text-objs" } }, - "chaotic": { - "inputs": { - "attic": "attic", - "compare-to": "compare-to", - "conduit": "conduit", - "crane": "crane", - "fenix": "fenix", - "flake-compat": "flake-compat", - "flake-schemas": "flake-schemas", - "flake-utils": "flake-utils", - "home-manager": "home-manager", - "jovian": "jovian", - "jujutsu": "jujutsu", - "niri": "niri", - "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs", - "systems": "systems", - "yafas": "yafas" - }, - "locked": { - "lastModified": 1716750091, - "narHash": "sha256-E5WktBEPQPk49hhgI7ttpHKYjjWO9WqtRDmZ/i6a1io=", - "rev": "651cfaba624e7bf0876fbd528f3fa8f1b0c0c614", - "revCount": 1161, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1161%2Brev-651cfaba624e7bf0876fbd528f3fa8f1b0c0c614/018fb649-16a4-7b14-a024-40ecbab6ea35/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/chaotic-cx/nyx/%2A.tar.gz" - } - }, - "compare-to": { - "locked": { - "lastModified": 1695341185, - "narHash": "sha256-htO6DSbWyCgaDkxi7foPjXwJFPzGjVt3RRUbPSpNtZY=", - "rev": "98b8e330823a3570d328720f87a1153f8a7f2224", - "revCount": 2, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nix-empty-flake/0.1.2%2Brev-98b8e330823a3570d328720f87a1153f8a7f2224/018aba35-d228-7fa9-b205-7616c89ef4e0/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz" - } - }, - "complement": { - "flake": false, - "locked": { - "lastModified": 1715700731, - "narHash": "sha256-cie+b5N/TQAFD8vF/XbqfyFJkFU0qUPDbtJQDm/TfQc=", - "owner": "matrix-org", - "repo": "complement", - "rev": "8587fb3cbe746754b2c883ff6c818ca4d987d0a5", - "type": "github" - }, - "original": { - "owner": "matrix-org", - "ref": "main", - "repo": "complement", - "type": "github" - } - }, - "conduit": { - "inputs": { - "attic": [ - "chaotic", - "attic" - ], - "complement": "complement", - "crane": [ - "chaotic", - "crane" - ], - "fenix": [ - "chaotic", - "fenix" - ], - "flake-compat": [ - "chaotic", - "flake-compat" - ], - "flake-utils": [ - "chaotic", - "flake-utils" - ], - "liburing": "liburing", - "nix-filter": [ - "chaotic", - "nix-filter" - ], - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "rocksdb": "rocksdb" - }, - "locked": { - "lastModified": 1716690523, - "narHash": "sha256-II8U33DM1NZmUDmAhi941KeMErUTcFtLtw5RKIEHTtc=", - "owner": "girlbossceo", - "repo": "conduwuit", - "rev": "30beb2023076e073d666f620899f94443577ed4c", - "type": "github" - }, - "original": { - "owner": "girlbossceo", - "repo": "conduwuit", - "type": "github" - } - }, - "crane": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1716156051, - "narHash": "sha256-TjUX7WWRcrhuUxDHsR8pDR2N7jitqZehgCVSy3kBeS8=", - "rev": "7443df1c478947bf96a2e699209f53b2db26209d", - "revCount": 571, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/ipetkov/crane/0.17.1/018f92f7-d079-7a6a-8660-4fa94147552e/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/ipetkov/crane/%2A.tar.gz" - } - }, - "fenix": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1714544767, - "narHash": "sha256-kF1bX+YFMedf1g0PAJYwGUkzh22JmULtj8Rm4IXAQKs=", - "rev": "73124e1356bde9411b163d636b39fe4804b7ca45", - "revCount": 1852, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1852%2Brev-73124e1356bde9411b163d636b39fe4804b7ca45/018f333a-c195-795f-9e07-b43b47d5391f/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/nix-community/fenix/0.1.%2A.tar.gz" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/%2A.tar.gz" - } - }, - "flake-schemas": { - "locked": { - "lastModified": 1693491534, - "narHash": "sha256-ifw8Td8kD08J8DxFbYjeIx5naHcDLz7s2IFP3X42I/U=", - "rev": "c702cbb663d6d70bbb716584a2ee3aeb35017279", - "revCount": 21, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.1/018a4c59-80e1-708a-bb4d-854930c20f72/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.1.tar.gz" - } - }, - "flake-utils": { - "inputs": { - "systems": [ - "chaotic", - "systems" - ] - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "revCount": 92, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/numtide/flake-utils/0.1.92%2Brev-b1d9ab70662946ef0850d488da1c9019f3a9752a/018e2ca5-e5a2-7f80-9261-445a8cecd4d7/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/numtide/flake-utils/0.1.%2A.tar.gz" - } - }, "flaresolverr": { "inputs": { "flaresolverr-src": "flaresolverr-src", @@ -294,27 +60,6 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1716711219, - "narHash": "sha256-TnZETiQPXbyT5mdCHMOyrJnx2+BwroMBRrguciz1vEo=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "05e6ba83eb3585ce0aff7b41e4bd0e317d05ad4a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -334,146 +79,6 @@ "type": "github" } }, - "jovian": { - "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1716618639, - "narHash": "sha256-H3kcJDVqDmXZ9IfVtqObL3JUx/a0ERn6gWBTn+7vwN4=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "a358c56a163b3b7d149571e853a8f75b2c1ceb38", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, - "jujutsu": { - "inputs": { - "flake-utils": [ - "chaotic", - "flake-utils" - ], - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1716690105, - "narHash": "sha256-M2C+BuLrKvtXuZbnijpISfPNIKxCbEESfuMf1mt18Tk=", - "owner": "martinvonz", - "repo": "jj", - "rev": "b31f75bc94c4552454ab929b54b9f37340231fac", - "type": "github" - }, - "original": { - "owner": "martinvonz", - "repo": "jj", - "type": "github" - } - }, - "liburing": { - "flake": false, - "locked": { - "lastModified": 1716565485, - "narHash": "sha256-4R19aJNQYs6vb0/Hz4bWT56YN1P1DkFL/sxdE4Yj0CE=", - "owner": "axboe", - "repo": "liburing", - "rev": "b90c0e670a93caabbebe2d9e24ff85cece4cfe0e", - "type": "github" - }, - "original": { - "owner": "axboe", - "ref": "master", - "repo": "liburing", - "type": "github" - } - }, - "niri": { - "inputs": { - "crane": [ - "chaotic", - "crane" - ], - "fenix": [ - "chaotic", - "fenix" - ], - "flake-utils": [ - "chaotic", - "flake-utils" - ], - "nix-filter": [ - "chaotic", - "nix-filter" - ], - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1716554875, - "narHash": "sha256-BBAiAeWPwoOJyeW9PAnxSxS9kAi2b/T8bh8ChIfAD5Q=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "2ac8d840343dc964981507353c9128c68361cb6f", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "repo": "niri", - "type": "github" - } - }, - "nix-filter": { - "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "chaotic", - "jovian", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1690328911, - "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", - "owner": "zhaofengli", - "repo": "nix-github-actions", - "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "matrix-name", - "repo": "nix-github-actions", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1662714967, @@ -491,46 +96,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", - "revCount": 630835, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.630835%2Brev-bfb7a882678e518398ce9a31a881538679f6f092/018fafb0-ec0d-7254-8082-b09ecc86e5fc/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1711460390, - "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", + "lastModified": 1721622093, + "narHash": "sha256-iQ+quy3A1EKeFyLyAtjhgSvZHH7r+xybXZkxMhasN4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", + "rev": "453402b94f39f968a7c27df28e060f69e4a50c3b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -555,94 +130,17 @@ "url": "https://git.peppe.rs/cli/prompt" } }, - "rocksdb": { - "flake": false, - "locked": { - "lastModified": 1716563894, - "narHash": "sha256-LT3RVOcIZmPWetkRfFKMi8dce0QgWvN0Sr7STD1hgxo=", - "owner": "girlbossceo", - "repo": "rocksdb", - "rev": "7c0e7f7666678e3ad5c82485f9bfe405e92ff727", - "type": "github" - }, - "original": { - "owner": "girlbossceo", - "ref": "v9.2.1", - "repo": "rocksdb", - "type": "github" - } - }, "root": { "inputs": { "better-text-objs": "better-text-objs", - "chaotic": "chaotic", "flaresolverr": "flaresolverr", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "prompt": "prompt", "vim-colors-plain": "vim-colors-plain" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1714501997, - "narHash": "sha256-g31zfxwUFzkPgX0Q8sZLcrqGmOxwjEZ/iqJjNx4fEGo=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "49e502b277a8126a9ad10c802d1aaa3ef1a280ef", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "chaotic", - "jujutsu", - "flake-utils" - ], - "nixpkgs": [ - "chaotic", - "jujutsu", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1714961776, - "narHash": "sha256-LiIxWRKbm1DZ+7l1a6FMmIO8leQx5yrRLIApCMai1DY=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "f3b20ea4131408ea585bddb1f41f91c4de9499cf", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, "undetected-chromedriver-src": { "flake": false, "locked": { @@ -666,11 +164,11 @@ ] }, "locked": { - "lastModified": 1702647482, - "narHash": "sha256-HLDqIfRjzb3YAdpjBW7iN2YCWWxSkTgu+MzKV5+H/WQ=", + "lastModified": 1718377907, + "narHash": "sha256-QnoL5FE4FoYOq7Pa3x/D7jBq0KSWSfzaWgSCsdnb9vU=", "ref": "refs/heads/master", - "rev": "bfa854ec04e0dab4c69911595d0653a34f626f1d", - "revCount": 58, + "rev": "6281aa83f6545265df4f8889f94cf7cf3229faa8", + "revCount": 59, "type": "git", "url": "https://git.peppe.rs/vim/vim-colors-plain" }, @@ -678,30 +176,6 @@ "type": "git", "url": "https://git.peppe.rs/vim/vim-colors-plain" } - }, - "yafas": { - "inputs": { - "flake-schemas": [ - "chaotic", - "flake-schemas" - ], - "systems": [ - "chaotic", - "systems" - ] - }, - "locked": { - "lastModified": 1695926485, - "narHash": "sha256-wNFFnItckgSs8XeYhhv8vlJs2WF09fSQaWgw4xkDqHQ=", - "rev": "7772afd6686458ca0ddbc599a52cf5d337367653", - "revCount": 4, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/UbiqueLambda/yafas/0.1.4%2Brev-7772afd6686458ca0ddbc599a52cf5d337367653/018add18-ebb4-72c6-93fe-d1d8da361703/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/UbiqueLambda/yafas/0.1.%2A.tar.gz" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 55ed146..16326a5 100644 --- a/flake.nix +++ b/flake.nix @@ -56,27 +56,6 @@ formatter."x86_64-linux" = nixpkgs.legacyPackages."x86_64-linux".nixpkgs-fmt; nixosConfigurations = { - olive = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ({ config = { nix.registry.nixpkgs.flake = nixpkgs; }; }) - { - imports = [ ./hosts/olive/configuration.nix ]; - _module.args.self = self; - } - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.np = { - imports = [ ./home.nix ]; - _module.args.self = self; - _module.args.inputs = inputs; - _module.args.theme = import ./theme; - }; - } - ]; - }; myrtle = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -91,7 +70,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.np = { - imports = [ ./home.nix ]; + imports = [ ./hosts/myrtle/home.nix ]; _module.args.self = self; _module.args.inputs = inputs; _module.args.theme = import ./theme; @@ -110,7 +89,6 @@ imports = [ ./hosts/mantis/configuration.nix ]; _module.args.self = self; } - flaresolverr.nixosModules.default ]; }; diff --git a/hosts/myrtle/configuration.nix b/hosts/myrtle/configuration.nix index 4067b4e..1f9dc21 100644 --- a/hosts/myrtle/configuration.nix +++ b/hosts/myrtle/configuration.nix @@ -94,7 +94,6 @@ }; hardware = { - opengl.driSupport = true; bluetooth = { enable = true; powerOnBoot = true; @@ -128,12 +127,12 @@ }; services = { + libinput.enable = true; xserver = { enable = true; xkb.layout = "us"; videoDrivers = [ "nvidia" ]; displayManager.startx.enable = true; - libinput.enable = true; dpi = 192; screenSection = '' Option "metamodes" "nvidia-auto-select +0+0 {ForceFullCompositionPipeline=On}" diff --git a/hosts/myrtle/home.nix b/hosts/myrtle/home.nix new file mode 100644 index 0000000..2529b3e --- /dev/null +++ b/hosts/myrtle/home.nix @@ -0,0 +1,133 @@ +{ config +, pkgs +, theme +, self +, ... +}: + +{ + + imports = [ + ../../programs + ../../services + ../../x + # ./mail.nix + ]; + + home.stateVersion = "22.11"; + home.username = "np"; + home.homeDirectory = "/home/np"; + home.extraOutputsToInstall = [ "man" ]; + home.packages = with pkgs; [ + + # essentials + vim + weechat + firefox + qutebrowser + unzip + tmux + xclip + ripgrep + miniserve + pfetch + st + cmus + tree + neomutt + w3m + noto-fonts-emoji + fd + du-dust + jq + libnotify + inotify-tools + pavucontrol + bc + signal-desktop + killall + httpie + thunderbird + calibre + gh + sonixd + + # gaming + mgba + + # sync + rtorrent + lftp + wget + curl + + # graphics + krita + sxiv + imagemagick + ffmpeg-full + mpv + slop + maim + arandr + gimp + + # graphics debug + cudatoolkit + pciutils + + # monitoring + s-tui + nvtopPackages.full + lshw + stress + powertop + + # input + xinput_calibrator + libinput + + # meta + nixpkgs-review + nixpkgs-fmt + nix-prefetch-scripts + + # work + slack + zoom-us + awscli2 + kubectl + + ] ++ (import ../../scripts { inherit pkgs; }); + + home.pointerCursor = { + name = "Vanilla-DMZ"; + package = pkgs.vanilla-dmz; + x11.enable = true; + }; + + xdg = { + userDirs = { + enable = true; + desktop = "\$HOME/desktop"; + documents = "\$HOME/docs"; + download = "\$HOME/dloads"; + music = "\$HOME/music"; + pictures = "\$HOME/pics"; + videos = "\$HOME/vids"; + }; + }; + + xsession = { + enable = true; + windowManager.command = "2bwm"; + initExtra = '' + ${pkgs.hsetroot}/bin/hsetroot -solid "${theme.base00}" + xrdb -load $HOME/.Xresources + ${pkgs.picom}/bin/picom & + xrandr --setprovideroutputsource modesetting NVIDIA-0 + xrandr --auto + ''; + }; + +} diff --git a/hosts/olive/configuration.nix b/hosts/olive/configuration.nix deleted file mode 100644 index 3d5d47f..0000000 --- a/hosts/olive/configuration.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ config, pkgs, lib, self, ... }: - -{ - imports = - [ - ./hardware-configuration.nix - ../../services/suspend.nix - ]; - - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - boot.kernel.sysctl."net.ipv4.ip_forward" = 1; - - networking = { - hostName = "olive"; - wireless = { - iwd.enable = true; - interfaces = [ "wlan0" ]; - environmentFile = "/home/np/.wireless.env"; - networks = { - Sanic.psk = "@PSK_SANI@"; - Gopalan.psk = "@PSK_GOPA@"; - Srividhya.psk = "@PSK_SRIV@"; - sage.psk = "@PSK_SAGE@"; - }; - extraConfig = '' - ctrl_interface=/run/wpa_supplicant - ctrl_interface_group=wheel - ''; - }; - useDHCP = false; - interfaces.wlan0.useDHCP = true; - }; - - networking.nameservers = [ "1.1.1.1" "1.0.0.1" ]; - - i18n.defaultLocale = "en_US.UTF-8"; - time.timeZone = "Asia/Kolkata"; - - nixpkgs.config = { - "2bwm".patches = [ - ../../patches/2bwm/nerd-patch.diff - ]; - - st = { - conf = builtins.readFile ../../programs/st/config.h; - extraLibs = with pkgs; [ harfbuzz ]; - patches = [ - ../../patches/st/xres.diff - ../../patches/st/bright.diff - ../../patches/st/ligatures.diff - ]; - }; - - # for zoom-us - allowUnfree = true; - }; - - nixpkgs.overlays = with self.overlays; [ - statix - prompt - ]; - - environment.systemPackages = with pkgs; [ - _2bwm - man-pages - man-pages-posix - (lib.hiPrio pkgs.bashInteractive_5) - ]; - - documentation = { - dev.enable = true; - man.generateCaches = true; - }; - - users.motd = with config; '' - Host ${networking.hostName} - OS NixOS ${system.nixos.release} (${system.nixos.codeName}) - Version ${system.nixos.version} - Kernel ${boot.kernelPackages.kernel.version} - ''; - - programs = { - light.enable = true; - adb.enable = true; - }; - - sound.enable = true; - - hardware = { - pulseaudio = { - enable = true; - package = pkgs.pulseaudioFull; - extraConfig = "load-module module-bluetooth-policy auto_switch=2"; - }; - bluetooth = { - enable = true; - powerOnBoot = true; - }; - }; - - # Enable the X11 windowing system. - services.xserver = { - enable = true; - layout = "us"; - displayManager.startx.enable = true; - libinput.enable = true; - }; - - services.batteryNotifier = { - enable = true; - notifyCapacity = 20; - suspendCapacity = 10; - }; - - services.udev.extraRules = builtins.readFile ./qmk.rules; - - users.users.np = { - isNormalUser = true; - home = "/home/np"; - extraGroups = [ "wheel" "users" "tty" "audio" "video" "input" "adbusers" "docker" ]; - }; - - nix = { - package = pkgs.nixUnstable; - extraOptions = '' - experimental-features = nix-command flakes - warn-dirty = false - keep-outputs = false - keep-derivations = false - ''; - settings = { - trusted-users = [ - "root" - "np" - ]; - }; - }; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "20.03"; # Did you read the comment? -} diff --git a/hosts/olive/hardware-configuration.nix b/hosts/olive/hardware-configuration.nix deleted file mode 100644 index c2bff39..0000000 --- a/hosts/olive/hardware-configuration.nix +++ /dev/null @@ -1,36 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = [ - "${modulesPath}/installer/scan/not-detected.nix" - ]; - - boot.initrd.availableKernelModules = [ - "xhci_pci" - "ahci" - "nvme" - "usb_storage" - "sd_mod" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/27a7c854-e674-411f-9d79-37084922c91d"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/882C-54D5"; - fsType = "vfat"; - }; - - swapDevices = [ ]; - - nix.settings.max-jobs = lib.mkDefault 8; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; -} diff --git a/hosts/olive/qmk.rules b/hosts/olive/qmk.rules deleted file mode 100644 index 57806f9..0000000 --- a/hosts/olive/qmk.rules +++ /dev/null @@ -1,74 +0,0 @@ -# Atmel DFU -### ATmega16U2 -SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2fef", TAG+="uaccess" -### ATmega32U2 -SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff0", TAG+="uaccess" -### ATmega16U4 -SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff3", TAG+="uaccess" -### ATmega32U4 -SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff4", TAG+="uaccess" -### AT90USB64 -SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff9", TAG+="uaccess" -### AT90USB162 -SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ffa", TAG+="uaccess" -### AT90USB128 -SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ffb", TAG+="uaccess" - -# Input Club -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1c11", ATTRS{idProduct}=="b007", TAG+="uaccess" - -# STM32duino -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1eaf", ATTRS{idProduct}=="0003", TAG+="uaccess" -# STM32 DFU -SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", TAG+="uaccess" - -# BootloadHID -SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="05df", TAG+="uaccess" - -# USBAspLoader -SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="05dc", TAG+="uaccess" - -# ModemManager should ignore the following devices -# Atmel SAM-BA (Massdrop) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="6124", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1" - -# Caterina (Pro Micro) -## pid.codes shared PID -### Keyboardio Atreus 2 Bootloader -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="2302", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1" -## Spark Fun Electronics -### Pro Micro 3V3/8MHz -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b4f", ATTRS{idProduct}=="9203", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1" -### Pro Micro 5V/16MHz -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b4f", ATTRS{idProduct}=="9205", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1" -### LilyPad 3V3/8MHz (and some Pro Micro clones) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b4f", ATTRS{idProduct}=="9207", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1" -## Pololu Electronics -### A-Star 32U4 -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1ffb", ATTRS{idProduct}=="0101", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1" -## Arduino SA -### Leonardo -SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", ATTRS{idProduct}=="0036", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1" -### Micro -SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", ATTRS{idProduct}=="0037", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1" -## Adafruit Industries LLC -### Feather 32U4 -SUBSYSTEMS=="usb", ATTRS{idVendor}=="239a", ATTRS{idProduct}=="000c", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1" -### ItsyBitsy 32U4 3V3/8MHz -SUBSYSTEMS=="usb", ATTRS{idVendor}=="239a", ATTRS{idProduct}=="000d", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1" -### ItsyBitsy 32U4 5V/16MHz -SUBSYSTEMS=="usb", ATTRS{idVendor}=="239a", ATTRS{idProduct}=="000e", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1" -## dog hunter AG -### Leonardo -SUBSYSTEMS=="usb", ATTRS{idVendor}=="2a03", ATTRS{idProduct}=="0036", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1" -### Micro -SUBSYSTEMS=="usb", ATTRS{idVendor}=="2a03", ATTRS{idProduct}=="0037", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1" - -# hid_listen -KERNEL=="hidraw*", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl" - -# hid bootloaders -## QMK HID -SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2067", TAG+="uaccess" -## PJRC's HalfKay -SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="0478", TAG+="uaccess" diff --git a/programs/atuin.nix b/programs/atuin.nix new file mode 100644 index 0000000..2a501fc --- /dev/null +++ b/programs/atuin.nix @@ -0,0 +1,6 @@ +{ + programs.atuin = { + enable = true; + enableBashIntegration = true; + }; +} diff --git a/programs/default.nix b/programs/default.nix index 482c02e..32eaf18 100644 --- a/programs/default.nix +++ b/programs/default.nix @@ -8,6 +8,7 @@ { imports = [ + ./atuin.nix ./bash.nix ./chromium.nix ./feh.nix @@ -16,9 +17,9 @@ ./htop.nix ./neovim.nix ./readline.nix + ./rofi.nix ./tmux.nix ./zathura.nix - ./rofi.nix ]; programs = { diff --git a/programs/git.nix b/programs/git.nix index 69dd409..d4fac67 100644 --- a/programs/git.nix +++ b/programs/git.nix @@ -19,7 +19,13 @@ with theme; syntax-theme = "none"; zero-style = "8"; navigate = "true"; + line-numbers = "true"; keep-plus-minus-markers = "true"; + line-numbers-zero-style = "8"; + line-numbers-left-style = "8"; + line-numbers-right-style = "8"; + line-numbers-minus-style = "${base08}"; + line-numbers-plus-style = "${base0B}"; decorations = { file-decoration-style = "none"; whitespace-error-style = "22 reverse"; @@ -27,7 +33,7 @@ with theme; minus-emph-style = "${base08} bold"; plus-style = "${base0B}"; plus-emph-style = "${base0B} bold"; - file-style = "7 italic"; + file-style = "7 bold"; hunk-header-style = "7"; hunk-header-decoration-style = "8 ul"; }; @@ -39,11 +45,6 @@ with theme; }; }; }; - # difftastic = { - # enable = true; - # background = "dark"; - # display = "inline"; - # }; aliases = { co = "checkout"; rb = "rebase"; diff --git a/programs/init.vim b/programs/init.vim index c62f419..af74f32 100644 --- a/programs/init.vim +++ b/programs/init.vim @@ -55,6 +55,7 @@ set dir=/tmp syntax on +set nocursorline set omnifunc=syntaxcomplete#Complete set completefunc=LanguageClient#complete set list @@ -76,6 +77,7 @@ set path+=** set backspace=indent,eol,start set hidden set wildmenu +set pumheight=8 set complete=.,w,b,i,u,t, set background=dark set mouse=a @@ -83,7 +85,7 @@ set conceallevel=0 set nonumber set grepprg=rg\ --vimgrep\ --no-heading set grepformat=%f:%l:%c:%m,%f:%l:%m -set cmdheight=2 +set cmdheight=1 set shortmess+=c set updatetime=300 set signcolumn=yes diff --git a/services/sxhkd.nix b/services/sxhkd.nix index d8678af..b1fc55c 100644 --- a/services/sxhkd.nix +++ b/services/sxhkd.nix @@ -19,11 +19,18 @@ in { services.sxhkd = { enable = true; - keybindings = { + keybindings = + let + vol_up ="${volume}/bin/volume sset Master 2%+"; + vol_down ="${volume}/bin/volume sset Master 2%-"; + in + { "super + slash" = "${pkgs.light}/bin/light -A 2"; "super + shift + slash" = "${pkgs.light}/bin/light -U 2"; - "super + semicolon" = "${volume}/bin/volume sset Master 2%+"; - "super + shift + semicolon" = "${volume}/bin/volume sset Master 2%-"; + "super + semicolon" = vol_up; + "super + shift + semicolon" = vol_down; + "XF86AudioRaiseVolume" = vol_up; + "XF86AudioLowerVolume" = vol_down; "super + ctrl + space" = "${pkgs.dunst}/bin/dunstctl close"; "super + shift + space" = "${pkgs.dunst}/bin/dunstctl history-pop"; "super + ctrl + shift + space" = "${pkgs.dunst}/bin/dunstctl close-all"; -- cgit v1.2.3