gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Touch-up on koishi, fix gitmodules

Browse source
This commit is contained in:
kat witch 2021-11-15 04:57:50 +00:00
parent 3d3cdda8cb
commit 2ba7aea5d1
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
8 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitmodules vendored
View file

@ -1,7 +1,11 @@
[submodule "config/trusted"] [submodule "config/trusted"]
path = config/trusted path = config/trusted
branch = main branch = main
url = "https://git.kittywit.ch/kat/nixfiles-trusted.git" url = "ssh://gitea@git.kittywit.ch:62954/kat/nixfiles-trusted.git"
[submodule "config/tf"]
path = config/tf
branch = main
url = "gcrypt::ssh://gitea@git.kittywit.ch:62954/kat/nixfiles-sensitive.git#main"
[submodule "overlay/exprs"] [submodule "overlay/exprs"]
path = overlay/exprs path = overlay/exprs
branch = main branch = main

2
config/tf

@ -1 +1 @@
Subproject commit 91b99389dbbda15b8ca89793ee5a3b130c21bd5e Subproject commit 42109564c606b20be3b99d5c6e4172bf20118a65

1
config/users/kat/base/ssh.nix
View file

@ -6,6 +6,7 @@
controlMaster = "auto"; controlMaster = "auto";
controlPersist = "10m"; controlPersist = "10m";
hashKnownHosts = true; hashKnownHosts = true;
compression = true;
matchBlocks = matchBlocks =
let let
common = { common = {

1
config/users/kat/base/vim/init.vim
View file

@ -10,7 +10,6 @@ set sw=2
" colors " colors
let base16colorspace=256 let base16colorspace=256
colorscheme base16-default-dark
autocmd vimenter * highlight Normal guibg=NONE ctermbg=NONE autocmd vimenter * highlight Normal guibg=NONE ctermbg=NONE
autocmd SourcePost * highlight Normal ctermbg=NONE guibg=NONE autocmd SourcePost * highlight Normal ctermbg=NONE guibg=NONE
\ | highlight LineNr ctermbg=NONE guibg=NONE \ | highlight LineNr ctermbg=NONE guibg=NONE

3
config/users/kat/base/vim/nvim.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: with lib; { config, lib, pkgs, nixos, ... }: with lib;
let initvim = pkgs.callPackage let initvim = pkgs.callPackage
({ stdenv, elinks, nodejs }: stdenv.mkDerivation { ({ stdenv, elinks, nodejs }: stdenv.mkDerivation {
@ -23,6 +23,7 @@ in
enable = true; enable = true;
extraConfig = '' extraConfig = ''
source ${initvim} source ${initvim}
${if nixos.networking.hostName == "koishi" then "color-scheme base16-default-light" else "colorscheme base16-default-dark"}
''; '';
vimAlias = true; vimAlias = true;
viAlias = true; viAlias = true;

1
config/users/kat/base/vim/vim.nix
View file

@ -19,6 +19,7 @@ in
packageConfigurable = pkgs.vim_configurable-pynvim; packageConfigurable = pkgs.vim_configurable-pynvim;
extraConfig = '' extraConfig = ''
source ${initvim} source ${initvim}
${if nixos.networking.hostName == "koishi" then "color-scheme base16-default-light" else "colorscheme base16-default-dark"}
''; '';
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
"vim-cool" "vim-cool"

6
config/users/kat/sway/konawall.nix
View file

@ -1,4 +1,4 @@
{ config, lib, ... }: { config, nixos, lib, ... }:
with lib; with lib;
@ -9,8 +9,8 @@ with lib;
mode = "shuffle"; mode = "shuffle";
commonTags = [ "width:>=1600" ]; commonTags = [ "width:>=1600" ];
tagList = map (toList) [ tagList = map (toList) [
["score:>=50" (["score:>=50"
"touhou"] "touhou"] ++ optional (nixos.networking.hostName == "koishi") "rating:s")
]; ];
}; };
} }

6
config/users/kat/sway/waybar/default.nix
View file

@ -9,9 +9,9 @@
enable = true; enable = true;
systemd.enable = true; systemd.enable = true;
settings = [{ settings = [{
modules-right = [ "clock#s" "clock#arc" "clock#hex" "clock#miku" "clock" ]; modules-center = [ "clock#s" "clock#arc" "clock#hex" "clock#miku" "clock" ];
modules-center = [ "sway/workspaces" "sway/mode" "sway/window" ]; modules-left = [ "sway/workspaces" "sway/mode" "sway/window" ];
modules-left = [ modules-right = [
"tray" "tray"
"pulseaudio" "pulseaudio"
"custom/mail" "custom/mail"