diff --git a/flake.lock b/flake.lock index 9e4d3e6..04dbbac 100644 --- a/flake.lock +++ b/flake.lock @@ -136,11 +136,11 @@ ] }, "locked": { - "lastModified": 1691672736, - "narHash": "sha256-HNPA/dKHerA0p4OsToEcW/DtTSXBcK5gFRsy/yPgV/Y=", + "lastModified": 1692222899, + "narHash": "sha256-dHrv+lMUKFXLnzc/yYhEpNr34JYG8gwD4eH6qcrScFI=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e1eff9aac0e8d84bda7f2d60ba6108eea9b7e79", + "rev": "2471d965a3522025157a790fc49c3567fd56e26e", "type": "github" }, "original": { @@ -155,11 +155,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1691302749, - "narHash": "sha256-mak2sOtyT4LOcn6zPPMdaWH92tm9qC7Hta7+IaMmTGk=", + "lastModified": 1691843304, + "narHash": "sha256-aLAMpvbQPLkpjJDUWYTYRmEclAQTo+IVzqPQYOfmxfw=", "owner": "kmonad", "repo": "kmonad", - "rev": "ad69e1be793e61dce2d586481c0f6dda7d978c25", + "rev": "a05e93c62ca2c25cc81d76d9cf36880fe0bf183a", "type": "github" }, "original": { @@ -233,11 +233,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1691654369, - "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", + "lastModified": 1692174805, + "narHash": "sha256-xmNPFDi/AUMIxwgOH/IVom55Dks34u1g7sFKKebxUm0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", + "rev": "caac0eb6bdcad0b32cb2522e03e4002c8975c62e", "type": "github" }, "original": { @@ -249,11 +249,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1691186842, - "narHash": "sha256-wxBVCvZUwq+XS4N4t9NqsHV4E64cPVqQ2fdDISpjcw0=", + "lastModified": 1691990649, + "narHash": "sha256-gMbKOiX1HwClRP9lADaaV/lnZr93NEaOFe4ApDx/zd8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "18036c0be90f4e308ae3ebcab0e14aae0336fe42", + "rev": "6e287913f7b1ef537c97aa301b67c34ea46b640f", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1691674049, - "narHash": "sha256-M9SA4MZ3IuFCP4XI2IGAepvEYp3stmTwltUcnGu3Ml8=", + "lastModified": 1692189925, + "narHash": "sha256-Yt6jKh8YIu4WLnKDfdo9yNU+vS2NPGeAWk+7VfLUsxk=", "owner": "nix-community", "repo": "nixvim", - "rev": "36a6ab4ba7403dca50b2ca2de5fd5fd57fb19335", + "rev": "9f8ce75653d0c0a6d0175166e6dd0286a58fe5ef", "type": "github" }, "original": { @@ -338,11 +338,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1691256628, - "narHash": "sha256-M0YXHemR3zbyhM7PvJa5lzGhWVf6kM/fpZ4cWe/VIhI=", + "lastModified": 1691747570, + "narHash": "sha256-J3fnIwJtHVQ0tK2JMBv4oAmII+1mCdXdpeCxtIsrL2A=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "3139c4d1f7732cab89f06492bdd4677b877e3785", + "rev": "c5ac3aa3324bd8aebe8622a3fc92eeb3975d317a", "type": "github" }, "original": { diff --git a/hosts/Alaska/modules/forgejo.nix b/hosts/Alaska/modules/forgejo.nix index 4029114..7e3ac37 100644 --- a/hosts/Alaska/modules/forgejo.nix +++ b/hosts/Alaska/modules/forgejo.nix @@ -1,8 +1,18 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, fetchgit, ... }: +let + palenight = fetchgit { + url = "https://git.sainnhe.dev/sainnhe/gitea-themes.git"; + sparseCheckout = '' + dist + ''; + sha256 = pkgs.lib.fakeSha256; + }; +in { system.activationScripts.copyStuff = "cp -r ${../../../rsrcs/giteaCustomDir}/. /Aurora/Forgejo/custom"; + system.activationScripts.copyTheme = "cp ${palenight}/theme-palenight.css /Aurora/Forgejo/custom/css/theme-palenight.css" services.gitea = { enable = true; diff --git a/modules/neovim.nix b/modules/neovim.nix index 3f72362..f750ff0 100644 --- a/modules/neovim.nix +++ b/modules/neovim.nix @@ -35,19 +35,10 @@ in "o." = "Telescope file_browser"; "." = "Telescope find_files"; # cwd full sub-dir fuzzy find "of" = "Telescope live_grep"; # cwd search file - - "mo" = "Telescope harpoon marks"; # leacder + marks + open ; open harpoon marks in telescope - - "mr" = "lua require(\"harpoon.mark\").rm_file()"; # leader + mark + remove - "ma" = "lua require(\"harpoon.mark\").add_file()"; # leader + mark + add }; plugins = { - harpoon = { - enable = true; - }; - nvim-tree = { enable = true; openOnSetup = true; diff --git a/rsrcs/giteaCustomDir/public/css/theme-palenight.css b/rsrcs/giteaCustomDir/public/css/theme-palenight.css deleted file mode 100644 index 17539db..0000000 --- a/rsrcs/giteaCustomDir/public/css/theme-palenight.css +++ /dev/null @@ -1 +0,0 @@ -:root{--is-dark-theme:true;--color-primary:#89DDFF;--color-primary-contrast:#292D3E;--color-primary-dark-1:#89DDFF;--color-primary-dark-2:#92d9f8;--color-primary-dark-3:#9bd6f1;--color-primary-dark-4:#a4d2ea;--color-primary-dark-5:#adcee3;--color-primary-dark-6:#b6cbdc;--color-primary-dark-7:#BFC7D5;--color-primary-light-1:#89DDFF;--color-primary-light-2:#7ac1e0;--color-primary-light-3:#6ba5c2;--color-primary-light-4:#5c88a3;--color-primary-light-5:#4d6c84;--color-primary-light-6:#3e5066;--color-primary-light-7:#2f3447;--color-primary-alpha-10:rgba(137,221,255,0.1);--color-primary-alpha-20:rgba(137,221,255,0.2);--color-primary-alpha-30:rgba(137,221,255,0.3);--color-primary-alpha-40:rgba(137,221,255,0.4);--color-primary-alpha-50:rgba(137,221,255,0.5);--color-primary-alpha-60:rgba(137,221,255,0.6);--color-primary-alpha-70:rgba(137,221,255,0.7);--color-primary-alpha-80:rgba(137,221,255,0.8);--color-primary-alpha-90:rgba(137,221,255,0.9);--color-secondary:#353a50;--color-secondary-dark-1:#353a50;--color-secondary-dark-2:#40465b;--color-secondary-dark-3:#4c5266;--color-secondary-dark-4:#585d71;--color-secondary-dark-5:#63697c;--color-secondary-dark-6:#6f7587;--color-secondary-dark-7:#7a8193;--color-secondary-dark-8:#858c9e;--color-secondary-dark-9:#9198a9;--color-secondary-dark-10:#9da4b4;--color-secondary-dark-11:#a8afbf;--color-secondary-dark-12:#b4bbca;--color-secondary-dark-13:#BFC7D5;--color-secondary-light-1:#353a50;--color-secondary-light-2:#32374c;--color-secondary-light-3:#2f3447;--color-secondary-light-4:#2c3043;--color-secondary-alpha-10:rgba(53,58,80,0.1);--color-secondary-alpha-20:rgba(53,58,80,0.2);--color-secondary-alpha-30:rgba(53,58,80,0.3);--color-secondary-alpha-40:rgba(53,58,80,0.4);--color-secondary-alpha-50:rgba(53,58,80,0.5);--color-secondary-alpha-60:rgba(53,58,80,0.6);--color-secondary-alpha-70:rgba(53,58,80,0.7);--color-secondary-alpha-80:rgba(53,58,80,0.8);--color-secondary-alpha-90:rgba(53,58,80,0.9);--color-red:#FF5572;--color-orange:#FFCB6B;--color-yellow:#F78C6C;--color-olive:#C3E88D;--color-green:#C3E88D;--color-teal:#89DDFF;--color-blue:#82AAFF;--color-violet:#C792EA;--color-purple:#C792EA;--color-pink:#C792EA;--color-brown:#FFCB6B;--color-grey:#697098;--color-red-light:#FF5572;--color-orange-light:#FFCB6B;--color-yellow-light:#F78C6C;--color-olive-light:#C3E88D;--color-green-light:#C3E88D;--color-teal-light:#89DDFF;--color-blue-light:#82AAFF;--color-violet-light:#C792EA;--color-purple-light:#C792EA;--color-pink-light:#C792EA;--color-brown-light:#FFCB6B;--color-grey-light:#697098;--color-black:#2f3447;--color-gold:#FFCB6B;--color-white:#292D3E;--color-diff-removed-word-bg:#88414d;--color-diff-added-word-bg:#62774f;--color-diff-removed-row-bg:#55393d;--color-diff-moved-row-bg:#354157;--color-diff-added-row-bg:#394634;--color-diff-removed-row-border:#aa4758;--color-diff-moved-row-border:#5c76ab;--color-diff-added-row-border:#7e9761;--color-diff-inactive:#2f3447;--color-error-border:#aa4758;--color-error-bg:#55393d;--color-error-text:#FF5572;--color-success-border:#7e9761;--color-success-bg:#394634;--color-success-text:#C3E88D;--color-warning-border:#a3684e;--color-warning-bg:#4e432f;--color-warning-text:#F78C6C;--color-info-border:#5c76ab;--color-info-bg:#354157;--color-info-text:#82AAFF;--color-body:#292D3E;--color-box-header:#32374c;--color-box-body:#2c3043;--color-box-body-highlight:#2f3447;--color-text-dark:#C792EA;--color-text:#BFC7D5;--color-text-hover:rgba(191,199,213,0.8);--color-text-light:#82AAFF;--color-text-light-1:#697098;--color-text-light-2:#BFC7D5;--color-text-light-3:#697098;--color-footer:#2c3043;--color-timeline:#353a50;--color-input-text:#BFC7D5;--color-input-background:#292D3E;--color-input-toggle-background:#2c3043;--color-input-border:#353a50;--color-input-border-hover:#4f5574;--color-navbar:#2c3043;--color-navbar-transparent:#2c3043;--color-light:#2c3043;--color-light-mimic-enabled:rgba(0, 0, 0, calc(40 / 255 * 222 / 255 / var(--opacity-disabled)));--color-light-border:#353a50;--color-hover:rgba(53,58,80,0.5);--color-active:rgba(53,58,80,0.5);--color-menu:#2c3043;--color-card:#2c3043;--color-markup-table-row:#32374c;--color-markup-code-block:#292D3E;--color-button:#32374c;--color-code-bg:#292D3E;--color-code-sidebar-bg:#2c3043;--color-shadow:#00000060;--color-secondary-bg:#2c3043;--color-text-focus:#fff;--color-expand-button:#2f3447;--color-placeholder-text:#697098;--color-editor-line-highlight:#2c3043;--color-project-board-bg:#292D3E;--color-project-board-light-label:#89DDFF;--color-caret:var(--color-text);--color-reaction-bg:#ffffff12;--color-reaction-active-bg:var(--color-primary-alpha-40);--color-header-bar:#2c3043;--color-label-active-bg:#353a50;--color-accent:var(--color-primary-light-1);--color-small-accent:var(--color-primary-light-5);--color-active-line:#2c3043;accent-color:var(--color-accent);color-scheme:dark}.chroma .nx{color:#BFC7D5}.chroma .c,.chroma .c1,.chroma .ch,.chroma .cm,.chroma .sd{color:#697098}.chroma .k,.chroma .kc,.chroma .kd,.chroma .kn,.chroma .kp,.chroma .kr{color:#C792EA}.chroma .o,.chroma .ow{color:#82AAFF}.chroma .s,.chroma .s1,.chroma .s2,.chroma .sa,.chroma .sb,.chroma .sc,.chroma .sh,.chroma .si,.chroma .sr,.chroma .ss,.chroma .sx,.chroma .nt,.chroma .cpf{color:#C3E88D}.chroma .m,.chroma .mb,.chroma .mf,.chroma .mh,.chroma .mi,.chroma .mo,.chroma .nl{color:#FF5572}.chroma .kt,.chroma .nc,.chroma .nn,.chroma .nv{color:#F78C6C}.chroma .nf,.chroma .nb,.chroma .na{color:#89DDFF}.chroma .bp,.chroma .cp,.chroma .ne,.chroma .nd,.chroma .se{color:#FFCB6B}.ui.primary.button,.ui.primary.buttons .button{background:#82AAFF;background-color:#82AAFF !important;color:#292D3E}.ui.primary.button:hover,.ui.primary.buttons .button:hover{background:rgba(130,170,255,0.8);background-color:rgba(130,170,255,0.8) !important;color:#292D3E}.ui.green.buttons .button,.ui.green.button{background:#C3E88D;background-color:#C3E88D;color:#292D3E}.ui.green.buttons .button:hover,.ui.green.button:hover{background:rgba(195,232,141,0.8);background-color:rgba(195,232,141,0.8);color:#292D3E}.ui.labeled.button.disabled>.button,.ui.basic.buttons .button,.ui.basic.button{color:#C792EA}.ui.labeled.button.disabled>.button:hover,.ui.basic.buttons .button:hover,.ui.basic.button:hover{color:#C792EA}.repo-title{color:#C792EA}.repo-buttons button[disabled]~.label,.repo-buttons .ui.labeled.button.disabled>.label{color:#89DDFF}.ui.basic.labels .label,.ui.basic.label{color:#89DDFF}.repository .ui.segment.sub-menu .list .item a:hover,.ui.tabular.menu .item:hover{color:var(--color-text-hover)}.ui.primary.labels .label,.ui.ui.ui.primary.label{color:#292D3E}.ui.green.labels .label,.ui.ui.ui.green.label{color:#292D3E}i.grey.icon.icon.icon.icon{color:#697098}*{scrollbar-color:#C792EA transparent !important}::-webkit-scrollbar{width:10px;height:10px}::-webkit-scrollbar-thumb{box-shadow:inset 0 0 0 6px #C792EA !important;border:2px solid transparent;border-radius:5px !important}::-webkit-scrollbar-thumb:window-inactive{box-shadow:inset 0 0 0 6px #C792EA !important}::-webkit-scrollbar-thumb:hover{box-shadow:inset 0 0 0 6px #C792EA !important}::-webkit-scrollbar-corner{background:transparent}.ui.red.labels .label,.ui.ui.ui.red.label,.ui.red.button,.ui.red.buttons .button{background:#FF5572;background-color:#FF5572;color:#292D3E}.ui.red.labels .label:hover,.ui.ui.ui.red.label:hover,.ui.red.button:hover,.ui.red.buttons .button:hover{background:rgba(255,85,114,0.8);background-color:rgba(255,85,114,0.8);color:#292D3E}.ui.grey.labels .label,.ui.ui.ui.grey.label,.ui.grey.button,.ui.grey.buttons .button{color:#292D3E}.ui.grey.labels .label:hover,.ui.ui.ui.grey.label:hover,.ui.grey.button:hover,.ui.grey.buttons .button:hover{color:#292D3E}.ui.orange.labels .label,.ui.ui.ui.orange.label,.ui.orange.button,.ui.orange.buttons .button{background:#FFCB6B;background-color:#FFCB6B;color:#292D3E}.ui.orange.labels .label:hover,.ui.ui.ui.orange.label:hover,.ui.orange.button:hover,.ui.orange.buttons .button:hover{background:rgba(255,203,107,0.8);background-color:rgba(255,203,107,0.8);color:#292D3E} \ No newline at end of file diff --git a/rsrcs/nvim.lua b/rsrcs/nvim.lua index b1f4268..09d1ca2 100644 --- a/rsrcs/nvim.lua +++ b/rsrcs/nvim.lua @@ -131,7 +131,6 @@ end, {remap=true}) require("telescope").load_extension "file_browser" -require("telescope").load_extension("harpoon") -- Themeing require("monokai-pro").setup({ diff --git a/users/nixolas.nix b/users/nixolas.nix index 1bb8966..730af30 100644 --- a/users/nixolas.nix +++ b/users/nixolas.nix @@ -75,6 +75,7 @@ in # (pkgs.callPackage ./../modules/minecraft-bedrock/minecraft-bedrock-server.nix {}) # the possible minecraft-bedrock-server package for testing # utilities bat # cat with wings (better cat) + bottom # system monitor du-dust # directory disk-space analyzer ffmpeg-full # ffmpeg for video/audio rendering frei0r # kdenlive video plugins