From 8397aa7aa396bc99b380fe69120950022e88bbfd Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 21 Oct 2021 23:39:19 +0200 Subject: [PATCH 01/11] workflows: switch to new default branch main --- .github/workflows/check.yml | 2 +- .github/workflows/mdbook_docs.yml | 2 +- .github/workflows/release.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 8fdf8d1c..756aa2bf 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -2,7 +2,7 @@ name: "Check & Cachix" on: push: branches: - - master + - main - trying - staging jobs: diff --git a/.github/workflows/mdbook_docs.yml b/.github/workflows/mdbook_docs.yml index 9d15cc18..5faf9c28 100644 --- a/.github/workflows/mdbook_docs.yml +++ b/.github/workflows/mdbook_docs.yml @@ -3,7 +3,7 @@ name: Deploy Docs to GitHub Pages on: push: branches: - - master + - main jobs: deploy: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 111be319..8cabd128 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - name: Checkout code uses: actions/checkout@v2 with: - ref: master + ref: main - name: Update Changelog uses: heinrichreimer/github-changelog-generator-action@v2.1.1 with: @@ -49,7 +49,7 @@ jobs: - name: Checkout code uses: actions/checkout@v2 with: - ref: master + ref: main - name: Get Changelog Entry id: changelog_reader From 1b1bc8eb97fc346f65ef96b580544a987e35ab3a Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 21 Oct 2021 23:39:38 +0200 Subject: [PATCH 02/11] digga: fix link to new default branch main --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1d813821..275714ca 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ DevOS is licensed under the [MIT License][mit]. [giants]: https://en.wikipedia.org/wiki/Standing_on_the_shoulders_of_giants [home-manager]: https://nix-community.github.io/home-manager [mit]: https://mit-license.org -[mk-flake]: https://github.com/divnix/digga/tree/master/src/mkFlake +[mk-flake]: https://github.com/divnix/digga/tree/main/src/mkFlake [nix]: https://nixos.org/manual/nix/stable [nixos]: https://nixos.org/manual/nixos/stable [nixpkgs]: https://github.com/NixOS/nixpkgs From 782f4add01f2fd56dc4bc6a665310a8ed1fc3fe4 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Fri, 22 Oct 2021 14:04:17 +0200 Subject: [PATCH 03/11] cron: reset origin remote url, so that next step's git fetch works --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 89514d6c..8a5adad1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,6 +22,7 @@ steps: - git checkout -b devos --track origin/devos - git merge -X theirs devos/main - git push origin devos + - git remote set-url origin https://git.b12f.io/pub-solar/os.git - name: "Sync $BRANCH with upstream" image: alpine/git From 65db5d30ae4df02b9cef6620e72ed34a2082fc31 Mon Sep 17 00:00:00 2001 From: Karolis Labrencis Date: Sun, 24 Oct 2021 01:33:04 +0300 Subject: [PATCH 04/11] docs: remove outdated `nix-rebuild` notes --- doc/start/from-nixos.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/doc/start/from-nixos.md b/doc/start/from-nixos.md index ce79063b..3e8c84d6 100644 --- a/doc/start/from-nixos.md +++ b/doc/start/from-nixos.md @@ -47,8 +47,5 @@ This calls `nixos-rebuild` with sudo to build and install your configuration. > ##### _Notes:_ > - Instead of `switch`, you can pass `build`, `test`, `boot`, etc just as with > `nixos-rebuild`. -> -> - It is convenient to have the template living at `/etc/nixos` so you can -> simply `sudo nixos-rebuild switch` from anywhere on the system, but it is -> not required. + From c35a38f8348292fa135949738e147c886e3da585 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sun, 24 Oct 2021 01:18:33 +0200 Subject: [PATCH 05/11] x-os: prepare booting from unencrypted /boot partition --- modules/x-os/boot.nix | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/modules/x-os/boot.nix b/modules/x-os/boot.nix index 5068590e..51cd5b4b 100644 --- a/modules/x-os/boot.nix +++ b/modules/x-os/boot.nix @@ -3,40 +3,19 @@ let cfg = config.pub-solar.x-os; in -with lib; { - options = { - pub-solar.x-os.keyfile = mkOption { - type = types.str; - description = "Keyfile location"; - }; - }; - +{ config = { # Enable plymouth for better experience of booting boot.plymouth.enable = true; - # Use Keyfile to unlock the root partition to avoid keying in twice. + # Mount / luks device in initrd # Allow fstrim to work on it. boot.initrd = { - secrets = { "/keyfile.bin" = cfg.keyfile; }; luks.devices."cryptroot" = { - keyFile = "/keyfile.bin"; allowDiscards = true; - fallbackToPassword = true; }; }; - # Use GRUB with encrypted /boot under EFI env. - boot.loader = { - efi.efiSysMountPoint = "/boot/efi"; - - grub = { - enable = true; - version = 2; - device = "nodev"; - efiSupport = true; - enableCryptodisk = true; - }; - }; + boot.loader.systemd-boot.enable = true; }; } From bcd191b291c768e37a2a47b8543273f49cb5c0a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= Date: Mon, 25 Oct 2021 23:10:18 +0200 Subject: [PATCH 06/11] Don't scale laptop screen, sway + firefox is broken then --- hosts/biolimo/.config/sway/config.d/screens.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/biolimo/.config/sway/config.d/screens.conf b/hosts/biolimo/.config/sway/config.d/screens.conf index 64869b63..dac861b6 100644 --- a/hosts/biolimo/.config/sway/config.d/screens.conf +++ b/hosts/biolimo/.config/sway/config.d/screens.conf @@ -3,7 +3,7 @@ set $middle "Hewlett Packard HP E231 3CQ4290S5J" set $standup "Hewlett Packard HP E231 3CQ4251F33" output $internal { - scale 1.3 + scale 1 pos 0 500 } From e1404ac969c540b1dd41a4423ccff98cc14047f7 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Tue, 26 Oct 2021 01:07:10 +0200 Subject: [PATCH 07/11] fix main branch cron for real --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8a5adad1..8dcf9bbb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,7 +37,7 @@ steps: GITEA_SSH_KEY: from_secret: gitea_ssh_key commands: - - git fetch --all + - git fetch origin - git checkout origin/main - ./.drone/setup_ssh.sh - git remote set-url origin git@git.b12f.io:pub-solar/os @@ -85,6 +85,6 @@ steps: template: "Upstreaming {{ build.status }} [{{ build.branch }}#{{ truncate build.commit 8 }}]({{ build.link }}) by {{ build.author }}. [Pull requests](https://git.b12f.io/pub-solar/os/pulls)" --- kind: signature -hmac: 145dff5d1aac21f4c68f186cc2dbd98ccb8f08f23af8df3528de6a21defee1c7 +hmac: 07d9a95e8f577483d753e9eea76229ffe0c369ecd642bfc364ae183f662d2167 ... From c059af5248c67353953f95052aaa9c238180c538 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Fri, 29 Oct 2021 16:43:36 +0200 Subject: [PATCH 08/11] terminal-life: add upstream nixos-option gc fix --- modules/terminal-life/default.nix | 4 ++-- modules/terminal-life/zsh/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/terminal-life/default.nix b/modules/terminal-life/default.nix index 4d36655f..87b2ee45 100644 --- a/modules/terminal-life/default.nix +++ b/modules/terminal-life/default.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, ... }: +{ lib, config, pkgs, self, ... }: with lib; let psCfg = config.pub-solar; @@ -37,7 +37,7 @@ in programs.neovim = import ./nvim { inherit config; inherit pkgs; }; programs.fzf = import ./fzf { inherit config; inherit pkgs; }; - programs.zsh = import ./zsh { inherit config; inherit pkgs; }; + programs.zsh = import ./zsh { inherit config; inherit pkgs; inherit self; }; }; }; } diff --git a/modules/terminal-life/zsh/default.nix b/modules/terminal-life/zsh/default.nix index 0ff87812..f4923c50 100644 --- a/modules/terminal-life/zsh/default.nix +++ b/modules/terminal-life/zsh/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, self, ... }: let psCfg = config.pub-solar; xdg = config.home-manager.users."${psCfg.user.name}".xdg; @@ -32,7 +32,7 @@ in drone = "DRONE_TOKEN=$(secret-tool lookup drone token) drone"; no = "manix \"\" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview=\"manix '{}'\" | xargs manix"; # fix nixos-option - nixos-option = "nixos-option -I nixpkgs=/etc/nixos/lib/compat"; + nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat"; }; zplug = { enable = true; From 9bd3f7d871ac240b777f2625086e2446a75f4181 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Fri, 29 Oct 2021 16:44:35 +0200 Subject: [PATCH 09/11] nvim: sort alphabetically, add gopls (go lsp) --- modules/terminal-life/nvim/default.nix | 45 +++++++++++++------------- modules/terminal-life/nvim/plugins.vim | 2 +- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/modules/terminal-life/nvim/default.nix b/modules/terminal-life/nvim/default.nix index 4647a76c..8d1be99d 100644 --- a/modules/terminal-life/nvim/default.nix +++ b/modules/terminal-life/nvim/default.nix @@ -69,73 +69,74 @@ in ]; extraPackages = with pkgs; [ - nodejs + ccls code-minimap + gopls + nodejs nodePackages.bash-language-server nodePackages.dockerfile-language-server-nodejs nodePackages.svelte-language-server - nodePackages.typescript-language-server nodePackages.typescript + nodePackages.typescript-language-server nodePackages.vim-language-server nodePackages.vue-language-server - nodePackages.yaml-language-server - nodePackages.vscode-json-languageserver-bin - nodePackages.vscode-html-languageserver-bin nodePackages.vscode-css-languageserver-bin - python3Full + nodePackages.vscode-html-languageserver-bin + nodePackages.vscode-json-languageserver-bin + nodePackages.yaml-language-server python-language-server + python3Full solargraph - rust-analyzer - universal-ctags - ccls rnix-lsp + rust-analyzer terraform-ls + universal-ctags ]; plugins = with pkgs.vimPlugins; [ - nvim-lspconfig - lsp_extensions-nvim completion-nvim + lsp_extensions-nvim + nvim-lspconfig - suda ack-vim - syntastic airline - workspace editorconfig-vim - vim-vinegar - vim-gutentags minimap-vim nnn-vim + suda + syntastic + vim-gutentags + vim-vinegar + workspace sonokai fugitive - vim-rhubarb vim-gitgutter + vim-rhubarb vimagit - vim-highlightedyank fzf-vim fzfWrapper + vim-highlightedyank beautify vim-surround - vim-sensible vim-bufkill + vim-sensible ansible-vim emmet-vim rust-vim vim-go - vim-vue vim-javascript vim-json vim-markdown - yats-vim + vim-nix vim-ruby vim-toml - vim-nix + vim-vue + yats-vim ]; } diff --git a/modules/terminal-life/nvim/plugins.vim b/modules/terminal-life/nvim/plugins.vim index b174531e..1ff28d6c 100644 --- a/modules/terminal-life/nvim/plugins.vim +++ b/modules/terminal-life/nvim/plugins.vim @@ -6,7 +6,7 @@ let g:gutentags_file_list_command = 'git ls-files' " Golang " Go test shortcut -nmap got :GoTest +nmap got :GoTest:botright copen " Go formatting autocmd FileType go setlocal noexpandtab shiftwidth=4 tabstop=4 softtabstop=4 nolist From 097d89d2b27d96ae21391f25fbc42523bba51d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= Date: Fri, 29 Oct 2021 20:21:13 +0200 Subject: [PATCH 10/11] Remove git crypt form biolimo --- .git-crypt/.gitattributes | 4 ---- .../4332E0D02B214D31376C366E4406E80E13CD656C.gpg | Bin 726 -> 0 bytes 2 files changed, 4 deletions(-) delete mode 100644 .git-crypt/.gitattributes delete mode 100644 .git-crypt/keys/default/0/4332E0D02B214D31376C366E4406E80E13CD656C.gpg diff --git a/.git-crypt/.gitattributes b/.git-crypt/.gitattributes deleted file mode 100644 index 665b10e8..00000000 --- a/.git-crypt/.gitattributes +++ /dev/null @@ -1,4 +0,0 @@ -# Do not edit this file. To specify the files to encrypt, create your own -# .gitattributes file in the directory where your files are. -* !filter !diff -*.gpg binary diff --git a/.git-crypt/keys/default/0/4332E0D02B214D31376C366E4406E80E13CD656C.gpg b/.git-crypt/keys/default/0/4332E0D02B214D31376C366E4406E80E13CD656C.gpg deleted file mode 100644 index deeb470aa95b631f6bf04783222b7bf398d1417b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 726 zcmV;{0xA840t^FZ;#0bbG8qE_5CEe?90=TLrzBg{?|DwE@){C^xnDpxzT^6^mCf&6 zCLB45PK7}m!SH; z3U8erp0CsW3_z*3k=NArngH|)j9Gr*{XsyWj(U#%`m{LeI={>K8(G0_YCs~RX6kuJ zrFBqQ=|8~L>VpY(5QnDm_nOIRjDDdRU@8(h)`6I4y64L_S^$uqdEvYrxN|=Sa^W~S zx_&zm1|!1Zi7RqY)AJ2JI{Q)S2n2|M2{f#{ z8sHokO!y;Q;*RS_Tw^OqIrW2y-F9*uS9T4Pj}kJ812XC{gOP4lWNdIXs=`vP;eB_XzP z*u%7x-8Z?g@3^JSgjBg#T#C}b1OZu-&vBFmwht5NXNz%LXkR6;syWIfS2^_DFmsj*2L~XZ zJ-}kN!d)+;xsH80Gq~VB`49mjFNbgr%Ux(c7dIh8)W-G_p8em$-7ZEubzsYpSN#G~ zJM?g_)HivHHdNWwvQs^SVDcT%1=vqub+NRKA(@ipHTiuj&iQCMFuLQ7gU(Lx)bTs% zubEXGH(gzw7{qHOkX;W0_wD-Y7CpXdL?rgG$Xs7+kt~8>54wsW0?Azi{((0&ViOeK I|8@mr$WFLp4FCWD From 64e1a4583f41508a73286707abf1b9ee9adfddf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= Date: Sun, 31 Oct 2021 01:06:50 +0200 Subject: [PATCH 11/11] Add ssh hosts --- users/ben/home.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/users/ben/home.nix b/users/ben/home.nix index 404c00bc..ffab4324 100644 --- a/users/ben/home.nix +++ b/users/ben/home.nix @@ -20,13 +20,31 @@ in matchBlocks = { "git.b12f.io" = { hostname = "git.b12f.io"; - port = 2222; user = "git"; + port = 2222; }; "aur.archlinux.org" = { user = "aur"; }; + + "leavieler.art" = { + hostname = "web5svsvy.wh.hosting.zone"; + user = "web5svsvy_cgzqa3"; + port = 2244; + }; + + "benjaminbaedorf.eu" = { + hostname = "web5svsvy.wh.hosting.zone"; + user = "web5svsvy_cgzqa3"; + port = 2244; + }; + + "miom.space" = { + hostname = "web7dgkba.wh.hosting.zone"; + user = "web7dgkba_c9em8f"; + port = 2244; + }; }; };