kalle
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updates

main
kalle 2024-02-29 10:34:02 +01:00
parent 3f2b2f2a20
commit a065723dea
9 changed files with 83 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

182
flake.lock
View File

@ -1,28 +1,5 @@
{
"nodes": {
"coq-8_18": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"vscoq",
"nixpkgs"
]
},
"locked": {
"lastModified": 1694096282,
"narHash": "sha256-WhiBs4nzPHQ0R24xAdM49kmxSCPOxiOVMA1iiMYunz4=",
"owner": "coq",
"repo": "coq",
"rev": "f022d5d194cb42c2321ea91cecbcce703a9bcad3",
"type": "github"
},
"original": {
"owner": "coq",
"ref": "V8.18.0",
"repo": "coq",
"type": "github"
}
},
"discord-screenaudio": {
"flake": false,
"locked": {
@ -41,42 +18,6 @@
"url": "ssh://git@github.com/maltejur/discord-screenaudio?tag=v1.9.2"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1689068808,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -84,11 +25,11 @@
]
},
"locked": {
"lastModified": 1704309533,
"narHash": "sha256-n/krnzgnmYWdVoMv0MJfEMTOYCkoY13rCwKhQ4RVd2U=",
"lastModified": 1707683400,
"narHash": "sha256-Zc+J3UO1Xpx+NL8UB6woPHyttEy9cXXtm+0uWwzuYDc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "992b38f29cd7e50d88a2ae069133750beda010a4",
"rev": "21b078306a2ab68748abf72650db313d646cf2ca",
"type": "github"
},
"original": {
@ -125,7 +66,10 @@
},
"hyprlang": {
"inputs": {
"nixpkgs": "nixpkgs_2"
"nixpkgs": [
"xdg-desktop-portal-hyprland",
"nixpkgs"
]
},
"locked": {
"lastModified": 1704287638,
@ -143,11 +87,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1703961334,
"narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=",
"lastModified": 1707546158,
"narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9",
"rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0",
"type": "github"
},
"original": {
@ -157,22 +101,6 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1702645756,
"narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"plugin-harpoon1": {
"flake": false,
"locked": {
@ -192,11 +120,11 @@
"plugin-rainbow-delimiters-nvim": {
"flake": false,
"locked": {
"lastModified": 1704196511,
"narHash": "sha256-sUB85XGP3XQvF3TcdLhKLCDoSTFOeOlUiptK9DjYYqE=",
"lastModified": 1707759118,
"narHash": "sha256-kNnZV06VYE7DhNDbJIHd6MvdX04qFjXgy7OHO1ai6x0=",
"owner": "HiPhish",
"repo": "rainbow-delimiters.nvim",
"rev": "4a90ac83c7c8e0ba8a1b6af38bed6d5ee1b04e08",
"rev": "586f44d21ef687a4d41b5b24c1566d686ae84250",
"type": "gitlab"
},
"original": {
@ -208,11 +136,11 @@
"plugin-undotree-nvim": {
"flake": false,
"locked": {
"lastModified": 1703849391,
"narHash": "sha256-clxoKM5kusRz8OR5+Z+4NS0WsoMx9tdyi9GG+sE6r3s=",
"lastModified": 1707485506,
"narHash": "sha256-FIYDyfkaIS9C16ClWKLMdpSPv/OrcOalVVsyFJBU2eI=",
"owner": "jiaoshijie",
"repo": "undotree",
"rev": "80552a0180b49e5ba072c89ae91ce5d4e3aed36b",
"rev": "eab459ab87dd249617b5f7187bb69e614a083047",
"type": "github"
},
"original": {
@ -221,22 +149,6 @@
"type": "github"
}
},
"plugin-vscoq-nvim": {
"flake": false,
"locked": {
"lastModified": 1702025258,
"narHash": "sha256-0ozz2vxmuEym/pR6AftgIZBt4fT4qJxEpngtZXqXT30=",
"owner": "tomtomjhj",
"repo": "vscoq.nvim",
"rev": "0dee175a75153fc6057605c90749e0d6eb131cd4",
"type": "github"
},
"original": {
"owner": "tomtomjhj",
"repo": "vscoq.nvim",
"type": "github"
}
},
"root": {
"inputs": {
"discord-screenaudio": "discord-screenaudio",
@ -245,42 +157,10 @@
"plugin-harpoon1": "plugin-harpoon1",
"plugin-rainbow-delimiters-nvim": "plugin-rainbow-delimiters-nvim",
"plugin-undotree-nvim": "plugin-undotree-nvim",
"plugin-vscoq-nvim": "plugin-vscoq-nvim",
"vscoq": "vscoq",
"xdg-desktop-portal-hyprland": "xdg-desktop-portal-hyprland"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@ -295,28 +175,6 @@
"type": "github"
}
},
"vscoq": {
"inputs": {
"coq-8_18": "coq-8_18",
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1701447720,
"narHash": "sha256-VXhHCP6Ni5/OcsgoI1EbJfYCpXzwkuR8kbbKrl6dfjU=",
"owner": "coq-community",
"repo": "vscoq",
"rev": "d4a702e676f2d17952e82df27962736d10810c37",
"type": "github"
},
"original": {
"owner": "coq-community",
"repo": "vscoq",
"type": "github"
}
},
"xdg-desktop-portal-hyprland": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
@ -324,14 +182,14 @@
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_3"
"systems": "systems"
},
"locked": {
"lastModified": 1704308317,
"narHash": "sha256-/3IcC3oi0MPtC9OyE687HI/a7vat3m9Sx67I85tTcdI=",
"lastModified": 1706521509,
"narHash": "sha256-AInZ50acOJ3wzUwGzNr1TmxGTMx+8j6oSTzz4E7Vbp8=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "bd110073cfe6ac3ce756c1577af78d672f89e853",
"rev": "c06fd88b3da492b8f9067be021b9184f7012b5a8",
"type": "github"
},
"original": {

7
flake.nix
View File

@ -9,10 +9,6 @@
home-manager.url = "github:nix-community/home-manager/master";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
# VS Coq language server
vscoq.url = "github:coq-community/vscoq";
vscoq.inputs.nixpkgs.follows = "nixpkgs";
# Neovim plugins not in nixpkgs
plugin-rainbow-delimiters-nvim.url = "gitlab:HiPhish/rainbow-delimiters.nvim";
plugin-rainbow-delimiters-nvim.flake = false;
@ -20,9 +16,6 @@
plugin-undotree-nvim.url = "github:jiaoshijie/undotree";
plugin-undotree-nvim.flake = false;
plugin-vscoq-nvim.url = "github:tomtomjhj/vscoq.nvim";
plugin-vscoq-nvim.flake = false;
plugin-harpoon1.url = "github:ThePrimeagen/harpoon";
plugin-harpoon1.flake = false;

22
home-manager/kalle-pc/kalle.nix
View File

@ -15,6 +15,7 @@
imports =
[
../../nvim
../../tmux
../../eww
../../hyprland
../../hyprland/hyprpaper.nix
@ -227,12 +228,15 @@
nixpkgs = {
overlays = with outputs.overlays; [
nvim-plugins
discord-screenaudio
];
config = {
allowUnfree = true;
allowUnfreePredicate = _: true;
permittedInsecurePackages = [
"electron-25.9.0"
];
};
};
@ -240,7 +244,7 @@
# environment.
home.packages = with pkgs; [
discord
# discord-screenaudio # Not working with some EGL error
vesktop
firefox
chromium
httpie
@ -251,15 +255,27 @@
gcc
prismlauncher
pavucontrol
coq_8_18
difftastic
sops
obsidian
cachix
];
programs.home-manager.enable = true;
gtk = {
theme = {
package = pkgs.libsForQt5.breeze-gtk;
name = "Breeze-Dark";
};
iconTheme = {
package = pkgs.libsForQt5.breeze-icons;
name = "breeze-dark";
};
};
programs.bash = {
enable = true;
shellAliases = {

4
hyprland/default.nix
View File

@ -290,6 +290,10 @@
layout = cfg.layout;
};
misc = {
force_default_wallpaper = 2;
};
decoration = {
rounding = cfg.rounding;

3
nixos/kalle-pc/configuration.nix
View File

@ -48,7 +48,7 @@
displayManager.sddm.enable = true;
# Configure keymap in X11
layout = "us";
xkb.layout = "us";
# xkbVariant = "dvorak";
# xkbOptions = "eurosign:e,caps:escape";
};
@ -90,7 +90,6 @@
grim # For xdg-desktop-portal-hyprland which does not declare this dependency
slurp # Some for this one
qemu_full
gamescope
];

16
nvim/default.nix
View File

@ -29,7 +29,6 @@
rnix-lsp
nodePackages.typescript-language-server
tailwindcss-language-server
inputs.vscoq.packages.x86_64-linux.vscoq-language-server
];
plugins = with pkgs.vimPlugins; [
@ -51,10 +50,7 @@
FTerm-nvim
{
plugin = neogit;
config = toLua "require('neogit').setup()";
}
vim-fugitive
harpoon1
@ -115,16 +111,6 @@
config = toLuaFile ./plugin/treesitter.lua;
}
{
plugin = Coqtail;
# Don't load Coqtail with neovim
config = ''
let g:loaded_coqtail = 1
let g:coqtail#supported = 0
'';
}
vscoq-nvim
{
plugin = copilot-lua;
config = toLua ''

17
nvim/plugin/lsp.lua
View File

@ -132,20 +132,3 @@ require('rust-tools').setup({
}
},
})
require 'vscoq'.setup {
-- Configuration for vscoq, used in both the client and the server.
-- See "configuration" in https://github.com/coq-community/vscoq/blob/main/client/package.json.
-- The following is an example.
vscoq = {
proof = {
mode = 1, -- automatic mode
},
},
-- The configuration forwarded to `:help lspconfig-setup`.
-- The following is an example.
lsp = {
on_attach = on_attach,
},
}

45
overlays/default.nix
View File

@ -15,55 +15,10 @@
src = inputs.plugin-undotree-nvim;
};
vscoq-nvim = prev.vimUtils.buildVimPlugin {
name = "vscoq.nvim";
src = inputs.plugin-vscoq-nvim;
};
harpoon1 = prev.vimUtils.buildVimPlugin {
name = "harpoon";
src = inputs.plugin-harpoon1;
};
};
};
discord-screenaudio = final: prev: {
discord-screenaudio = prev.stdenv.mkDerivation
rec {
pname = "discord-screenaudio";
version = "1.9.1";
src = inputs.discord-screenaudio;
nativeBuildInputs = with prev; [
qt6.wrapQtAppsHook
cmake
pkg-config
qt6.qtbase
qt6.qtwebengine
];
buildInputs = with prev; [
pipewire
];
preConfigure = ''
# version.cmake either uses git tags or a version.txt file to get app version.
# Since cmake can't access git tags, write the version to a version.txt ourselves.
echo "${version}" > version.txt
'';
passthru.updateScript = prev.nix-update-script { };
meta = {
description = "A custom discord client that supports streaming with audio on Linux";
homepage = "https://github.com/maltejur/discord-screenaudio";
downloadPage = "https://github.com/maltejur/discord-screenaudio/releases";
changelog = "https://github.com/maltejur/discord-screenaudio/releases/tag/v${version}";
# license = lib.licenses.gpl3Only;
# maintainers = with lib.maintainers; [ huantian ];
# platforms = lib.platforms.linux;
};
};
};
}

38
tmux/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ inputs
, lib
, config
, pkgs
, ...
}:
{
programs.tmux = {
enable = true;
keyMode = "vi";
mouse = true;
baseIndex = 1;
escapeTime = 20;
terminal = "tmux-256color";
historyLimit = 100000;
plugins = with pkgs.tmuxPlugins;
[
better-mouse-mode
catppuccin
];
extraConfig = ''
# Use catppuccin-mocha theme.
set -g @catppuccin_flavour 'mocha'
# Other catppuccin settigns.
set -g @catppuccin_window_default_text "#{window_name}"
# Don't leave gaps inDon't leave gaps in window numbers.
set -g renumber-windows on
# Vim keys for pane navigation.
bind h select-pane -L
bind j select-pane -D
bind k select-pane -U
bind l select-pane -R
'';
};
}