Compare commits
No commits in common. "5cffc8c06cdca81150ec553969480cf51c1dc32c" and "badc4ffa499c01e9db76b0217958733ea260e370" have entirely different histories.
5cffc8c06c
...
badc4ffa49
14 changed files with 196 additions and 289 deletions
176
flake.lock
176
flake.lock
|
@ -69,11 +69,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681335578,
|
"lastModified": 1680646146,
|
||||||
"narHash": "sha256-yIZqE6WpkgAllsJ7IAbn8k6IRz/0CS/xp6IR+8yrEP8=",
|
"narHash": "sha256-NH+EhLFYDwLQ01BqfTwGvZAjfmZynnP1xxPjqH0XJss=",
|
||||||
"owner": "zhaofengli",
|
"owner": "zhaofengli",
|
||||||
"repo": "attic",
|
"repo": "attic",
|
||||||
"rev": "171c89fbe0f099e8bf6e466a1a1a12578f703f0e",
|
"rev": "efa15b9788add910f6e8409dddfb7bb69c2ad201",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -82,22 +82,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"bufferline-nvim": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681547098,
|
|
||||||
"narHash": "sha256-WZAJiDm77rS9S4tN7dz03jjnv1jFvTur6dLg8OkYVM4=",
|
|
||||||
"owner": "akinsho",
|
|
||||||
"repo": "bufferline.nvim",
|
|
||||||
"rev": "243893ba9d5d1049dd451a25cab32ec7f8f67bcf",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "akinsho",
|
|
||||||
"repo": "bufferline.nvim",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"comment-box-nvim": {
|
"comment-box-nvim": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
@ -117,11 +101,11 @@
|
||||||
"copilot-lua": {
|
"copilot-lua": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681223911,
|
"lastModified": 1680027228,
|
||||||
"narHash": "sha256-ttF9LW6PNKk/BBWET2BUqtq5f7OIZ7ohtQevAaP8srg=",
|
"narHash": "sha256-3u+2azMRm24mp5iOrxwYg9QrM2xJHnSjGsldIDRS6HQ=",
|
||||||
"owner": "zbirenbaum",
|
"owner": "zbirenbaum",
|
||||||
"repo": "copilot.lua",
|
"repo": "copilot.lua",
|
||||||
"rev": "a4a37dda9e48986e5d2a90d6a3cbc88fca241dbb",
|
"rev": "f0b41fb89ef2ed7ab4e8cd5208a30755aa638fc4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -214,32 +198,16 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-compat_3": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1673956053,
|
|
||||||
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681202837,
|
"lastModified": 1681037374,
|
||||||
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
"narHash": "sha256-XL6X3VGbEFJZDUouv2xpKg2Aljzu/etPLv5e1FPt1q0=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
|
"rev": "033b9f258ca96a10e543d4442071f614dc3f8412",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -319,14 +287,17 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"utils": [
|
||||||
|
"flake-utils"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681586243,
|
"lastModified": 1680667162,
|
||||||
"narHash": "sha256-vdP79IZuDZVNSl4RN1LgEuab1Tkbv4gCxiE8VLdRf7U=",
|
"narHash": "sha256-2vgxK4j42y73S3XB2cThz1dSEyK9J9tfu4mhuEfAw68=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "40ebb62101c83de81e5fd7c3cfe5cea2ed21b1ad",
|
"rev": "440faf5ae472657ef2d8cc7756d77b6ab0ace68d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -361,11 +332,11 @@
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681652918,
|
"lastModified": 1681066980,
|
||||||
"narHash": "sha256-ybXmD3OhyMG1Yz31lxT8de7aBi2mQmXmzAZ7q49Uvi4=",
|
"narHash": "sha256-68e+4txZITxbHP9IPYfLm36kOoI+rkMjRCbrPgtdQK8=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "Hyprland",
|
"repo": "Hyprland",
|
||||||
"rev": "b05ff89c76b2c9454c76daf2120f4ccb076a018d",
|
"rev": "f3909cf2bfdd72aff69112f18c920ac6c9ca28f1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -400,11 +371,11 @@
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681650457,
|
"lastModified": 1681080114,
|
||||||
"narHash": "sha256-IGXRZrFGFqUeM5iDgP/ojbrd+gKL40PaFFAITxbkfZ0=",
|
"narHash": "sha256-rAKfgQJQRsw4QMOXdxfHIh/d5LPY6HHKBX1KtaPs2No=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprpaper",
|
"repo": "hyprpaper",
|
||||||
"rev": "3bfaac09f58ce31c33e1a56e7eaa606a87fe4c32",
|
"rev": "4bcedde1dc1a06107ec32c93a937de30f40aa1fc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -416,11 +387,11 @@
|
||||||
"lspsaga-nvim": {
|
"lspsaga-nvim": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681470671,
|
"lastModified": 1681041449,
|
||||||
"narHash": "sha256-mekeKttJSsBpTxMShC0l29/Wx3VKUnHMh6YtLYtx9Lk=",
|
"narHash": "sha256-ARbFiwfWsYapFH5p7xSCCe25RFUlUI/h8Jv81XHLBx4=",
|
||||||
"owner": "glepnir",
|
"owner": "glepnir",
|
||||||
"repo": "lspsaga.nvim",
|
"repo": "lspsaga.nvim",
|
||||||
"rev": "b2feb95e84776f7c9cdfb96e4c89a582c9ade0e4",
|
"rev": "1fbb3e4721354d0d0a20a28bb77b3f83fe68538b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -431,11 +402,11 @@
|
||||||
},
|
},
|
||||||
"master": {
|
"master": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681658302,
|
"lastModified": 1681080342,
|
||||||
"narHash": "sha256-KDXpkA7JOTnffQWAA5W246FoJNbdSur5HgzYScOzYKQ=",
|
"narHash": "sha256-7GvJEuGANq9/zk549rf5zoeTyFdsw5irvVLf5crpBnE=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "f30febf83039aaa4a4399d46d068900a2b449de6",
|
"rev": "340acec509d71d0d0decd7a82e7cb52ae4c76065",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -444,47 +415,25 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"neovim-flake": {
|
"neovim": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_2",
|
"flake-utils": "flake-utils_2",
|
||||||
"nixpkgs": [
|
|
||||||
"neovim-nightly-overlay",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"dir": "contrib",
|
|
||||||
"lastModified": 1681631972,
|
|
||||||
"narHash": "sha256-zF+sWaQPJpoDyhWXvwJGR7VryYr9+qBCWMTNRjA3BhQ=",
|
|
||||||
"owner": "neovim",
|
|
||||||
"repo": "neovim",
|
|
||||||
"rev": "0d9b0fbe579343fa6d6c46e6e1bf6bb8719ea5e0",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"dir": "contrib",
|
|
||||||
"owner": "neovim",
|
|
||||||
"repo": "neovim",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"neovim-nightly-overlay": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-compat": "flake-compat_2",
|
|
||||||
"neovim-flake": "neovim-flake",
|
|
||||||
"nixpkgs": "nixpkgs_4"
|
"nixpkgs": "nixpkgs_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681632748,
|
"dir": "contrib",
|
||||||
"narHash": "sha256-c0CskvdpipnTn5TSjq6KqNkeKRPYCDMmVTdZL08HTJA=",
|
"lastModified": 1680264322,
|
||||||
"owner": "nix-community",
|
"narHash": "sha256-nv1lSK+y/vv6ASMhNFoJE1YcNisJmQ0A+anNLzscvKk=",
|
||||||
"repo": "neovim-nightly-overlay",
|
"owner": "neovim",
|
||||||
"rev": "0e3e0029aa6353ecb7304d4a683d8d6ee69379ef",
|
"repo": "neovim",
|
||||||
|
"rev": "83bfd94d1df5eecb8e4069a227c7d24598636d63",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"dir": "contrib",
|
||||||
"repo": "neovim-nightly-overlay",
|
"owner": "neovim",
|
||||||
|
"repo": "neovim",
|
||||||
|
"rev": "83bfd94d1df5eecb8e4069a227c7d24598636d63",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -499,11 +448,11 @@
|
||||||
"rust-overlay": "rust-overlay_2"
|
"rust-overlay": "rust-overlay_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681412802,
|
"lastModified": 1680544266,
|
||||||
"narHash": "sha256-IcEala6vFQ7SFNOPCeXBh9Jbl8nL2QOtLmO7RbDsBbo=",
|
"narHash": "sha256-d/TusDXmIo8IT5DNRA21lN+nOVSER8atIx9TJteR6LQ=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "nil",
|
"repo": "nil",
|
||||||
"rev": "1d5bc81023c21b22cfbea06a8b4b82963c01b941",
|
"rev": "56a1fa87b98a9508920f4b0ab8fe36d5b54b2362",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -578,27 +527,27 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681571934,
|
"lastModified": 1671983799,
|
||||||
"narHash": "sha256-Q3B3HTqhTahhPCT53ahK1FPktOXlEWmudSttd9CWGbE=",
|
"narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "29176972b4be60f7d3eb3101f696c99f2e6ada57",
|
"rev": "fad51abd42ca17a60fc1d4cb9382e2d79ae31836",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixpkgs-unstable",
|
"ref": "nixos-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681633309,
|
"lastModified": 1681028957,
|
||||||
"narHash": "sha256-HvEzKU/ZWGyIt2G+AIEKmMt/ED3P+Tgjw3/BkArti0o=",
|
"narHash": "sha256-gKWkKT/nFg2d9HZyK7VAjRzkyPfKLx+uIGyWXDw0NB0=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "cb578ff7040066fd1b3f6f087bca796ddbf598b5",
|
"rev": "11c129c16f4051ad215ea7b0d297a6c7cf5d24d7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -610,11 +559,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_6": {
|
"nixpkgs_6": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681303793,
|
"lastModified": 1678898370,
|
||||||
"narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=",
|
"narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc",
|
"rev": "ac718d02867a84b42522a0ece52d841188208f2c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -642,18 +591,18 @@
|
||||||
},
|
},
|
||||||
"pre-commit-hooks": {
|
"pre-commit-hooks": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat_3",
|
"flake-compat": "flake-compat_2",
|
||||||
"flake-utils": "flake-utils_3",
|
"flake-utils": "flake-utils_3",
|
||||||
"gitignore": "gitignore",
|
"gitignore": "gitignore",
|
||||||
"nixpkgs": "nixpkgs_6",
|
"nixpkgs": "nixpkgs_6",
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681413034,
|
"lastModified": 1680981441,
|
||||||
"narHash": "sha256-/t7OjNQcNkeWeSq/CFLYVBfm+IEnkjoSm9iKvArnUUI=",
|
"narHash": "sha256-Tqr2mCVssUVp1ZXXMpgYs9+ZonaWrZGPGltJz94FYi4=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "pre-commit-hooks.nix",
|
"repo": "pre-commit-hooks.nix",
|
||||||
"rev": "d3de8f69ca88fb6f8b09e5b598be5ac98d28ede5",
|
"rev": "2144d9ddcb550d6dce64a2b44facdc8c5ea2e28a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -668,7 +617,6 @@
|
||||||
"arkenfox-userjs": "arkenfox-userjs",
|
"arkenfox-userjs": "arkenfox-userjs",
|
||||||
"asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver",
|
"asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver",
|
||||||
"attic": "attic",
|
"attic": "attic",
|
||||||
"bufferline-nvim": "bufferline-nvim",
|
|
||||||
"comment-box-nvim": "comment-box-nvim",
|
"comment-box-nvim": "comment-box-nvim",
|
||||||
"copilot-lua": "copilot-lua",
|
"copilot-lua": "copilot-lua",
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
|
@ -679,7 +627,7 @@
|
||||||
"hyprpaper": "hyprpaper",
|
"hyprpaper": "hyprpaper",
|
||||||
"lspsaga-nvim": "lspsaga-nvim",
|
"lspsaga-nvim": "lspsaga-nvim",
|
||||||
"master": "master",
|
"master": "master",
|
||||||
"neovim-nightly-overlay": "neovim-nightly-overlay",
|
"neovim": "neovim",
|
||||||
"nil": "nil",
|
"nil": "nil",
|
||||||
"nixpkgs": "nixpkgs_5",
|
"nixpkgs": "nixpkgs_5",
|
||||||
"nvim-treesitter-textsubjects": "nvim-treesitter-textsubjects",
|
"nvim-treesitter-textsubjects": "nvim-treesitter-textsubjects",
|
||||||
|
@ -759,11 +707,11 @@
|
||||||
},
|
},
|
||||||
"stable": {
|
"stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681482634,
|
"lastModified": 1680865339,
|
||||||
"narHash": "sha256-cT/nr3L8khEYZSGp8qqwxFH+/q4/547MfyOdSj6MhBk=",
|
"narHash": "sha256-H6rmJ1CyJ3Q5ZyoLMYq/UEYMS9Q1orJjRpWiQ47HudE=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "fda0d99c2cbbb5c89d8855d258cb0821bd9113ad",
|
"rev": "0040164e473509b4aee6aedb3b923e400d6df10b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -838,11 +786,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681127512,
|
"lastModified": 1681066882,
|
||||||
"narHash": "sha256-vklOOhBj5W8fii6yN4L2WY5ZeifBmsq3+mJ2wC1Pk9U=",
|
"narHash": "sha256-8szxuwDOQcYyS8TZokGpIJYzaTwBQ9pmmcCkeuX2YV8=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "xdg-desktop-portal-hyprland",
|
"repo": "xdg-desktop-portal-hyprland",
|
||||||
"rev": "04f579377a32781ce57c9cf4ba2a5bcb7f53fa97",
|
"rev": "e48165c5637260cf2a88494a112269922dee58de",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
10
flake.nix
10
flake.nix
|
@ -25,6 +25,7 @@
|
||||||
attic.url = "github:zhaofengli/attic";
|
attic.url = "github:zhaofengli/attic";
|
||||||
|
|
||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
home-manager.inputs.utils.follows = "flake-utils";
|
||||||
home-manager.url = "github:nix-community/home-manager";
|
home-manager.url = "github:nix-community/home-manager";
|
||||||
|
|
||||||
nil.inputs.flake-utils.follows = "flake-utils";
|
nil.inputs.flake-utils.follows = "flake-utils";
|
||||||
|
@ -34,10 +35,7 @@
|
||||||
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
|
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
|
||||||
|
|
||||||
# Neovim
|
# Neovim
|
||||||
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
|
neovim.url = "github:neovim/neovim/83bfd94d1df5eecb8e4069a227c7d24598636d63?dir=contrib"; # HACK to fix neovim not building at the moment
|
||||||
|
|
||||||
bufferline-nvim.flake = false;
|
|
||||||
bufferline-nvim.url = "github:akinsho/bufferline.nvim";
|
|
||||||
|
|
||||||
comment-box-nvim.flake = false;
|
comment-box-nvim.flake = false;
|
||||||
comment-box-nvim.url = "github:LudoPinelli/comment-box.nvim";
|
comment-box-nvim.url = "github:LudoPinelli/comment-box.nvim";
|
||||||
|
@ -101,7 +99,6 @@
|
||||||
channels.nixpkgs.overlaysBuilder = _: [
|
channels.nixpkgs.overlaysBuilder = _: [
|
||||||
inputs.hypr-contrib.overlays.default
|
inputs.hypr-contrib.overlays.default
|
||||||
inputs.hyprland.overlays.default
|
inputs.hyprland.overlays.default
|
||||||
inputs.neovim-nightly-overlay.overlay
|
|
||||||
inputs.utils.overlay
|
inputs.utils.overlay
|
||||||
self.overlay
|
self.overlay
|
||||||
];
|
];
|
||||||
|
@ -121,7 +118,6 @@
|
||||||
./modules/profiles/base.nix
|
./modules/profiles/base.nix
|
||||||
./modules/profiles/gaming.nix
|
./modules/profiles/gaming.nix
|
||||||
./modules/profiles/desktop.nix
|
./modules/profiles/desktop.nix
|
||||||
./modules/profiles/personal.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
hostDefaults.modules = [
|
hostDefaults.modules = [
|
||||||
|
@ -143,7 +139,6 @@
|
||||||
./hosts/nixos-laptop
|
./hosts/nixos-laptop
|
||||||
self.nixosModules.desktop
|
self.nixosModules.desktop
|
||||||
self.nixosModules.gaming
|
self.nixosModules.gaming
|
||||||
self.nixosModules.personal
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
|
@ -151,7 +146,6 @@
|
||||||
./hosts/nixos-desktop
|
./hosts/nixos-desktop
|
||||||
self.nixosModules.desktop
|
self.nixosModules.desktop
|
||||||
self.nixosModules.gaming
|
self.nixosModules.gaming
|
||||||
self.nixosModules.personal
|
|
||||||
];
|
];
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -10,11 +10,8 @@
|
||||||
# Include the results of the hardware scan.
|
# Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
];
|
];
|
||||||
my = {
|
|
||||||
programs.hyprland.nvidiaSupport = true;
|
my.programs.hyprland.nvidiaSupport = true;
|
||||||
services.mullvad.enable = true;
|
|
||||||
programs.ledger.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# KERNEL
|
# KERNEL
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
|
|
@ -5,56 +5,135 @@
|
||||||
with lib; {
|
with lib; {
|
||||||
my = {
|
my = {
|
||||||
yubikey = {
|
yubikey = {
|
||||||
enable = mkDefault true;
|
enable = true;
|
||||||
luksSupport = {
|
luksSupport = {
|
||||||
enable = mkDefault true;
|
enable = true;
|
||||||
devices = mkDefault [ "enc" ];
|
devices = [ "enc" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
wallpapers.enable = mkDefault true;
|
wallpapers.enable = true;
|
||||||
theming = {
|
theming = {
|
||||||
enable = mkDefault true;
|
enable = true;
|
||||||
scheme = mkDefault "catppuccin-macchiato";
|
scheme = "catppuccin-macchiato";
|
||||||
|
};
|
||||||
|
virtualisation = {
|
||||||
|
podman.enable = true;
|
||||||
|
libvirtd.enable = true;
|
||||||
};
|
};
|
||||||
virtualisation.podman.enable = mkDefault true;
|
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
chromium.enable = mkDefault true;
|
adb.enable = true;
|
||||||
firefox.enable = mkDefault true;
|
hyprland.enable = true;
|
||||||
gpg.enable = mkDefault true;
|
code.enable = true;
|
||||||
hyprland.enable = mkDefault true;
|
firefox = {
|
||||||
logseq.enable = mkDefault true;
|
enable = true;
|
||||||
nvim.enable = mkDefault true;
|
arkenfox = {
|
||||||
python.versions."311".enable = mkDefault true;
|
enable = true;
|
||||||
spotify.enable = mkDefault true;
|
overrides = {
|
||||||
ssh.enable = mkDefault true;
|
## arkenfox overrides
|
||||||
thunar.enable = mkDefault true;
|
# automatic search
|
||||||
zathura.enable = mkDefault true;
|
"keyword.enabled" = true;
|
||||||
|
"browser.search.suggest.enabled" = true;
|
||||||
|
"browser.urlbar.suggest.searches" = true;
|
||||||
|
|
||||||
|
# startup page
|
||||||
|
"browser.startup.homepage" = "https://searxng.moritzboeh.me/";
|
||||||
|
"browser.startup.page" = 1;
|
||||||
|
|
||||||
|
# drm
|
||||||
|
"media.eme.enabled" = true;
|
||||||
|
|
||||||
|
# sanitisation
|
||||||
|
"privacy.clearOnShutdown.history" = false;
|
||||||
|
|
||||||
|
# disable letterboxing
|
||||||
|
"privacy.resistFingerprinting.letterboxing" = false;
|
||||||
|
|
||||||
|
## OTHER
|
||||||
|
# Dont show warning when accessing about:config
|
||||||
|
"browser.aboutConfig.showWarning" = false;
|
||||||
|
|
||||||
|
# Hide bookmarks
|
||||||
|
"browser.toolbars.bookmarks.visibility" = "never";
|
||||||
|
|
||||||
|
# Smooth scrolling
|
||||||
|
"general.smoothScroll.lines.durationMaxMS" = 125;
|
||||||
|
"general.smoothScroll.lines.durationMinMS" = 125;
|
||||||
|
"general.smoothScroll.mouseWheel.durationMaxMS" = 200;
|
||||||
|
"general.smoothScroll.mouseWheel.durationMinMS" = 100;
|
||||||
|
"general.smoothScroll.msdPhysics.enabled" = true;
|
||||||
|
"general.smoothScroll.other.durationMaxMS" = 125;
|
||||||
|
"general.smoothScroll.other.durationMinMS" = 125;
|
||||||
|
"general.smoothScroll.pages.durationMaxMS" = 125;
|
||||||
|
"general.smoothScroll.pages.durationMinMS" = 125;
|
||||||
|
"mousewheel.min_line_scroll_amount" = 40;
|
||||||
|
"mousewheel.system_scroll_override_on_root_content.enabled" = true;
|
||||||
|
"mousewheel.system_scroll_override_on_root_content.horizontal.factor" = 175;
|
||||||
|
"mousewheel.system_scroll_override_on_root_content.vertical.factor" = 175;
|
||||||
|
"toolkit.scrollbox.horizontalScrollDistance" = 6;
|
||||||
|
"toolkit.scrollbox.verticalScrollDistance" = 2;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
git.signing = true;
|
||||||
|
gpg.enable = true;
|
||||||
|
hub.enable = true;
|
||||||
|
ledger.enable = true;
|
||||||
|
logseq.enable = true;
|
||||||
|
nvim.enable = true;
|
||||||
|
python.versions."311".enable = true;
|
||||||
|
ssh = {
|
||||||
|
enable = true;
|
||||||
|
includeSecrets = [ ../../secrets/ssh-home.age ];
|
||||||
|
};
|
||||||
|
spotify.enable = true;
|
||||||
|
thunar.enable = true;
|
||||||
|
zathura.enable = true;
|
||||||
};
|
};
|
||||||
services = {
|
services = {
|
||||||
dunst.enable = mkDefault true;
|
dunst.enable = true;
|
||||||
gammastep.enable = true;
|
kdeconnect.enable = true;
|
||||||
kdeconnect.enable = mkDefault true;
|
mullvad.enable = true;
|
||||||
|
openconnect.enable = true;
|
||||||
printing.enable = true;
|
printing.enable = true;
|
||||||
|
gammastep.enable = true;
|
||||||
wireguard.enable = true;
|
wireguard.enable = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
# nix
|
||||||
|
nixpkgs-review
|
||||||
|
|
||||||
|
# ripping
|
||||||
|
abcde
|
||||||
|
handbrake
|
||||||
|
picard
|
||||||
|
|
||||||
|
# other
|
||||||
anki
|
anki
|
||||||
calibre
|
calibre
|
||||||
|
jellyfin-media-player
|
||||||
keepassxc
|
keepassxc
|
||||||
nixpkgs-review
|
|
||||||
pavucontrol
|
|
||||||
stable.libreoffice # HACK to fix build error
|
stable.libreoffice # HACK to fix build error
|
||||||
|
pavucontrol
|
||||||
stable.signal-desktop
|
stable.signal-desktop
|
||||||
synology-drive-client
|
tlaplusToolbox
|
||||||
texlive.combined.scheme-full
|
|
||||||
thunderbird
|
|
||||||
vlc
|
vlc
|
||||||
|
thunderbird
|
||||||
|
plantuml
|
||||||
|
|
||||||
|
jetbrains.pycharm-professional
|
||||||
|
|
||||||
|
synology-drive-client
|
||||||
|
|
||||||
|
texlive.combined.scheme-full
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.nix-ld.enable = true;
|
programs = {
|
||||||
|
chromium.enable = true;
|
||||||
|
nix-ld.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
home-manager.users.moritz = {
|
home-manager.users.moritz = {
|
||||||
services.nextcloud-client = {
|
services.nextcloud-client = {
|
||||||
|
@ -69,5 +148,7 @@ with lib; {
|
||||||
alsa.enable = true;
|
alsa.enable = true;
|
||||||
pulse.enable = true;
|
pulse.enable = true;
|
||||||
};
|
};
|
||||||
|
# Remap capslock to esc and shift + capslock to capslock
|
||||||
|
xserver.xkbOptions = "terminate:ctrl_alt_bksp,caps:escape_shifted_capslock";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,60 +0,0 @@
|
||||||
{ lib, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
{
|
|
||||||
my = {
|
|
||||||
services.openconnect.enable = true;
|
|
||||||
programs = {
|
|
||||||
ssh.includeSecrets = mkDefault [ ../../secrets/ssh-home.age ];
|
|
||||||
git.signing = mkDefault true;
|
|
||||||
hub.enable = mkDefault true;
|
|
||||||
firefox.arkenfox = {
|
|
||||||
enable = mkDefault true;
|
|
||||||
overrides = mkDefault {
|
|
||||||
## arkenfox overrides
|
|
||||||
# automatic search
|
|
||||||
"keyword.enabled" = true;
|
|
||||||
"browser.search.suggest.enabled" = true;
|
|
||||||
"browser.urlbar.suggest.searches" = true;
|
|
||||||
|
|
||||||
# startup page
|
|
||||||
"browser.startup.homepage" = "https://searxng.moritzboeh.me/";
|
|
||||||
"browser.startup.page" = 1;
|
|
||||||
|
|
||||||
# drm
|
|
||||||
"media.eme.enabled" = true;
|
|
||||||
|
|
||||||
# sanitisation
|
|
||||||
"privacy.clearOnShutdown.history" = false;
|
|
||||||
|
|
||||||
# disable letterboxing
|
|
||||||
"privacy.resistFingerprinting.letterboxing" = false;
|
|
||||||
|
|
||||||
## OTHER
|
|
||||||
# Dont show warning when accessing about:config
|
|
||||||
"browser.aboutConfig.showWarning" = false;
|
|
||||||
|
|
||||||
# Hide bookmarks
|
|
||||||
"browser.toolbars.bookmarks.visibility" = "never";
|
|
||||||
|
|
||||||
# Smooth scrolling
|
|
||||||
"general.smoothScroll.lines.durationMaxMS" = 125;
|
|
||||||
"general.smoothScroll.lines.durationMinMS" = 125;
|
|
||||||
"general.smoothScroll.mouseWheel.durationMaxMS" = 200;
|
|
||||||
"general.smoothScroll.mouseWheel.durationMinMS" = 100;
|
|
||||||
"general.smoothScroll.msdPhysics.enabled" = true;
|
|
||||||
"general.smoothScroll.other.durationMaxMS" = 125;
|
|
||||||
"general.smoothScroll.other.durationMinMS" = 125;
|
|
||||||
"general.smoothScroll.pages.durationMaxMS" = 125;
|
|
||||||
"general.smoothScroll.pages.durationMinMS" = 125;
|
|
||||||
"mousewheel.min_line_scroll_amount" = 40;
|
|
||||||
"mousewheel.system_scroll_override_on_root_content.enabled" = true;
|
|
||||||
"mousewheel.system_scroll_override_on_root_content.horizontal.factor" = 175;
|
|
||||||
"mousewheel.system_scroll_override_on_root_content.vertical.factor" = 175;
|
|
||||||
"toolkit.scrollbox.horizontalScrollDistance" = 6;
|
|
||||||
"toolkit.scrollbox.verticalScrollDistance" = 2;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,32 +0,0 @@
|
||||||
{ pkgs }:
|
|
||||||
|
|
||||||
{
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
# nix
|
|
||||||
nixpkgs-review
|
|
||||||
|
|
||||||
# ripping
|
|
||||||
abcde
|
|
||||||
handbrake
|
|
||||||
picard
|
|
||||||
|
|
||||||
# other
|
|
||||||
anki
|
|
||||||
calibre
|
|
||||||
jellyfin-media-player
|
|
||||||
keepassxc
|
|
||||||
stable.libreoffice # HACK to fix build error
|
|
||||||
pavucontrol
|
|
||||||
stable.signal-desktop
|
|
||||||
tlaplusToolbox
|
|
||||||
vlc
|
|
||||||
thunderbird
|
|
||||||
plantuml
|
|
||||||
|
|
||||||
jetbrains.pycharm-professional
|
|
||||||
|
|
||||||
synology-drive-client
|
|
||||||
|
|
||||||
texlive.combined.scheme-full
|
|
||||||
];
|
|
||||||
}
|
|
|
@ -1,26 +0,0 @@
|
||||||
{ config
|
|
||||||
, lib
|
|
||||||
, pkgs
|
|
||||||
, ...
|
|
||||||
}:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
let
|
|
||||||
cfg = config.my.programs.chromium;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options.my.programs.chromium = {
|
|
||||||
enable = mkEnableOption "chromium";
|
|
||||||
package = mkOption {
|
|
||||||
type = types.package;
|
|
||||||
default = pkgs.stable.chromium;
|
|
||||||
defaultText = "pkgs.chromium";
|
|
||||||
description = "Chromium package to install.";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
programs.chromium.enable = true;
|
|
||||||
environment.systemPackages = [ cfg.package ];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -2,7 +2,6 @@
|
||||||
imports = [
|
imports = [
|
||||||
./adb.nix
|
./adb.nix
|
||||||
./bspwm
|
./bspwm
|
||||||
./chromium.nix
|
|
||||||
./code.nix
|
./code.nix
|
||||||
./direnv.nix
|
./direnv.nix
|
||||||
./firefox.nix
|
./firefox.nix
|
||||||
|
@ -18,13 +17,13 @@
|
||||||
./ledger
|
./ledger
|
||||||
./logseq.nix
|
./logseq.nix
|
||||||
./miracast.nix
|
./miracast.nix
|
||||||
./nvim
|
|
||||||
./python.nix
|
./python.nix
|
||||||
./rofi
|
./rofi
|
||||||
./spotify.nix
|
./spotify.nix
|
||||||
./ssh.nix
|
./ssh.nix
|
||||||
./sway.nix
|
./sway.nix
|
||||||
./thunar.nix
|
./thunar.nix
|
||||||
|
./nvim
|
||||||
./zathura.nix
|
./zathura.nix
|
||||||
./zsh.nix
|
./zsh.nix
|
||||||
];
|
];
|
||||||
|
|
|
@ -43,8 +43,8 @@ in
|
||||||
general {
|
general {
|
||||||
# See https://wiki.hyprland.org/Configuring/Variables/ for more
|
# See https://wiki.hyprland.org/Configuring/Variables/ for more
|
||||||
|
|
||||||
gaps_in = 3
|
gaps_in = 5
|
||||||
gaps_out = 3
|
gaps_out = 5
|
||||||
border_size = 2
|
border_size = 2
|
||||||
col.active_border = rgba(1affffee)
|
col.active_border = rgba(1affffee)
|
||||||
col.inactive_border = rgba(595959aa)
|
col.inactive_border = rgba(595959aa)
|
||||||
|
|
|
@ -1,15 +1,11 @@
|
||||||
vim.loader.enable()
|
vim.loader.enable()
|
||||||
|
|
||||||
-- Load custom treesitter grammar for org filetype
|
|
||||||
require("orgmode").setup_ts_grammar()
|
|
||||||
require("nvim-treesitter.configs").setup({
|
require("nvim-treesitter.configs").setup({
|
||||||
sync_install = false,
|
sync_install = false,
|
||||||
auto_install = false,
|
auto_install = false,
|
||||||
highlight = {
|
highlight = {
|
||||||
enable = true,
|
enable = true,
|
||||||
-- Required for spellcheck, some LaTex highlights and
|
additional_vim_regex_highlighting = false,
|
||||||
-- code block highlights that do not have ts grammar
|
|
||||||
additional_vim_regex_highlighting = { "org" },
|
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,18 @@
|
||||||
require("orgmode").setup({
|
local orgmode = require("orgmode")
|
||||||
|
-- Load custom treesitter grammar for org filetype
|
||||||
|
orgmode.setup_ts_grammar()
|
||||||
|
-- Treesitter configuration
|
||||||
|
require("nvim-treesitter.configs").setup({
|
||||||
|
-- If TS highlights are not enabled at all, or disabled via `disable` prop,
|
||||||
|
-- highlighting will fallback to default Vim syntax highlighting
|
||||||
|
highlight = {
|
||||||
|
enable = true,
|
||||||
|
-- Required for spellcheck, some LaTex highlights and
|
||||||
|
-- code block highlights that do not have ts grammar
|
||||||
|
additional_vim_regex_highlighting = { "org" },
|
||||||
|
},
|
||||||
|
})
|
||||||
|
orgmode.setup({
|
||||||
org_agenda_files = { "~/Notes/org" },
|
org_agenda_files = { "~/Notes/org" },
|
||||||
org_default_notes_file = "~/Notes/org/refile.org",
|
org_default_notes_file = "~/Notes/org/refile.org",
|
||||||
})
|
})
|
||||||
|
|
|
@ -11,10 +11,10 @@
|
||||||
|
|
||||||
# tmpfs = /tmp is mounted in ram. Doing so makes temp file management speedy
|
# tmpfs = /tmp is mounted in ram. Doing so makes temp file management speedy
|
||||||
# on ssd systems, and volatile! Because it's wiped on reboot.
|
# on ssd systems, and volatile! Because it's wiped on reboot.
|
||||||
boot.tmp.useTmpfs = lib.mkDefault true;
|
boot.tmpOnTmpfs = lib.mkDefault true;
|
||||||
# If not using tmpfs, which is naturally purged on reboot, we must clean it
|
# If not using tmpfs, which is naturally purged on reboot, we must clean it
|
||||||
# /tmp ourselves. /tmp should be volatile storage!
|
# /tmp ourselves. /tmp should be volatile storage!
|
||||||
boot.tmp.cleanOnBoot = lib.mkDefault (!config.boot.tmpOnTmpfs);
|
boot.cleanTmpDir = lib.mkDefault (!config.boot.tmpOnTmpfs);
|
||||||
|
|
||||||
# Fix a security hole in place for backwards compatibility. See desc in
|
# Fix a security hole in place for backwards compatibility. See desc in
|
||||||
# nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
|
# nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
|
||||||
|
|
|
@ -5,5 +5,6 @@ _: prev:
|
||||||
agenix = inputs.agenix.packages.${prev.system}.default;
|
agenix = inputs.agenix.packages.${prev.system}.default;
|
||||||
attic = inputs.attic.packages.${prev.system}.default;
|
attic = inputs.attic.packages.${prev.system}.default;
|
||||||
hyprpaper = inputs.hyprpaper.packages.${prev.system}.default;
|
hyprpaper = inputs.hyprpaper.packages.${prev.system}.default;
|
||||||
|
neovim-nightly = inputs.neovim.packages.${prev.system}.default;
|
||||||
nil = inputs.nil.packages.${prev.system}.default;
|
nil = inputs.nil.packages.${prev.system}.default;
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,10 +43,5 @@ with lib.my;
|
||||||
version = mkVersionInput inputs.gitignore-nvim;
|
version = mkVersionInput inputs.gitignore-nvim;
|
||||||
src = inputs.gitignore-nvim;
|
src = inputs.gitignore-nvim;
|
||||||
};
|
};
|
||||||
|
|
||||||
bufferline-nvim = prev.vimPlugins.bufferline-nvim.overrideAttrs (_: {
|
|
||||||
version = mkVersionInput inputs.bufferline-nvim;
|
|
||||||
src = inputs.bufferline-nvim;
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue