diff --git a/.envrc b/.envrc deleted file mode 100644 index 3550a30..0000000 --- a/.envrc +++ /dev/null @@ -1 +0,0 @@ -use flake diff --git a/.gitmodules b/.gitmodules index e69de29..0f15da1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "home/emacs.d"] + path = home/emacs.d + url = https://github.com/hlissner/doom-emacs diff --git a/flake.lock b/flake.lock index 5fc1bf6..cd9faaf 100644 --- a/flake.lock +++ b/flake.lock @@ -3,18 +3,16 @@ "agenix": { "inputs": { "darwin": "darwin", - "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" - ], - "systems": "systems" + ] }, "locked": { - "lastModified": 1762618334, - "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", + "lastModified": 1677969766, + "narHash": "sha256-AIp/ZYZMNLDZR/H7iiAlaGpu4lcXsVt9JQpBlf43HRY=", "owner": "ryantm", "repo": "agenix", - "rev": "fcdea223397448d35d9b31f798479227e80183f6", + "rev": "03b51fe8e459a946c4b88dcfb6446e45efb2c24e", "type": "github" }, "original": { @@ -47,11 +45,11 @@ ] }, "locked": { - "lastModified": 1744478979, - "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", + "lastModified": 1673295039, + "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "43975d782b418ebf4969e9ccba82466728c2851b", + "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", "type": "github" }, "original": { @@ -61,89 +59,34 @@ "type": "github" } }, - "disko": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763651264, - "narHash": "sha256-8vvwZbw0s7YvBMJeyPVpWke6lg6ROgtts5N2/SMCcv4=", - "owner": "nix-community", - "repo": "disko", - "rev": "e86a89079587497174ccab6d0d142a65811a4fd9", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "disko", - "type": "github" - } - }, - "distro-grub-themes": { + "emacs": { "inputs": { "flake-utils": "flake-utils", "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ] }, "locked": { - "lastModified": 1734806114, - "narHash": "sha256-FWkDtoLMTTk2Lz4d4LkFjtV/xYyIlpwZlX5Np1QhXls=", - "owner": "AdisonCavani", - "repo": "distro-grub-themes", - "rev": "ebbd17419890059e371a6f2dbf2a7e76190327d4", + "lastModified": 1680257010, + "narHash": "sha256-pNMB9sdoZOXEsszLD5TS0WG5Ysj2rVRmf92uxsxH/9A=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "cfec7f9501cc0e001f49d725a7cd733af7deb2ed", "type": "github" }, "original": { - "owner": "AdisonCavani", - "repo": "distro-grub-themes", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", + "owner": "nix-community", + "repo": "emacs-overlay", "type": "github" } }, "flake-utils": { - "inputs": { - "systems": "systems_2" - }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -152,88 +95,19 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "snm", - "flake-compat" - ], - "gitignore": "gitignore_2", - "nixpkgs": [ - "snm", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763319842, - "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "pre-commit-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" - } - }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "snm", - "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": [ - "agenix", - "nixpkgs" - ] + "nixpkgs-unstable" + ], + "utils": "utils" }, "locked": { - "lastModified": 1745494811, - "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", + "lastModified": 1678831854, + "narHash": "sha256-7HBmLFNVD2KjovSzypIN9NfyzpWelMe8sNbUVZIRsS0=", "owner": "nix-community", "repo": "home-manager", - "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", + "rev": "cae54dc45c0d61c99c1dc8b04bc42f36c76f9771", "type": "github" }, "original": { @@ -243,38 +117,19 @@ } }, "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763906693, - "narHash": "sha256-inm7paa3myo8gE4TzjM8OPvsEg8xocWreIZBgBPEKgo=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "3d6c1c8fa0bea3a1a7ba23d6fa5993116766073b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { "inputs": { "nixpkgs": [ "nix-on-droid", "nixpkgs" - ] + ], + "utils": "utils_2" }, "locked": { - "lastModified": 1709445365, - "narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=", + "lastModified": 1663932797, + "narHash": "sha256-IH8ZBW99W2k7wKLS+Sat9HiKX1TPZjFTnsPizK5crok=", "owner": "nix-community", "repo": "home-manager", - "rev": "4de84265d7ec7634a69ba75028696d74de9a44a7", + "rev": "de3758e31a3a1bc79d569f5deb5dac39791bf9b6", "type": "github" }, "original": { @@ -293,11 +148,11 @@ "nmt": "nmt" }, "locked": { - "lastModified": 1705252799, - "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=", + "lastModified": 1666720474, + "narHash": "sha256-iWojjDS1D19zpeZXbBdjWb9MiKmVVFQCqtJmtTXgPx8=", "owner": "Gerschtli", "repo": "nix-formatter-pack", - "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5", + "rev": "14876cc8fe94a3d329964ecb073b4c988c7b61f5", "type": "github" }, "original": { @@ -308,37 +163,68 @@ }, "nix-on-droid": { "inputs": { - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", "nix-formatter-pack": "nix-formatter-pack", "nixpkgs": [ - "nixpkgs-droid" + "nixpkgs" ], - "nixpkgs-docs": "nixpkgs-docs", "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap", "nmd": "nmd_2" }, "locked": { - "lastModified": 1720396533, - "narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=", + "lastModified": 1670198918, + "narHash": "sha256-oNlUhAM0/a3pDdCMmBWA+CLrDAIYJqAAMyrDp8fNSM4=", "owner": "t184256", "repo": "nix-on-droid", - "rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25", + "rev": "b00cb5e7e2a47d85a019119069b153cda4002d0a", "type": "github" }, "original": { "owner": "t184256", - "ref": "release-24.05", + "ref": "release-22.11", "repo": "nix-on-droid", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1763678758, - "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", + "lastModified": 1678703398, + "narHash": "sha256-Y1mW3dBsoWLHpYm+UIHb5VZ7rx024NNHaF16oZBx++o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", + "rev": "67f26c1cfc5d5783628231e776a81c1ade623e0b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-for-bootstrap": { + "locked": { + "lastModified": 1669834992, + "narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1678654296, + "narHash": "sha256-aVfw3ThpY7vkUeF1rFy10NAkpKDS2imj3IakrzT0Occ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5a1dc8acd977ff3dccd1328b7c4a6995429a656b", "type": "github" }, "original": { @@ -348,68 +234,19 @@ "type": "github" } }, - "nixpkgs-docs": { - "locked": { - "lastModified": 1705957679, - "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-droid": { - "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-for-bootstrap": { - "locked": { - "lastModified": 1720244366, - "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1763553727, - "narHash": "sha256-4aRqRkYHplWk0mrtoF5i3Uo73E3niOWiUZU8kmPm9hQ=", + "lastModified": 1669542132, + "narHash": "sha256-DRlg++NJAwPh8io3ExBJdNW7Djs3plVI5jgYQ+iXAZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "094318ea16502a7a81ce90dd3638697020f030a2", + "rev": "a115bb9bd56831941be3776c8a94005867f316a7", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" } }, "nmd": { @@ -429,25 +266,19 @@ } }, "nmd_2": { - "inputs": { - "nixpkgs": [ - "nix-on-droid", - "nixpkgs-docs" - ], - "scss-reset": "scss-reset" - }, + "flake": false, "locked": { - "lastModified": 1705050560, - "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=", - "owner": "~rycee", + "lastModified": 1666190571, + "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=", + "owner": "rycee", "repo": "nmd", - "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3", - "type": "sourcehut" + "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169", + "type": "gitlab" }, "original": { - "owner": "~rycee", + "owner": "rycee", "repo": "nmd", - "type": "sourcehut" + "type": "gitlab" } }, "nmt": { @@ -466,123 +297,83 @@ "type": "gitlab" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763741496, - "narHash": "sha256-uIRqs/H18YEtMOn1OkbnPH+aNTwXKx+iU3qnxEkVUd0=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "20e71a403c5de9ce5bd799031440da9728c1cda1", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", - "disko": "disko", - "distro-grub-themes": "distro-grub-themes", - "home-manager": "home-manager_2", + "emacs": "emacs", + "home-manager": "home-manager", "nix-on-droid": "nix-on-droid", "nixpkgs": "nixpkgs", - "nixpkgs-droid": "nixpkgs-droid", - "pre-commit-hooks": "pre-commit-hooks", - "snm": "snm", - "stable": "stable" - } - }, - "scss-reset": { - "flake": false, - "locked": { - "lastModified": 1631450058, - "narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=", - "owner": "andreymatin", - "repo": "scss-reset", - "rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91", - "type": "github" - }, - "original": { - "owner": "andreymatin", - "repo": "scss-reset", - "type": "github" + "nixpkgs-unstable": "nixpkgs-unstable", + "snm": "snm" } }, "snm": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_2", - "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "nixpkgs-22_11": [ + "nixpkgs" + ], + "utils": "utils_3" }, "locked": { - "lastModified": 1763564778, - "narHash": "sha256-HSWMOylEaTtVgzIjpTbjcjVLXHDwNyV081eVUBfAcMs=", + "lastModified": 1671659164, + "narHash": "sha256-DbpT+v1POwFOInbrDL+vMbYV3mVbTkMxmJ5j50QnOcA=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "4987d275a90392347f84923cd4cd8efcf0aa7a22", + "rev": "bc667fb6afc45f6cc2d118ab77658faf2227cffd", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "master", + "ref": "nixos-22.11", "repo": "nixos-mailserver", "type": "gitlab" } }, - "stable": { + "utils": { "locked": { - "lastModified": 1751274312, - "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "systems": { + "utils_2": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { - "owner": "nix-systems", - "repo": "default", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "systems_2": { + "utils_3": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "lastModified": 1605370193, + "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5021eac20303a61fafe17224c087f5519baed54d", "type": "github" }, "original": { - "owner": "nix-systems", - "repo": "default", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } } diff --git a/flake.nix b/flake.nix index 23f2062..c1bf290 100644 --- a/flake.nix +++ b/flake.nix @@ -1,151 +1,73 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - stable.url = "github:NixOS/nixpkgs/nixos-24.11"; - nixpkgs-droid.url = "github:NixOS/nixpkgs/nixos-24.05"; - - distro-grub-themes = { - url = "github:AdisonCavani/distro-grub-themes"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; - pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; + nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; }; # simple mailserver snm = { - url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; - # inputs.nixpkgs-23_05.follows = "nixpkgs"; + url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.11"; + inputs.nixpkgs-22_11.follows = "nixpkgs"; }; nix-on-droid = { - url = "github:t184256/nix-on-droid/release-24.05"; - inputs.nixpkgs.follows = "nixpkgs-droid"; + url = "github:t184256/nix-on-droid/release-22.11"; + inputs.nixpkgs.follows = "nixpkgs"; }; + emacs = { + url = "github:nix-community/emacs-overlay"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; + +# simplex-chat = { +# url = "github:simplex-chat/simplex-chat"; +# inputs.nixpkgs.follows = "nixpkgs"; +# }; + # age for nix to store encrypted passwords conveniently agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; }; - - disko.url = "github:nix-community/disko"; - disko.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = - { - self, - home-manager, - nixpkgs, - stable, - pre-commit-hooks, - ... - }@inputs: - { - checks."x86_64-linux" = - let - system = "x86_64-linux"; - pkgs = import nixpkgs { inherit system; }; - in - { - pre-commit-check = pre-commit-hooks.lib.${system}.run { - src = ./.; - tools.fourmolu = pkgs.haskellPackages.fourmolu; - tools.nixfmt = pkgs.nixfmt-rfc-style; - hooks = { - nixfmt-rfc-style.enable = true; - fourmolu.enable = true; - hpack.enable = true; - hlint.enable = true; - ormolu = { - settings.defaultExtensions = [ "GHC2021" ]; - }; - }; + outputs = { home-manager, nixpkgs, agenix, snm, ... }@inputs: { + nixosConfigurations."thrall" = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ({ + nixpkgs = { + config.allowUnfree = true; + overlays = with inputs; [ emacs.overlay ]; }; - }; - - nixosConfigurations."thrall" = nixpkgs.lib.nixosSystem rec { - system = "x86_64-linux"; - specialArgs = { - inherit inputs; - inherit system; - }; - modules = [ - ( - { inputs, lib, ... }: - { - nixpkgs = { - config.allowUnfree = true; - # overlays = with inputs; [ - # emacs.overlay - # ]; - }; - } - ) - ./hosts/thrall - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { - inherit inputs; - }; - } - { home-manager.users.alex = ./hosts/thrall/alex.nix; } - ]; - }; - - nixosConfigurations."dregil" = nixpkgs.lib.nixosSystem rec { - system = "x86_64-linux"; - specialArgs = { - inherit inputs; - inherit system; - stable = import inputs.stable { system = "x86_64-linux"; }; - }; - modules = [ ./hosts/dregil ]; - }; - - nixosConfigurations."igor" = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { - inherit inputs; - }; - modules = [ ./hosts/igor ]; - }; - - homeConfigurations."alex@dregil" = home-manager.lib.homeManagerConfiguration { - - }; - - nixOnDroidConfigurations.default = - with inputs; - nix-on-droid.lib.nixOnDroidConfiguration { - pkgs = import nixpkgs-droid { }; - modules = [ - ./hosts/redmi - { nix.registry.nixpkgs.flake = nixpkgs-droid; } - { nix.nixPath = [ "nixpkgs=${nixpkgs-droid}" ]; } - ]; - }; - - devShells."x86_64-linux".default = - let - system = "x86_64-linux"; - pkgs = import nixpkgs { inherit system; }; - in - pkgs.mkShell { - inherit (self.checks.${system}.pre-commit-check) shellHook; - - packages = with pkgs; [ - nixfmt-rfc-style - nil - ]; - }; + }) + snm.nixosModule + ./modules/security.nix + ./hosts/thrall + agenix.nixosModules.age + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.alex = import ./home/cli.nix; + } + ]; }; + + nixosConfigurations."dregil" = import ./hosts/dregil { inherit inputs; }; + homeConfigurations = import ./outputs/homeConfigurations inputs; + + nixOnDroidConfigurations.default = inputs.nix-on-droid.lib.nixOnDroidConfiguration { + modules = [ + ./hosts/redmi + { nix.registry.nixpkgs.flake = nixpkgs; } + { nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; } + ]; + }; + }; } diff --git a/home/alex/cli.nix b/home/alex/cli.nix deleted file mode 100644 index b4833b9..0000000 --- a/home/alex/cli.nix +++ /dev/null @@ -1,214 +0,0 @@ -{ config, pkgs, ... }: - -# minimal config, suitable for servers -let - user = { - name = config.home.username; - fullName = "Alexander Kobjolke"; - mail = "me@failco.de"; - }; - - myEza = if builtins.hasAttr "eza" pkgs then "eza" else "exa"; -in -{ - imports = [ - ./programs/neovim/default.nix - ./programs/emacs/default.nix - ./programs/editorconfig - ./programs/jq - ./programs/fzf - ./programs/git - ./programs/jujutsu - ./programs/shell - ./programs/devenv.nix - ]; - - programs.home-manager.enable = true; - home = { - stateVersion = "21.05"; - sessionPath = [ "$HOME/.local/bin" ]; - }; - - # do not show home-manager notifications - news.display = "silent"; - - home.packages = with pkgs; [ - # archives - #p7zip - #unrar - git-absorb - git-annex - git-annex-remote-rclone - - tea # command-line frontend for gitea - - # nix tools - nix-index - nixfmt-rfc-style - # misc - fd # better find - file # info about files - unzip - dropbox - gotop - gnumake - ripgrep # better grep - pijul - sqlite.dev - sqlite - - # editing - nil # nix language server - shellcheck - editorconfig-core-c - shfmt - (aspellWithDicts ( - dicts: with dicts; [ - en - en-computers - en-science - de - ] - )) - - # system tools - htop-vim # htop with vim bindings - erdtree # du+tree had sex - dua # ncdu but better - - gopass - gopass-jsonapi - gopass-hibp - - gcc - cmake - graphviz - plantuml - gnuplot - - pandoc - hledger - hledger-web - hledger-ui - - nix-prefetch-git - ]; - home.extraOutputsToInstall = [ - "doc" - "info" - "devdoc" - ]; - - xdg.enable = true; - - xdg.configFile.tmux = { - target = "tmux/tmux.conf"; - text = '' - set -g default-terminal "xterm-256color" - set-window-option -g xterm-keys on - set -ag update-environment "SSH_TTY SSH_CLIENT" - set -g prefix C-z - set -g status-keys vi - setw -g mode-keys vi - setw -g aggressive-resize on - set -g mouse on - # do not wait for a manually entered escape sequence, just forward it immediately - set -g escape-time 0 - bind-key C-z send-prefix - set -g renumber-windows on - - bind-key T swap-window -t 0 - ''; - }; - - xdg.configFile.pijul = { - target = "pijul/config.toml"; - text = '' - [author] - name = "${user.name}" - full_name = "${user.fullName}" - email = "${user.mail}" - ''; - }; - - programs = { - bash = { - enable = true; - }; - - # better cat - bat.enable = true; - - # htop replacement with a nice UI - btop.enable = true; - - # better ls with icons and stuff, maybe also try lsd - ${myEza} = { - enable = true; - icons = "auto"; - }; - - starship = { - enable = true; - }; - - direnv = { - enable = true; - nix-direnv = { - enable = true; - }; - enableZshIntegration = true; - enableBashIntegration = true; - }; - - gh = { - enable = true; - settings.git_protocol = "ssh"; - }; - - gpg = { - enable = true; - settings = { - homedir = "~/.local/share/gnupg"; - }; - }; - - helix = { - enable = true; - settings.theme = "gruvbox"; - }; - - password-store = { - enable = true; - package = pkgs.gopass; - settings = { - PASSWORD_STORE_DIR = "$HOME/.local/share/password-store"; - }; - }; - - ssh = { - enable = true; - enableDefaultConfig = false; - matchBlocks = { - "*" = { - controlMaster = "auto"; - controlPersist = "10m"; - }; - }; - }; - - texlive.enable = true; - }; - - services.gpg-agent = { - enable = true; - enableSshSupport = true; - defaultCacheTtl = 7200; - defaultCacheTtlSsh = 7200; - }; - - home.file.".local" = { - recursive = true; - source = ./local; - }; -} diff --git a/home/alex/default.nix b/home/alex/default.nix deleted file mode 100644 index 62ee3b3..0000000 --- a/home/alex/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - config, - lib, - pkgs, - inputs, - ... -}: -{ - imports = [ ]; - - users.users."alex" = { - isNormalUser = true; - extraGroups = [ - "input" - "networkmanager" - "wheel" - "video" - ]; - description = "Alexander Kobjolke"; - home = "/home/alex"; - shell = pkgs.zsh; - }; - - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.alex = import ./home.nix; -} diff --git a/home/alex/home.nix b/home/alex/home.nix deleted file mode 100644 index 3d8b050..0000000 --- a/home/alex/home.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ - config, - lib, - pkgs, - stable, - ... -}: -{ - imports = [ - ./cli.nix - ./programs/rofi - # ./programs/xmonad - # ./programs/i3 - ./programs/jitsi-meet - ./programs/simplex-chat - ./programs/zathura - ./programs/autorandr - # ./services/polybar - # ./services/dunst - # ./services/udiskie - # ./services/picom - # ./services/screen-locker - # ./services/blueman-applet - # ./services/network-manager - ./services/syncthing - ./services/git-sync - ./modules/email.nix - ]; - - home = { - homeDirectory = "/home/alex"; - stateVersion = "21.05"; - - language.base = "en_US.UTF-8"; - - keyboard.layout = "us"; - keyboard.variant = "dvorak"; - keyboard.options = [ - "terminate:ctrl_alt_bksp" - "caps:escape" - "compose:ralt" - ]; - - packages = with pkgs; [ - # social - discord # talk to other people - google-chrome - signal-desktop - - # system tools - uhk-agent # my keyboard - mosh # ssh via udp - rclone - parallel-disk-usage - gdu - - gnomeExtensions.paperwm - - # gaming support - stable.bottles - wine64Packages.stagingFull - scummvm - - # reading - xournalpp # pdf editor - ]; - }; - - news.display = "silent"; - - my.git-sync.enable = true; - - programs = { - alacritty.enable = true; - - browserpass = { - enable = true; - browsers = [ "firefox" ]; - }; - - feh.enable = true; - firefox = { - enable = true; - package = pkgs.firefox.override { - cfg = { - nativeMessagingHosts.packages = [ - pkgs.browserpass - pkgs.tridactyl-native - ]; - enableGnomeExtensions = true; - }; - }; - }; - mpv.enable = true; - - zsh = - let - auth-socket-env = '' - export SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf -L agent-ssh-socket)" - ''; - in - { - enable = true; - loginExtra = auth-socket-env; - initContent = auth-socket-env; - }; - }; - - services.gpg-agent = { - enable = true; - enableSshSupport = true; - sshKeys = [ "9027AB16B9A7C20BD29F30F55CBA054430BF014C" ]; - extraConfig = '' - pinentry-program ${pkgs.pinentry.qt}/bin/pinentry - ''; - }; - - xsession.enable = true; -} diff --git a/home/alex/modules/email.nix b/home/alex/modules/email.nix deleted file mode 100644 index 71bcbd3..0000000 --- a/home/alex/modules/email.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - mkAccount = - addr: - let - domain = lib.lists.elemAt (lib.strings.splitString "@" addr) 1; - in - { - address = addr; - gpg = { - key = "F2132F0C63730C6BC42BCC2A41A6D13FECA21280"; - signByDefault = true; - }; - mbsync = { - enable = true; - create = "maildir"; - }; - passwordCommand = "${lib.getBin pkgs.gopass}/bin/gopass --nosync show -o eMail/${domain}/${addr}"; - msmtp.enable = true; - notmuch.enable = true; - realName = "Alexander Kobjolke"; - userName = addr; - }; -in -{ - programs.afew.enable = true; - programs.mbsync.enable = true; - programs.msmtp.enable = true; - programs.notmuch = { - enable = true; - hooks.preNew = "mbsync --all"; - }; - programs.mu = { - enable = true; - }; - - accounts.email = { - accounts.failco = mkAccount "me@failco.de" // { - primary = true; - imap.host = "thrall.failco.de"; - smtp.host = "thrall.failco.de"; - }; - - accounts.jakalx = mkAccount "alex@jakalx.net" // { - imap.host = "thrall.failco.de"; - smtp.host = "thrall.failco.de"; - }; - - accounts.google = mkAccount "petry.alexander@gmail.com" // { - flavor = "gmail.com"; - }; - }; -} diff --git a/home/alex/programs/autorandr/default.nix b/home/alex/programs/autorandr/default.nix deleted file mode 100644 index 2ef4391..0000000 --- a/home/alex/programs/autorandr/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -{ - config.programs.autorandr = { - enable = true; - }; -} diff --git a/home/alex/programs/devenv.nix b/home/alex/programs/devenv.nix deleted file mode 100644 index 1b06499..0000000 --- a/home/alex/programs/devenv.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, ... }: - -{ - config.home.packages = [ pkgs.devenv ]; -} diff --git a/home/alex/programs/editorconfig/default.nix b/home/alex/programs/editorconfig/default.nix deleted file mode 100644 index 5a45c0a..0000000 --- a/home/alex/programs/editorconfig/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - editorconfig = { - enable = true; - settings = { - "*" = { - charset = "utf-8"; - end_of_line = "lf"; - trim_trailing_whitespace = true; - insert_final_newline = true; - max_line_width = 78; - indent_style = "space"; - indent_size = 2; - }; - }; - }; -} diff --git a/home/alex/programs/emacs/default.nix b/home/alex/programs/emacs/default.nix deleted file mode 100644 index d94091f..0000000 --- a/home/alex/programs/emacs/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - pkgs, - ... -}: -let - emacsclient-wrapper = pkgs.writeShellScriptBin "e" '' - exec ${pkgs.emacs}/bin/emacsclient --reuse-frame --no-wait "$@" - ''; -in -{ - home = { - sessionPath = [ "$HOME/.emacs.d/bin" ]; - packages = [ emacsclient-wrapper ]; - }; - - programs.emacs = { - enable = true; - extraPackages = epkgs: with epkgs; [ vterm ]; - }; - - services.emacs = { - enable = true; - defaultEditor = true; - startWithUserSession = true; - }; -} diff --git a/home/alex/programs/emacs/doom/config.el b/home/alex/programs/emacs/doom/config.el deleted file mode 100644 index 39c5a5e..0000000 --- a/home/alex/programs/emacs/doom/config.el +++ /dev/null @@ -1,410 +0,0 @@ -;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- - -;; Place your private configuration here! Remember, you do not need to run 'doom -;; sync' after modifying this file! - -(setq ak/at-work? (getenv "I_AM_AT_WORK")) - -;; Some functionality uses this to identify you, e.g. GPG configuration, email -;; clients, file templates and snippets. -(setq! user-full-name "Alexander Kobjolke" - user-mail-address "me@failco.de" - auth-sources '("~/.local/share/emacs/authinfo.gpg" "~/.authinfo.gpg" "~/.netrc") - auth-source-cache-expiry nil) - -(when ak/at-work? - (setq! user-mail-address "alexander.kobjolke@atlas-elektronik.com")) - - -;; Doom exposes five (optional) variables for controlling fonts in Doom. Here -;; are the three important ones: -;; -;; + `doom-font' -;; + `doom-variable-pitch-font' -;; + `doom-big-font' -- used for `doom-big-font-mode'; use this for -;; presentations or streaming. -;; -;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd -;; font string. You generally only need these two: -;; (setq doom-font (font-spec :family "monospace" :size 12 :weight 'semi-light) -;; doom-variable-pitch-font (font-spec :family "sans" :size 13)) - -;; There are two ways to load a theme. Both assume the theme is installed and -;; available. You can either set `doom-theme' or manually load a theme with the -;; `load-theme' function. This is the default: -(setq! doom-theme 'doom-gruvbox) -(setq! doom-localleader-key ",") -(setq! doom-localleader-alt-key "M-,") - -(require 're-builder) -(setq! reb-re-syntax 'string) - -;; do not create a new workspace for each emacsclient -;; (after! persp-mode -;;   (setq! persp-emacsclient-init-frame-behaviour-override "main")) - -(after! lsp - (add-to-list 'lsp-file-watch-ignored-directories "[/\\\\]\\.devenv\\'") - (add-to-list 'lsp-file-watch-ignored-directories "[/\\\\]target\\'") - ) - -(defun set-frame-alpha (arg &optional active) - "Interactively set the transparency of the active frame" - (interactive "nEnter alpha value (1-100): \np") - (let* ((elt (assoc 'alpha default-frame-alist)) - (old (frame-parameter nil 'alpha)) - (new (cond ((atom old) `(,arg ,arg)) - ((eql 1 active) `(,arg ,(cadr old))) - (t `(,(car old) ,arg))))) - (if elt (setcdr elt new) (push `(alpha ,@new) default-frame-alist)) - (set-frame-parameter nil 'alpha new))) - -(defun my/org-id-update-id-current-file () - "Scan the current buffer for Org-ID locations and update them." - (interactive) - (org-id-update-id-locations (list (buffer-file-name (current-buffer))))) - -(setq! undo-limit 80000000 ; Raise undo-limit to 80Mb - auto-save-default t ; Nobody likes to loose work, I certainly don't - ;; switch-to-buffer-in-dedicated-window 'pop - ;; switch-to-buffer-obey-display-actions t - ) - -;; tweak some VI defaults -(after! evil - (setq! evil-ex-substitute-global t ; I like my s/../.. to be global by default - evil-move-cursor-back nil ; Don't move the block cursor when toggling insert mode - evil-want-fine-undo t ; By default while in insert all changes are one big blob. Be more granular - evil-want-Y-yank-to-eol t - evil-escape-key-sequence "qq" ; define an escape sequence - evil-escape-delay 0.175 - evil-move-beyond-eol t ; let the cursor move beyond eol just as in regular emacs - evil-kill-on-visual-paste nil ; Don't put overwritten text in the kill ring - evil-snipe-override-evil-repeat-keys nil)) - - -;; This determines the style of line numbers in effect. If set to `nil', line -;; numbers are disabled. For relative line numbers, set this to `relative'. -(setq! display-line-numbers-type 'relative) - -;; mouse -;; enable mouse reporting for terminal emulators -(unless window-system - (xterm-mouse-mode 1) - (global-set-key [mouse-4] (lambda () - (interactive) - (scroll-down 1))) - (global-set-key [mouse-5] (lambda () - (interactive) - (scroll-up 1)))) - -(use-package! org - :init - ;; If you use `org' and don't want your org files in the default location below, - ;; change `org-directory'. It must be set before org loads! - (setq! org-directory "~/org/") - (setq! org-log-into-drawer t - org-agenda-include-diary t - org-agenda-sticky t - org-todo-keywords '( - (sequence "NEXT(n)" "TODO(t)" "WAIT(w@/!)" "|" "DONE(d!)" "CNCL(k@)") - (sequence "[ ](T)" "[-](S)" "[?](W)" "|" "[X](D)") - ) - org-tag-alist '( - ;; Places - ("@home" . ?h) - ("@work" . ?w) - - ;; devices - ("@phone" . ?p) - ("@computer" . ?c) - - ;; - ("@email" . ?e) - - )) - - - :config - - (use-package! org-ql) - (use-package! org-modern) - (use-package! org-bookmark-heading) - - (add-hook! 'org-mode-hook #'+org-init-keybinds-h)) - -(use-package! org-contacts - :after org - :custom (org-contacts-files '("~/org/contacts.org"))) - -(use-package! activities - :demand t - :config - (defun ak/activities-define--with-prefix-arg () - "Call 'C-u activities-define' in order to save the current activity." - (interactive) - (let ((current-prefix-arg '(4))) - (call-interactively #'activities-define))) - - (activities-mode) - (activities-tabs-mode) - (setopt tab-bar-show 1) - (map! - (:prefix-map ("C-c a" . "Activities") - :desc "Switch activity" "a" #'activities-switch - :desc "Resume activity" "r" #'activities-resume - :desc "Create new activity" "n" #'activities-new - :desc "List activities" "l" #'activities-list - :desc "Save current activity " "s" #'ak/activities-define--with-prefix-arg - :desc "Save all activities" "S" #'activities-save-all - :desc "Revert activity to default" "R" #'activities-revert - ) - ) - ) - -(when ak/at-work? - (after! forge - (add-to-list 'forge-alist '("gitlab.atlas.de" "gitlab.atlas.de/api/v4" "gitlab.atlas.de" forge-gitlab-repository))) - - (after! haskell-mode - (setq haskell-process-type 'cabal-new-repl)) - - (setq! plantuml-jar-path "~/opt/plantuml.jar") - (setq! org-plantuml-jar-path plantuml-jar-path) - - (after! lsp - (add-to-list 'lsp-disabled-clients 'cmakels)) - - (add-to-list '+format-on-save-disabled-modes 'cmake-mode) - (add-to-list '+format-on-save-disabled-modes 'nxml-mode) - - (use-package! code-review - :init - (setq code-review-auth-login-marker 'forge) - ;; (setq code-review-gitlab-host "gitlab.atlas.de/api") - ;; (setq code-review-gitlab-graphql-host "gitlab.atlas.de/api") - :config - (add-hook 'code-review-mode-hook - (lambda () - ;; include *Code-Review* buffer into current workspace - (persp-add-buffer (current-buffer)))))) - -(after! magit - (transient-append-suffix 'magit-fetch "-t" - '("-f" "Bypass safety checks" "--force")) - ) - -(setq ak/bibliography (list (concat org-directory "references.bib"))) -;; (setq org-cite-global-bibliography (list (concat org-directory "references.bib"))) -(setq! bibtex-completion-bibliography ak/bibliography) -(setq! citar-bibliography ak/bibliography) - -(after! ledger-mode - (setq! - ;; Use an ISO date format for ledger entries - ledger-default-date-format "%Y-%m-%d" - ledger-binary-path "hledger" - ledger-report-auto-width nil - ledger-mode-should-check-version nil - ledger-init-file-name " " - ledger-post-amount-alignment-column 58 - ledger-report-native-highlighting-arguments '("--color=always") - ledger-highlight-xact-under-point t) - - (setq! ledger-reports - '(("bal" "%(binary) -f %(ledger-file) bal -B") - ("reg" "%(binary) -f %(ledger-file) reg -B") - ("payee" "%(binary) -f %(ledger-file) reg -B @%(payee)") - ("account" "%(binary) -f %(ledger-file) reg -B %(account)"))) ) - - -(after! lsp-haskell - (setq lsp-haskell-formatting-provider "fourmolu") - - ;; will define elisp functions for the given lsp code actions, prefixing the - ;; given function names with "lsp" - (lsp-make-interactive-code-action wingman-fill-hole "refactor.wingman.fillHole") - (lsp-make-interactive-code-action wingman-case-split "refactor.wingman.caseSplit") - (lsp-make-interactive-code-action wingman-refine "refactor.wingman.refine") - (lsp-make-interactive-code-action wingman-split-func-args "refactor.wingman.spltFuncArgs") - (lsp-make-interactive-code-action wingman-use-constructor "refactor.wingman.useConstructor") - - ;; example key bindings - ;; (define-key haskell-mode-map (kbd "C-c d") #'lsp-wingman-case-split) - ;; (define-key haskell-mode-map (kbd "C-c n") #'lsp-wingman-fill-hole) - ;; (define-key haskell-mode-map (kbd "C-c r") #'lsp-wingman-refine) - ;; (define-key haskell-mode-map (kbd "C-c c") #'lsp-wingman-use-constructor) - ;; (define-key haskell-mode-map (kbd "C-c a") #'lsp-wingman-split-func-args) - ) - -;; Org GTD support -(use-package! org-gtd - :after org - :demand t - :init - (setq! org-gtd-update-ack "3.0.0") - - :config - (setf org-gtd-id--generate #'org-id-get-create) - (setq! org-gtd-directory org-directory) - (setq! org-gtd-default-file-name "actionable") - (setq! org-gtd-refile-to-any-target nil) - (setq! org-gtd-engage-prefix-width 40) - (setq! org-edna-use-inheritance t) - ;; (setq org-gtd-areas-of-focus '("house" "haskell" "foss")) - (setq org-gtd-organize-hooks nil) - (org-edna-mode) - (map! :leader - :desc "Capture" "X" #'org-gtd-capture - (:prefix-map ("d" . "GTD") - :desc "Capture" "c" #'org-gtd-capture - :desc "Engage" "e" #'org-gtd-engage - :desc "Engage Context" "@" #'org-gtd-engage-grouped-by-context - :desc "Process inbox" "p" #'org-gtd-process-inbox - :desc "Show all next" "n" #'org-gtd-show-all-next - :desc "Fix project" "f" #'org-gtd-projects-fix-todo-keywords-for-project-at-point - (:prefix-map ("r" . "Review") - :desc "Stuck projects" "p" #'org-gtd-review-stuck-projects - :desc "Stuck actions" "a" #'org-gtd-review-stuck-single-action-items - :desc "Stuck habits" "h" #'org-gtd-review-stuck-habit-items - ) - )) - (map! :map org-gtd-clarify-map - :desc "Organize this item" "C-c C-c" #'org-gtd-organize) - (map! (:prefix-map ("C-c d" . "GTD") - :desc "Capture" "c" #'org-gtd-capture - :desc "Engage" "e" #'org-gtd-engage - :desc "Engage Context" "@" #'org-gtd-engage-grouped-by-context - :desc "Process inbox" "p" #'org-gtd-process-inbox - :desc "Show all next" "n" #'org-gtd-show-all-next - :desc "Fix project" "f" #'org-gtd-projects-fix-todo-keywords-for-project-at-point - (:prefix-map ("r" . "Review") - :desc "Stuck projects" "p" #'org-gtd-review-stuck-projects - :desc "Stuck actions" "a" #'org-gtd-review-stuck-single-action-items - :desc "Stuck habits" "h" #'org-gtd-review-stuck-habit-items)))) - -(after! org-habit - (setq org-habit-show-habits t - org-habit-preceding-days 35 - org-habit-following-days 7)) - -(use-package! org-edna - :after org-gtd - :init - (setq org-edna-use-inheritance t) - :config - (org-edna-mode 1)) - -(use-package! nov - :mode ("\\.epub\\'" . nov-mode) - :config - (setq nov-save-place-file (concat doom-cache-dir "nov-places"))) - -(use-package! protobuf-mode - :mode ("\\.proto\\'" . protobuf-mode)) - -(use-package! systemd - :mode ("\\.\\(service\\|target\\|socket\\|timer\\)\\'" . systemd-mode)) - -(use-package! org-present - :after org) - -(use-package! denote - :after org - :config - (setq! denote-directory (concat org-directory "/notes")) - (map! :leader - (:prefix-map ("n" . "notes") - :desc "Denote" "d" #'denote-open-or-create-with-command - )) - :bind - (("C-c n d" . #'denote-open-or-create-with-command)) - ) - -(use-package! denote-org - :after denote) - -(use-package! denote-journal - :after denote) - -(use-package! denote-menu - :after denote) - -(use-package! denote-sequence - :after denote) - -(use-package! org-super-agenda - :after org-agenda - :init - (setq! org-agenda-skip-deadline-if-done t - org-agenda-skip-scheduled-if-done t - org-agenda-include-deadlines t - org-agenda-block-separator nil - org-agenda-compact-blocks t - org-agenda-start-day nil - org-agenda-span 1 - org-agenda-start-on-weekday nil) - - (setq! org-agenda-custom-commands - '(("a" "Getting Things done" - ((agenda "" ((org-agenda-overriding-header "") - (org-super-agenda-groups - '((:name "Today" - :time-grid t - :date today - :order 1))))) - (alltodo "" ((org-agenda-overriding-header "") - (org-super-agenda-groups - '(;(:log t) - (:name "Waiting for..." - :todo "WAIT" - :order 1) - (:discard (:not (:todo ("NEXT" "STRT")))) - (:name "Next actions" - :auto-parent (:todo ("NEXT" "STRT")) - :order 2 - ) - (:discard (:anything t) - :order 99) - )))) - )))) - :config - (org-super-agenda-mode) - ) - -(use-package! org-fc - :after org straight - :config - (setq! org-fc-directories (concat org-directory "/cards")) - (setq! org-fc-source-path (concat straight-base-dir "repos/org-fc")) - ) - -(after! vterm - (setq vterm-min-window-width 50) - ) - -(use-package! consult-denote - :after denote) - -(use-package! cov) - ;(use-package! casual-suite) - -(map! :desc "Move workspace to the left" :leader :n "TAB <" #'+workspace/swap-left) -(map! :desc "Move workspace to the left" :leader :n "TAB >" #'+workspace/swap-right) - -;; Here are some additional functions/macros that could help you configure Doom: -;; -;; - `load!' for loading external *.el files relative to this one -;; - `use-package!' for configuring packages -;; - `after!' for running code after a package has loaded -;; - `add-load-path!' for adding directories to the `load-path', relative to -;; this file. Emacs searches the `load-path' when you load packages with -;; `require' or `use-package'. -;; - `map!' for binding new keys -;; -;; To get information about any of these functions/macros, move the cursor over -;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k'). -;; This will open documentation for it, including demos of how they are used. -;; -;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how -;; they are implemented. diff --git a/home/alex/programs/emacs/doom/custom.el b/home/alex/programs/emacs/doom/custom.el deleted file mode 100644 index 731fe62..0000000 --- a/home/alex/programs/emacs/doom/custom.el +++ /dev/null @@ -1,51 +0,0 @@ -(custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(ansi-color-names-vector - ["#282c34" "#ff6c6b" "#98be65" "#ECBE7B" "#51afef" "#c678dd" "#46D9FF" "#bbc2cf"]) - '(custom-safe-themes - '("c4063322b5011829f7fdd7509979b5823e8eea2abf1fe5572ec4b7af1dd78519" "835868dcd17131ba8b9619d14c67c127aa18b90a82438c8613586331129dda63" "7eea50883f10e5c6ad6f81e153c640b3a288cd8dc1d26e4696f7d40f754cc703" default)) - '(exwm-floating-border-color "#191b20") - '(fci-rule-color "#5B6268") - '(highlight-tail-colors - ((("#333a38" "#99bb66" "green") - . 0) - (("#2b3d48" "#46D9FF" "brightcyan") - . 20))) - '(jdee-db-active-breakpoint-face-colors (cons "#1B2229" "#51afef")) - '(jdee-db-requested-breakpoint-face-colors (cons "#1B2229" "#98be65")) - '(jdee-db-spec-breakpoint-face-colors (cons "#1B2229" "#3f444a")) - '(objed-cursor-color "#ff6c6b") - '(pdf-view-midnight-colors (cons "#bbc2cf" "#282c34")) - '(rustic-ansi-faces - ["#282c34" "#ff6c6b" "#98be65" "#ECBE7B" "#51afef" "#c678dd" "#46D9FF" "#bbc2cf"]) - '(vc-annotate-background "#282c34") - '(vc-annotate-color-map - (list - (cons 20 "#98be65") - (cons 40 "#b4be6c") - (cons 60 "#d0be73") - (cons 80 "#ECBE7B") - (cons 100 "#e6ab6a") - (cons 120 "#e09859") - (cons 140 "#da8548") - (cons 160 "#d38079") - (cons 180 "#cc7cab") - (cons 200 "#c678dd") - (cons 220 "#d974b7") - (cons 240 "#ec7091") - (cons 260 "#ff6c6b") - (cons 280 "#cf6162") - (cons 300 "#9f585a") - (cons 320 "#6f4e52") - (cons 340 "#5B6268") - (cons 360 "#5B6268"))) - '(vc-annotate-very-old-color nil)) -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - ) diff --git a/home/alex/programs/emacs/doom/init.el b/home/alex/programs/emacs/doom/init.el deleted file mode 100644 index c76a1cf..0000000 --- a/home/alex/programs/emacs/doom/init.el +++ /dev/null @@ -1,194 +0,0 @@ -;;; init.el -*- lexical-binding: t; -*- - -;; This file controls what Doom modules are enabled and what order they load -;; in. Remember to run 'doom sync' after modifying it! - -;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's -;; documentation. There you'll find a "Module Index" link where you'll find -;; a comprehensive list of Doom's modules and what flags they support. - -;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or -;; 'C-c c k' for non-vim users) to view its documentation. This works on -;; flags as well (those symbols that start with a plus). -;; -;; Alternatively, press 'gd' (or 'C-c c d') on a module to browse its -;; directory (for easy access to its source code). - -(doom! :input - ;;chinese - ;;japanese - ;;layout ; auie,ctsrnm is the superior home row - - :completion - ;; company ; the ultimate code completion backend - ;;helm ; the *other* search engine for love and life - ;;ido ; the other *other* search engine... - ;;ivy ; a search engine for love and life - (vertico +orderless +icons) ; the search engine of the future - (corfu +orderless +icons +dabbrev) - - :ui - ;;deft ; notational velocity for Emacs - doom ; what makes DOOM look the way it does - doom-dashboard ; a nifty splash screen for Emacs - doom-quit ; DOOM quit-message prompts when you quit Emacs - (emoji +unicode +github +ascii) ; 🙂 - hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW - ;;hydra - ;;indent-guides ; highlighted indent columns - ;;(ligatures +extra) ; ligatures and symbols to make your code pretty again - ;;minimap ; show a map of the code on the side - modeline ; snazzy, Atom-inspired modeline, plus API - nav-flash ; blink cursor line after big motions - ;;neotree ; a project drawer, like NERDTree for vim - ophints ; highlight the region an operation acts on - (popup +defaults +all) ; tame sudden yet inevitable temporary windows - ;;tabs ; a tab bar for Emacs - ;;treemacs ; a project drawer, like neotree but cooler - unicode ; extended unicode support for various languages - (vc-gutter +diff-hl) ; vcs diff in the fringe - vi-tilde-fringe ; fringe tildes to mark beyond EOB - (window-select +numbers) ; visually switch windows - workspaces ; tab emulation, persistence & separate workspaces - zen ; distraction-free coding or writing - - :editor - (evil +everywhere); come to the dark side, we have cookies - file-templates ; auto-snippets for empty files - fold ; (nigh) universal code folding - (format +onsave) ; automated prettiness - ;;god ; run Emacs commands without modifier keys - ;; lispy ; vim for lisp, for people who don't like vim - multiple-cursors - ; editing in many places at once - ;;objed ; text object editing for the innocent - ;; parinfer ; turn lisp into python, sort of - rotate-text ; cycle region at point between text candidates - snippets ; my elves. They type so I don't have to - word-wrap ; soft wrapping with language-aware indent - - :emacs - (dired +ranger +icons) ; making dired pretty [functional] - electric ; smarter, keyword-based electric-indent - (ibuffer +icons) ; interactive buffer management - undo ; persistent, smarter undo for your inevitable mistakes - vc ; version-control and Emacs, sitting in a tree - - :term - eshell ; the elisp shell that works everywhere - ;;shell ; simple shell REPL for Emacs - ;;term ; basic terminal emulator for Emacs - vterm ; the best terminal emulation in Emacs - - :checkers - syntax ; tasing you for every semicolon you forget - (spell +flyspell +everywhere +aspell) ; tasing you for misspelling mispelling - ;;grammar ; tasing grammar mistake every you make - - :tools - ansible - biblio ; Writes a PhD for you (citation needed) - (debugger +lsp) ; FIXME stepping through code, to help you add bugs - direnv - (docker +lsp) - editorconfig ; let someone else argue about tabs vs spaces - ;;ein ; tame Jupyter notebooks with emacs - (eval +overlay) ; run code, run (also, repls) - ;;gist ; interacting with github gists - lookup ; navigate your code and its documentation - (lsp) ; M-x vscode - (magit +forge) ; a git porcelain for Emacs - make ; run make tasks from Emacs - pass ; password manager for nerds - pdf ; pdf enhancements - ;;prodigy ; FIXME managing external services & code builders - ;;rgb ; creating color strings - ;;taskrunner ; taskrunner for all your projects - tmux ; an API for interacting with tmux - tree-sitter - (terraform +lsp) ; infrastructure as code - ;;upload ; map local to remote projects via ssh/ftp - - :os - (:if IS-MAC macos) ; improve compatibility with macOS - (tty +osc) ; improve the terminal Emacs experience - - :lang - ;;agda ; types of types of types of types... - ;;beancount ; mind the GAAP - (cc +lsp +tree-sitter) ; C > C++ == 1 - ;;clojure ; java with a lisp - common-lisp ; if you've seen one lisp, you've seen them all - ;;coq ; proofs-as-programs - ;;crystal ; ruby at the speed of c - ;;csharp ; unity, .NET, and mono shenanigans - data ; config/data formats - ;;(dart +flutter) ; paint ui and not much else - ;;dhall - (elixir +lsp +tree-sitter) ; erlang done right - (elm +lsp +tree-sitter) ; care for a cup of TEA? - emacs-lisp ; drown in parentheses - (erlang +lsp +tree-sitter) ; an elegant language for a more civilized age - ;;ess ; emacs speaks statistics - ;;factor - ;;faust ; dsp, but you get to keep your soul - ;;fsharp ; ML stands for Microsoft's Language - ;;fstar ; (dependent) types and (monadic) effects and Z3 - ;;gdscript ; the language you waited for - (go +lsp +tree-sitter) ; the hipster dialect - (graphql +lsp) ; Give queries a REST - (haskell +lsp +tree-sitter) ; a language that's lazier than I am - ;;hy ; readability of scheme w/ speed of python - ;;idris ; a language you can depend on - (json +lsp +tree-sitter) ; At least it ain't XML - (java +lsp +tree-sitter) ; the poster child for carpal tunnel syndrome - javascript ; all(hope(abandon(ye(who(enter(here)))))) - ;;julia ; a better, faster MATLAB - (kotlin +lsp) ; a better, slicker Java(Script) - latex ; writing papers in Emacs has never been so fun - ;;lean ; for folks with too much to prove - ledger ; be audit you can be - (lua +lsp +tree-sitter) ; one-based indices? one-based indices - (markdown +grip) ; writing docs for people to ignore - ;;nim ; python + lisp at the speed of c - (nix +lsp +tree-sitter) ; I hereby declare "nix geht mehr!" - ;;ocaml ; an objective camel - (org +pandoc +present +gnuplot +noter) ; organize your plain life in plain text - ;;php ; perl's insecure younger brother - plantuml ; diagrams for confusing people more - (purescript +lsp) ; javascript, but functional - (python +lsp +tree-sitter +pyenv) ; beautiful is better than ugly - qt ; the 'cutest' gui framework ever - (racket +lsp +xp) ; a DSL for DSLs - ;;raku ; the artist formerly known as perl6 - (rest +jq) ; Emacs as a REST client - ;;rst ; ReST in peace - ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - (rust +lsp +tree-sitter) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() - ;;scala ; java, but good - ;;(scheme +guile) ; a fully conniving family of lisps - (sh +lsp +tree-sitter) ; she sells {ba,z,fi}sh shells on the C xor - ;;sml - ;;solidity ; do you need a blockchain? No. - ;;swift ; who asked for emoji variables? - ;;terra ; Earth and Moon in alignment for performance. - (web +lsp +tree-sitter) ; the tubes - (yaml +lsp +tree-sitter) ; JSON, but readable - (zig +lsp +tree-sitter) ; C, but simpler - - :email - (mu4e +org +gmail +mbsync) - ;; (notmuch +org +afew) - ;;(wanderlust +gmail) - - :app - calendar - ;;emms - ;;everywhere ; *leave* Emacs!? You must be joking - irc ; how neckbeards socialize - (rss +org) ; emacs as an RSS reader - ;;twitter ; twitter client https://twitter.com/vnought - - :config - ;;literate - (default +bindings +gnupg +smartparens)) diff --git a/home/alex/programs/emacs/doom/packages.el b/home/alex/programs/emacs/doom/packages.el deleted file mode 100644 index 3589576..0000000 --- a/home/alex/programs/emacs/doom/packages.el +++ /dev/null @@ -1,93 +0,0 @@ -;; -*- no-byte-compile: t; -*- -;;; $DOOMDIR/packages.el - -;; To install a package with Doom you must declare them here and run 'doom sync' -;; on the command line, then restart Emacs for the changes to take effect -- or -;; use 'M-x doom/reload'. - - -;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: -;;(package! some-package) - -;; To install a package directly from a remote git repo, you must specify a -;; `:recipe'. You'll find documentation on what `:recipe' accepts here: -;; https://github.com/raxod502/straight.el#the-recipe-format -;;(package! another-package -;; :recipe (:host github :repo "username/repo")) - -;; If the package you are trying to install does not contain a PACKAGENAME.el -;; file, or is located in a subdirectory of the repo, you'll need to specify -;; `:files' in the `:recipe': -;;(package! this-package -;; :recipe (:host github :repo "username/repo" -;; :files ("some-file.el" "src/lisp/*.el"))) - -;; If you'd like to disable a package included with Doom, you can do so here -;; with the `:disable' property: -;;(package! builtin-package :disable t) - -;; You can override the recipe of a built in package without having to specify -;; all the properties for `:recipe'. These will inherit the rest of its recipe -;; from Doom or MELPA/ELPA/Emacsmirror: -;;(package! builtin-package :recipe (:nonrecursive t)) -;;(package! builtin-package-2 :recipe (:repo "myfork/package")) - -;; Specify a `:branch' to install a package from a particular branch or tag. -;; This is required for some packages whose default branch isn't 'master' (which -;; our package manager can't deal with; see raxod502/straight.el#279) -;;(package! builtin-package :recipe (:branch "develop")) - -;; Use `:pin' to specify a particular commit to install. - ;(package! builtin-package :pin "1a2b3c4d5e") - - -;; Doom's packages are pinned to a specific commit and updated from release to -;; release. The `unpin!' macro allows you to unpin single packages... - ;(unpin! pinned-package) -;; ...or multiple packages - ;(unpin! pinned-package another-pinned-package) -;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) -;;(unpin! t) - -;;(package! this-package -;; :recipe (:host github :repo "username/repo" -;; :files ("some-file.el" "src/lisp/*.el"))) - -;;(unpin! compat) -;;(unpin! with-editor ghub) - -;;(package! transient :pin "25b994a565ce8035330b0a3071ee430c0282349e") ; 0.8.8 - -(package! ormolu) -(package! org-gtd - :recipe (:host github :repo "Trevoke/org-gtd.el" :branch "master")) -(package! org-fc - :recipe (:host sourcehut :repo "l3kn/org-fc" :branch "main")) -(package! org-edna) -(package! org-review - :recipe (:host github :repo "jakalx/org-review" :branch "master")) -(package! sqlite3) -(package! emacsql-sqlite3) -(package! nov) -(package! org-present) - -(package! denote) -(package! denote-org) -(package! denote-journal) -(package! denote-menu) -(package! denote-sequence) - -(package! org-super-agenda) -(package! org-modern) -(package! org-ql) -(package! org-contacts) -(package! org-bookmark-heading) -(package! activities - :recipe (:host github :repo "alphapapa/activities.el" :branch "master")) -;; (package! elfeed-web) -(package! systemd) -(package! protobuf-mode) -(package! cov) -(package! modus-themes) -(package! consult-denote) -(package! casual-suite) diff --git a/home/alex/programs/emacs/doom/snippets/org-mode/__ b/home/alex/programs/emacs/doom/snippets/org-mode/__ deleted file mode 100644 index f221edc..0000000 --- a/home/alex/programs/emacs/doom/snippets/org-mode/__ +++ /dev/null @@ -1,3 +0,0 @@ -# -*- mode: snippet -*- -# name: Org Template file -# -- diff --git a/home/alex/programs/fzf/default.nix b/home/alex/programs/fzf/default.nix deleted file mode 100644 index 92b7590..0000000 --- a/home/alex/programs/fzf/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - programs.fzf = { enable = true; }; -} diff --git a/home/alex/programs/git/default.nix b/home/alex/programs/git/default.nix deleted file mode 100644 index 070984a..0000000 --- a/home/alex/programs/git/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -{ - programs.git = { - enable = true; - lfs.enable = true; - ignores = [ - "*~" - "*.swp" - "result" - "dist-newstyle" - ".direnv" - "*.bak" - ".pre-commit-config.yaml" - ]; - signing = { - key = "41A6D13FECA21280"; - signByDefault = false; - }; - - settings = { - pull = { - rebase = true; - }; - merge = { - conflictstyle = "diff3"; - }; - submodule = { - recurse = true; - }; - user = { - # TODO create option for my own account meta data - email = "me@failco.de"; - name = "Alexander Kobjolke"; - }; - alias = { - a = "add"; - c = "commit"; - ca = "commit --amend"; - can = "commit --amend --no-edit"; - cl = "clone"; - cm = "commit -m"; - co = "checkout"; - cp = "cherry-pick"; - cpx = "cherry-pick -x"; - d = "diff"; - f = "fetch"; - fo = "fetch origin"; - fu = "fetch upstream"; - lol = "log --graph --decorate --pretty=oneline --abbrev-commit"; - lola = "log --graph --decorate --pretty=oneline --abbrev-commit --all"; - pl = "pull"; - pr = "pull -r"; - ps = "push"; - psf = "push -f"; - rb = "rebase"; - rbi = "rebase -i"; - r = "remote"; - ra = "remote add"; - rr = "remote rm"; - rv = "remote -v"; - rs = "remote show"; - st = "status"; - }; - - init.defaultBranch = "main"; - }; - }; - - programs.delta = { - enable = true; - enableGitIntegration = true; - }; - - programs.git-cliff = { - enable = true; - }; -} diff --git a/home/alex/programs/i3/default.nix b/home/alex/programs/i3/default.nix deleted file mode 100644 index e31b1cf..0000000 --- a/home/alex/programs/i3/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -{ - config.xsession.windowManager.i3 = { - enable = true; - config = { - modifier = "Mod4"; - }; - }; -} diff --git a/home/alex/programs/jitsi-meet/default.nix b/home/alex/programs/jitsi-meet/default.nix deleted file mode 100644 index 47927d7..0000000 --- a/home/alex/programs/jitsi-meet/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - config, - lib, - pkgs, - stable, - ... -}: - -{ - config.home.packages = [ stable.jitsi-meet-electron ]; -} diff --git a/home/alex/programs/jq/default.nix b/home/alex/programs/jq/default.nix deleted file mode 100644 index 2504774..0000000 --- a/home/alex/programs/jq/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -{ - programs.jq = { - enable = true; - }; -} diff --git a/home/alex/programs/jujutsu/default.nix b/home/alex/programs/jujutsu/default.nix deleted file mode 100644 index bcb67f6..0000000 --- a/home/alex/programs/jujutsu/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -{ - programs.jujutsu = { - enable = true; - settings = { - user.name = config.programs.git.settings.user.name; - user.email = config.programs.git.settings.user.email; - ui.default-command = "log"; - aliases.init = [ - "git" - "init" - ]; - }; - }; -} diff --git a/home/alex/programs/neovim/default.nix b/home/alex/programs/neovim/default.nix deleted file mode 100644 index e455b33..0000000 --- a/home/alex/programs/neovim/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - programs.neovim = { - enable = true; - vimAlias = true; - - extraConfig = '' - set nowrap - ''; - - plugins = with pkgs.vimPlugins; [ - vim-nix - - indentLine - indent-blankline-nvim - neoformat - ]; - }; -} diff --git a/home/alex/programs/rofi/default.nix b/home/alex/programs/rofi/default.nix deleted file mode 100644 index 7eb8fcf..0000000 --- a/home/alex/programs/rofi/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - config.programs.rofi = { - enable = true; - plugins = with pkgs; [ rofi-calc rofi-emoji ]; - terminal = "${pkgs.alacritty}/bin/alacritty"; - theme = ./themes/gruvbox-dark-soft.rasi; - pass = { - enable = true; - stores = [ config.programs.password-store.settings.PASSWORD_STORE_DIR ]; - extraConfig = '' - default_user=:filename - ''; - }; - }; - - # let rofi insert emojis directly - config.home.packages = [ pkgs.xdotool ]; -} diff --git a/home/alex/programs/rofi/themes/gruvbox-dark-soft.rasi b/home/alex/programs/rofi/themes/gruvbox-dark-soft.rasi deleted file mode 100644 index 597d883..0000000 --- a/home/alex/programs/rofi/themes/gruvbox-dark-soft.rasi +++ /dev/null @@ -1,191 +0,0 @@ -/* ========================================================================== - Rofi color theme - - Based on the Gruvbox color scheme for Vim by morhetz - https://github.com/morhetz/gruvbox - - File: gruvbox-dark-soft.rasi - Desc: Gruvbox dark (soft contrast) color theme for Rofi - Author: bardisty - Source: https://github.com/bardisty/gruvbox-rofi - Modified: Mon Feb 12 2018 06:04:37 PST -0800 - ========================================================================== */ - -* { - /* Theme settings */ - highlight: bold italic; - scrollbar: true; - - /* Gruvbox dark colors */ - gruvbox-dark-bg0-soft: #32302f; - gruvbox-dark-bg1: #3c3836; - gruvbox-dark-bg3: #665c54; - gruvbox-dark-fg0: #fbf1c7; - gruvbox-dark-fg1: #ebdbb2; - gruvbox-dark-red-dark: #cc241d; - gruvbox-dark-red-light: #fb4934; - gruvbox-dark-yellow-dark: #d79921; - gruvbox-dark-yellow-light: #fabd2f; - gruvbox-dark-gray: #a89984; - - /* Theme colors */ - background: @gruvbox-dark-bg0-soft; - background-color: @background; - foreground: @gruvbox-dark-fg1; - border-color: @gruvbox-dark-gray; - separatorcolor: @border-color; - scrollbar-handle: @border-color; - - normal-background: @background; - normal-foreground: @foreground; - alternate-normal-background: @gruvbox-dark-bg1; - alternate-normal-foreground: @foreground; - selected-normal-background: @gruvbox-dark-bg3; - selected-normal-foreground: @gruvbox-dark-fg0; - - active-background: @gruvbox-dark-yellow-dark; - active-foreground: @background; - alternate-active-background: @active-background; - alternate-active-foreground: @active-foreground; - selected-active-background: @gruvbox-dark-yellow-light; - selected-active-foreground: @active-foreground; - - urgent-background: @gruvbox-dark-red-dark; - urgent-foreground: @background; - alternate-urgent-background: @urgent-background; - alternate-urgent-foreground: @urgent-foreground; - selected-urgent-background: @gruvbox-dark-red-light; - selected-urgent-foreground: @urgent-foreground; -} - -/* ========================================================================== - File: gruvbox-common.rasi - Desc: Shared rules between all gruvbox themes - Author: bardisty - Source: https://github.com/bardisty/gruvbox-rofi - Modified: Mon Feb 12 2018 06:06:47 PST -0800 - ========================================================================== */ - -window { - background-color: @background; - border: 2; - padding: 2; -} - -mainbox { - border: 0; - padding: 0; -} - -message { - border: 2px 0 0; - border-color: @separatorcolor; - padding: 1px; -} - -textbox { - highlight: @highlight; - text-color: @foreground; -} - -listview { - border: 2px solid 0 0; - padding: 2px 0 0; - border-color: @separatorcolor; - spacing: 2px; - scrollbar: @scrollbar; -} - -element { - border: 0; - padding: 2px; -} - -element.normal.normal { - background-color: @normal-background; - text-color: @normal-foreground; -} - -element.normal.urgent { - background-color: @urgent-background; - text-color: @urgent-foreground; -} - -element.normal.active { - background-color: @active-background; - text-color: @active-foreground; -} - -element.selected.normal { - background-color: @selected-normal-background; - text-color: @selected-normal-foreground; -} - -element.selected.urgent { - background-color: @selected-urgent-background; - text-color: @selected-urgent-foreground; -} - -element.selected.active { - background-color: @selected-active-background; - text-color: @selected-active-foreground; -} - -element.alternate.normal { - background-color: @alternate-normal-background; - text-color: @alternate-normal-foreground; -} - -element.alternate.urgent { - background-color: @alternate-urgent-background; - text-color: @alternate-urgent-foreground; -} - -element.alternate.active { - background-color: @alternate-active-background; - text-color: @alternate-active-foreground; -} - -scrollbar { - width: 4px; - border: 0; - handle-color: @scrollbar-handle; - handle-width: 8px; - padding: 0; -} - -mode-switcher { - border: 2px 0 0; - border-color: @separatorcolor; -} - -inputbar { - spacing: 0; - text-color: @normal-foreground; - padding: 2px; - children: [ prompt, textbox-prompt-sep, entry, case-indicator ]; -} - -case-indicator, -entry, -prompt, -button { - spacing: 0; - text-color: @normal-foreground; -} - -button.selected { - background-color: @selected-normal-background; - text-color: @selected-normal-foreground; -} - -textbox-prompt-sep { - expand: false; - str: ":"; - text-color: @normal-foreground; - margin: 0 0.3em 0 0; -} -element-text, element-icon { - background-color: inherit; - text-color: inherit; -} diff --git a/home/alex/programs/shell/default.nix b/home/alex/programs/shell/default.nix deleted file mode 100644 index 48b25b9..0000000 --- a/home/alex/programs/shell/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -{ - home.shellAliases = { - suspend = "systemctl hibernate"; - nrs = "sudo nixos-rebuild switch --flake ~/src/nixos-config"; - nrb = "sudo nixos-rebuild build --flake ~/src/nixos-config"; - }; - - programs.zsh = { - enable = true; - enableCompletion = true; - autosuggestion.enable = true; - syntaxHighlighting.enable = true; - - initContent = '' - [ $TERM = "dumb" ] && unsetopt zle && PS1='$ ' - ''; - - oh-my-zsh = { - enable = true; - plugins = [ - "git" - "fzf" - "z" - ]; - theme = "simple"; - }; - }; -} diff --git a/home/alex/programs/simplex-chat/default.nix b/home/alex/programs/simplex-chat/default.nix deleted file mode 100644 index 9449318..0000000 --- a/home/alex/programs/simplex-chat/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - config.home.packages = [ pkgs.simplex-chat-desktop ]; -} diff --git a/home/alex/programs/xmonad/config.hs b/home/alex/programs/xmonad/config.hs deleted file mode 100644 index 8087dad..0000000 --- a/home/alex/programs/xmonad/config.hs +++ /dev/null @@ -1,157 +0,0 @@ -import XMonad -import XMonad.Actions.CycleWS qualified as WS -import XMonad.Actions.Navigation2D (navigation2DP, windowGo, windowSwap) -import XMonad.Hooks.EwmhDesktops -import XMonad.Hooks.ManageDocks qualified as Docks -import XMonad.Hooks.ManageHelpers (doCenterFloat, doFullFloat, isDialog, isFullscreen) -import XMonad.Hooks.SetWMName -import XMonad.Layout.BinarySpacePartition -import XMonad.Layout.BorderResize (borderResize) -import XMonad.Layout.NoBorders (smartBorders) -import XMonad.Layout.ThreeColumns -import XMonad.Layout.ToggleLayouts (ToggleLayout (..), toggleLayouts) -import XMonad.ManageHook (doFloat) -import XMonad.StackSet as W -import XMonad.Util.EZConfig qualified as EZ -import XMonad.Util.NamedScratchpad -import XMonad.Util.Ungrab (unGrab) -import XMonad.Util.WorkspaceCompare qualified as WS - -import Control.Monad (when) -import Numeric.Natural -import System.Environment (getArgs) -import System.FilePath (()) -import System.Info (arch, os) -import System.Posix.Process (executeFile) -import Text.Printf (printf) - -compiledConfig = printf "xmonad-%s-%s" arch os - -compileRestart resume = do - dirs <- asks directories - whenX (recompile dirs True) $ do - when resume writeStateToFile - catchIO - ( do - args <- getArgs - executeFile (cacheDir dirs compiledConfig) False args Nothing - ) - -myLayout = smartBorders . borderResize . Docks.avoidStruts $ toggleLayouts Full emptyBSP - -main :: IO () -main = getDirectories >>= launch myConfig - --- change size of window using direction so that it can be used together with the navigation2D function --- see: similar to windowGo and windowSwap -windowMoveSplit :: Direction2D -> Bool -> X () -windowMoveSplit direction _ = sendMessage $ MoveSplit direction - -data VolumeCommand - = ToggleVolume - | LowerVolume Natural - | RaiseVolume Natural - -interpretVolumeCommand :: VolumeCommand -> String -interpretVolumeCommand command = "amixer -q set Master " <> cmd - where - cmd = case command of - ToggleVolume -> "toggle" - LowerVolume delta -> show delta <> "%-" - RaiseVolume delta -> show delta <> "%+" - -changeVolume :: VolumeCommand -> X () -changeVolume = spawn . interpretVolumeCommand - -myWorkspaceFilter :: X WS.WorkspaceSort -myWorkspaceFilter = do - sortXineramaAware <- WS.getSortByXineramaRule - pure $ sortXineramaAware . WS.filterOutWs [scratchpadWorkspaceTag] - -scratchpads = - [ NS - "notes" - "emacsclient -c -F '((name . \"gtd\"))'" - (resource =? "gtd") - doCenterFloat - , -- (customFloating $ W.RationalRect (1/6) (1/6) (2/3) (2/3)) - NS - "shell" - "alacritty --class scratchpad" - (resource =? "scratchpad") - (customFloating $ W.RationalRect (1 / 6) (1 / 6) (2 / 3) (2 / 3)) - ] - -myConfig = - addEwmhWorkspaceSort myWorkspaceFilter - . ewmhFullscreen - . ewmh - . Docks.docks - . nav - $ def - { modMask = mod4Mask -- Use Super instead of Alt - , terminal = "alacritty" - , layoutHook = myLayout - , handleEventHook = handleEventHook def <+> fullscreenEventHook - , -- this seems to be necessary to make java gui applications work :( - startupHook = ewmhDesktopsStartup >> setWMName "LG3D" - , manageHook = - mconcat - [ namedScratchpadManageHook scratchpads - , isDialog --> doFloat - , isFullscreen --> doFullFloat - , className =? "steam_proton" --> doFloat - , manageHook def - ] - } - `EZ.additionalKeysP` [ ("M-S-z", spawn "xscreensaver-command -lock") - , ("M-S-r", compileRestart True) - , ("M-S-q", restart "xmonad" True) - , ("M-C-s", unGrab *> spawn "scrot -s") - , ("M-S-s", sendMessage Docks.ToggleStruts) - , ("M-f", sendMessage (Toggle "Full")) - , ("M-p", spawn appLauncher) - , ("M-i", spawn passLauncher) - , ("M-w", kill) - , ("M-l", WS.toggleWS) - , ("M-g", WS.prevWS) - , ("M-C-g", WS.swapPrevScreen) - , ("M-S-g", WS.shiftPrevScreen) - , ("M-r", WS.nextWS) - , ("M-C-r", WS.swapNextScreen) - , ("M-S-r", WS.shiftNextScreen) - , -- scratchpads - ("M-s M-t", namedScratchpadAction scratchpads "shell") - , ("M-s M-s", namedScratchpadAction scratchpads "notes") - , -- backlight control - ("", spawn "xbacklight -dec 5") - , ("", spawn "xbacklight -inc 5") - , ("", spawn "xbacklight -dec 5") - , ("", spawn "xbacklight -inc 5") - , -- transparency - ("S-", spawn "picom-trans -c -5") - , ("S-", spawn "picom-trans -c +5") - , ("M-S-d", spawn "picom-trans -c +5") - , ("M-S-b", spawn "picom-trans -c -5") - , -- volume control - ("", changeVolume ToggleVolume) - , ("", changeVolume $ LowerVolume 5) - , ("", changeVolume $ RaiseVolume 5) - , ("M-d", changeVolume $ RaiseVolume 5) - , ("M-b", changeVolume $ LowerVolume 5) - , ("M-a", sendMessage Balance) - , ("M-S-a", sendMessage Equalize) - , ("M-o", sendMessage Rotate) - , ("M-y", withFocused $ windows . W.sink) - ] - where - -- navigate using dvorak bindings - nav = navigation2DP def ("c", "h", "t", "n") [("M-", windowGo), ("M-C-", windowSwap), ("M-S-", windowMoveSplit)] True - appLauncher = "rofi -show combi -modes combi -combi-modes window,drun,run,ssh" - passLauncher = "rofi-pass" - --- myManageHook :: ManageHook --- myManageHook = composeAll --- [ className =? "Gimp" --> doFloat --- , isDialog --> doFloat --- ] diff --git a/home/alex/programs/xmonad/default.nix b/home/alex/programs/xmonad/default.nix deleted file mode 100644 index 9256cb8..0000000 --- a/home/alex/programs/xmonad/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -{ - config.xsession.windowManager.xmonad = { - enable = true; - enableContribAndExtras = true; - config = ./config.hs; - }; - - # control backlight - config.home.packages = [ - pkgs.xorg.xbacklight - pkgs.scrot - ]; -} diff --git a/home/alex/programs/zathura/default.nix b/home/alex/programs/zathura/default.nix deleted file mode 100644 index 783ba82..0000000 --- a/home/alex/programs/zathura/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - config.programs.zathura = { - enable = true; - extraConfig = builtins.readFile ./gruvbox-dark.zathurarc; - }; -} diff --git a/home/alex/programs/zathura/gruvbox-dark.zathurarc b/home/alex/programs/zathura/gruvbox-dark.zathurarc deleted file mode 100644 index 8e91fe6..0000000 --- a/home/alex/programs/zathura/gruvbox-dark.zathurarc +++ /dev/null @@ -1,40 +0,0 @@ -set notification-error-bg "#282828" # bg -set notification-error-fg "#fb4934" # bright:red -set notification-warning-bg "#282828" # bg -set notification-warning-fg "#fabd2f" # bright:yellow -set notification-bg "#282828" # bg -set notification-fg "#b8bb26" # bright:green - -set completion-bg "#504945" # bg2 -set completion-fg "#ebdbb2" # fg -set completion-group-bg "#3c3836" # bg1 -set completion-group-fg "#928374" # gray -set completion-highlight-bg "#83a598" # bright:blue -set completion-highlight-fg "#504945" # bg2 - -# Define the color in index mode -set index-bg "#504945" # bg2 -set index-fg "#ebdbb2" # fg -set index-active-bg "#83a598" # bright:blue -set index-active-fg "#504945" # bg2 - -set inputbar-bg "#282828" # bg -set inputbar-fg "#ebdbb2" # fg - -set statusbar-bg "#504945" # bg2 -set statusbar-fg "#ebdbb2" # fg - -set highlight-color "#fabd2f" # bright:yellow -set highlight-active-color "#fe8019" # bright:orange - -set default-bg "#282828" # bg -set default-fg "#ebdbb2" # fg -set render-loading true -set render-loading-bg "#282828" # bg -set render-loading-fg "#ebdbb2" # fg - -# Recolor book content's color -set recolor-lightcolor "#282828" # bg -set recolor-darkcolor "#ebdbb2" # fg -set recolor "true" -# set recolor-keephue true # keep original color diff --git a/home/alex/services/blueman-applet/default.nix b/home/alex/services/blueman-applet/default.nix deleted file mode 100644 index 649ac05..0000000 --- a/home/alex/services/blueman-applet/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - config.services.blueman-applet = { enable = true; }; -} diff --git a/home/alex/services/dunst/default.nix b/home/alex/services/dunst/default.nix deleted file mode 100644 index 70d796a..0000000 --- a/home/alex/services/dunst/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -{ - config.services.dunst = { - enable = true; - iconTheme = { - name = "Adwaita"; - package = pkgs.adwaita-icon-theme; - size = "16x16"; - }; - settings = { - global = { - monitor = 0; - geometry = "600x50-50+65"; - shrink = "yes"; - transparency = 10; - padding = 16; - horizontal_padding = 16; - font = "JetBrainsMono Nerd Font 10"; - line_height = 4; - format = "%s\\n%b"; - }; - }; - }; -} diff --git a/home/alex/services/git-sync/default.nix b/home/alex/services/git-sync/default.nix deleted file mode 100644 index d8c2419..0000000 --- a/home/alex/services/git-sync/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, lib, pkgs, ... }: -let cfg = config.my.git-sync; -in { - options.my.git-sync = { enable = lib.mkEnableOption "git-sync"; }; - - config.services.git-sync = lib.mkIf cfg.enable { - enable = true; - repositories = { - "org" = { - path = "${config.home.homeDirectory}/org"; - uri = "git+ssh://git@git.failco.de:jakalx/org.git"; - }; - }; - }; -} diff --git a/home/alex/services/network-manager/default.nix b/home/alex/services/network-manager/default.nix deleted file mode 100644 index 8394925..0000000 --- a/home/alex/services/network-manager/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - config.services.network-manager-applet = { enable = true; }; -} diff --git a/home/alex/services/picom/default.nix b/home/alex/services/picom/default.nix deleted file mode 100644 index 047a0af..0000000 --- a/home/alex/services/picom/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - config.services.picom = { - enable = true; - activeOpacity = 1.0; - inactiveOpacity = 0.8; - backend = "glx"; - fade = true; - fadeDelta = 5; - opacityRules = [ "100:name *= 'i3lock'" ]; - shadow = true; - shadowOpacity = 0.75; - }; -} diff --git a/home/alex/services/polybar/config.ini b/home/alex/services/polybar/config.ini deleted file mode 100644 index 112a45f..0000000 --- a/home/alex/services/polybar/config.ini +++ /dev/null @@ -1,235 +0,0 @@ -;========================================================== -; -; -; ██████╗ ██████╗ ██╗ ██╗ ██╗██████╗ █████╗ ██████╗ -; ██╔══██╗██╔═══██╗██║ ╚██╗ ██╔╝██╔══██╗██╔══██╗██╔══██╗ -; ██████╔╝██║ ██║██║ ╚████╔╝ ██████╔╝███████║██████╔╝ -; ██╔═══╝ ██║ ██║██║ ╚██╔╝ ██╔══██╗██╔══██║██╔══██╗ -; ██║ ╚██████╔╝███████╗██║ ██████╔╝██║ ██║██║ ██║ -; ╚═╝ ╚═════╝ ╚══════╝╚═╝ ╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═╝ -; -; -; To learn more about how to configure Polybar -; go to https://github.com/polybar/polybar -; -; The README contains a lot of information -; -;========================================================== - -[colors] -background = #282A2E -background-alt = #373B41 -foreground = #C5C8C6 -primary = #F0C674 -secondary = #8ABEB7 -alert = #A54242 -disabled = #707880 - -[bar/main] -width = 100% -height = 24pt -radius = 6 - -; dpi = 96 - -background = ${colors.background} -foreground = ${colors.foreground} - -line-size = 3pt - -border-size = 4pt -border-color = #00000000 - -padding-left = 0 -padding-right = 1 - -module-margin = 1 - -separator = | -separator-foreground = ${colors.disabled} - -font-0 = monospace;2 - -modules-left = xworkspaces xwindow -modules-center = systray -modules-right = filesystem pulseaudio xkeyboard memory cpu battery wlan eth backlight date - -cursor-click = pointer -cursor-scroll = ns-resize - -enable-ipc = true - -tray-position = center - -; wm-restack = generic -; wm-restack = bspwm -; wm-restack = i3 - -; override-redirect = true - -[module/systray] -type = internal/tray - -format-margin = 8pt -tray-spacing = 16pt - -[module/battery] -type = internal/battery - -; This is useful in case the battery never reports 100% charge -; Default: 100 -full-at = 99 - -; format-low once this charge percentage is reached -; Default: 10 -; New in version 3.6.0 -low-at = 10 - -; Use the following command to list batteries and adapters: -; $ ls -1 /sys/class/power_supply/ -battery = BAT0 -adapter = ADP0 - -; If an inotify event haven't been reported in this many -; seconds, manually poll for new values. -; -; Needed as a fallback for systems that don't report events -; on sysfs/procfs. -; -; Disable polling by setting the interval to 0. -; -; Default: 5 -poll-interval = 5 - -[module/backlight] -type = internal/xbacklight - -; XRandR output to get get values from -; Default: the monitor defined for the running bar -;output = DP-4 - -; Create scroll handlers used to set the backlight value -; Default: true -enable-scroll = true - -; Available tags: -;