teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

Merge branch 'main' into teutat3s

Browse source
This commit is contained in:
teutat3s 2022-04-03 18:46:34 +02:00
parent 1cbb04d808 a884368d8d
commit f44e3f06ed
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
3 changed files with 39 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

110
flake.lock
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1646845404, "lastModified": 1648942457,
"narHash": "sha256-JENXFCI2HVqi0whBzt7MAW9PX3ziEaYqBhMux+4g+VM=", "narHash": "sha256-i29Z1t3sVfCNfpp+KAfeExvpqHQSbLO1KWylTtfradU=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "764c975e74bce2f89a5106b68ec48e2b586f893c", "rev": "0d5e59ed645e4c7b60174bc6f6aac6a203dc0b01",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -87,11 +87,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1647173930, "lastModified": 1648278671,
"narHash": "sha256-8oca3Pc68VrCp8HeOtHmzs5g0rdQnPO9beDEEZJ02W0=", "narHash": "sha256-1WrR9ex+rKTjZtODNUZQhkWYUprtfOkjOyo9YWL2NMs=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "17fbc68a6110edbff67e55f7450230a697ecb17e", "rev": "4fdbb8168f61d31d3f90bb0d07f48de709c4fe79",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -109,11 +109,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1643787431, "lastModified": 1648475189,
"narHash": "sha256-8IwuVgXulRE3ZWq6z8mytarawC32pKPKR20EyDtSH+w=", "narHash": "sha256-gAGAS6IagwoUr1B0ohE3iR6sZ8hP4LSqzYLC8Mq3WGU=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "4154ba1aaaf7333a916384c348d867d03b6f1409", "rev": "83e0c78291cd08cb827ba0d553ad9158ae5a95c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -172,17 +172,16 @@
"nixlib": [ "nixlib": [
"nixos" "nixos"
], ],
"nixos-generators": "nixos-generators",
"nixpkgs": [ "nixpkgs": [
"nixos" "nixos"
] ]
}, },
"locked": { "locked": {
"lastModified": 1646846683, "lastModified": 1648937792,
"narHash": "sha256-s13XKw1xjGlmdY9qMwla/mDKaE/8xAVJ/+ZTJ9Q7CTY=", "narHash": "sha256-KoR/L4tYoFaoIo4knVuaqjzLn6yAvQmO8e5YcfUsxY4=",
"owner": "divnix", "owner": "divnix",
"repo": "digga", "repo": "digga",
"rev": "396b04b62b885963c467aa8ade3c19398ade2d69", "rev": "afa1c70e0c48395058112adf795c4999ac88eccf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -194,11 +193,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1641205782, "lastModified": 1648199409,
"narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -354,11 +353,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1647175256, "lastModified": 1648834319,
"narHash": "sha256-7H+veXPM7IwdN1DoZqliwb9sghlN56koV5dnCu1kpsc=", "narHash": "sha256-i5Aj4Aw64D/A0X6XW5LxSS4XBnYj7gMz+kN4dpsbdk8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a8d00f5c038cf7ec54e7dac9c57b171c1217f008", "rev": "0bdbdea2e26c984b096f4f7d10e3c88536a980b0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -386,11 +385,11 @@
}, },
"latest_2": { "latest_2": {
"locked": { "locked": {
"lastModified": 1647800324, "lastModified": 1648632716,
"narHash": "sha256-rjwoxrk16zfrcO5Torh6CbAd5GHsHrXw+EwxOvh9AUI=", "narHash": "sha256-kCmnDeiaMsdhfnNKjxdOzwRh2H6eQb8yWAL+nNabC/Y=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9bc841fec1c0e8b9772afa29f934d2c7ce57da8e", "rev": "710fed5a2483f945b14f4a58af2cd3676b42d8c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -423,11 +422,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1639947939, "lastModified": 1648544490,
"narHash": "sha256-pGsM8haJadVP80GFq4xhnSpNitYNQpaXk4cnA796Cso=", "narHash": "sha256-EoBDcccV70tfz2LAs5lK0BjC7en5mzUVlgLsd5E6DW4=",
"owner": "nmattia", "owner": "nmattia",
"repo": "naersk", "repo": "naersk",
"rev": "2fc8ce9d3c025d59fee349c1f80be9785049d653", "rev": "e30ef9a5ce9b3de8bb438f15829c50f9525ca730",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -481,28 +480,13 @@
"type": "github" "type": "github"
} }
}, },
"nixlib": {
"locked": {
"lastModified": 1641688481,
"narHash": "sha256-6L+EU12xLDHby7y8elgFtRKVBxix+7qV8DhVgXqrKZo=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "f697717b3d3a074ffc16c8c8227504f0db292886",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1647992509, "lastModified": 1649000662,
"narHash": "sha256-AG40Nt5OWz0LBs5p457emOuwLKOvTtcv/2fUdnEN3Ws=", "narHash": "sha256-KLOmqt2gBWd9h1FQJm6JtV0+T8roxH6Wq2F5wyun+l0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d2caa9377539e3b5ff1272ac3aa2d15f3081069f", "rev": "14775340a53c22a6398ab30f75428998759a9f8c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -512,35 +496,13 @@
"type": "github" "type": "github"
} }
}, },
"nixos-generators": {
"inputs": {
"nixlib": "nixlib",
"nixpkgs": [
"digga",
"blank"
]
},
"locked": {
"lastModified": 1637655461,
"narHash": "sha256-kXZPbclN3gKwjhp2/RYFDFpAsSBwzX1iLF4EcnHZsPQ=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "05a3eb158a9c7746a5d463726d7f7cccf07500e4",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixos-generators",
"type": "github"
}
},
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1648022149, "lastModified": 1648141026,
"narHash": "sha256-xhDjF807UZwC2I6EGYrH1o8Mzr6w8bBruGOmHAcWO/Q=", "narHash": "sha256-h8e3+5EZFbYHTMb0DN2ACuQTJBNHpqigvmEV1w2WIuE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a352d867273cf4a245d890f8a2cfcfabd29c5c63", "rev": "feceb4d24f582817d8f6e737cd40af9e162dee05",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -619,11 +581,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1644123018, "lastModified": 1648145722,
"narHash": "sha256-xEhhLmuy4FnT4Zdkf3epPX9T3xqn59yERCsicG4IEyM=", "narHash": "sha256-iC04ukXdms4XnvKh/o1LoYXDiAURD6y0vae8V6ovQfw=",
"owner": "berberman", "owner": "berberman",
"repo": "nvfetcher", "repo": "nvfetcher",
"rev": "9f2cb15c4668859312b6a854d79ad753d5b98b03", "rev": "daea67a8b6ec8aa89eb3a474c3d9e9ce2b2cc6f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -707,11 +669,11 @@
}, },
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1642700792, "lastModified": 1648297722,
"narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
modules/terminal-life/nvim/lsp.vim
View file

@ -40,10 +40,10 @@ lua <<EOF
buf_set_keymap('n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts) buf_set_keymap('n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
buf_set_keymap('n', '<leader>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts) buf_set_keymap('n', '<leader>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts) buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
buf_set_keymap('n', '<space>e', '<cmd>lua vim.diagnostic.open_float()<CR>', opts) buf_set_keymap('n', '<leader>e', '<cmd>lua vim.diagnostic.open_float()<CR>', opts)
buf_set_keymap('n', 'g[', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts) buf_set_keymap('n', 'g[', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
buf_set_keymap('n', 'g]', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts) buf_set_keymap('n', 'g]', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
buf_set_keymap('n', '<space>q', '<cmd>lua vim.diagnostic.setloclist()<CR>', opts) buf_set_keymap('n', '<leader>q', '<cmd>lua vim.diagnostic.setloclist()<CR>', opts)
buf_set_keymap('n', '<leader>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts) buf_set_keymap('n', '<leader>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
end end

1
overlays/overrides.nix
View file

@ -22,6 +22,7 @@ channels: final: prev: {
obs-studio obs-studio
obs-studio-plugins obs-studio-plugins
looking-glass-client looking-glass-client
vimPlugins
; ;
inherit (channels.master) inherit (channels.master)