diff --git a/.drone.yml b/.drone.yml
index 2a9c496d..35f2e30d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -111,9 +111,8 @@ steps:
- nix run nixpkgs#gnused -- --in-place "s/$ISO_NAME/PubSolarOS-latest.iso/" PubSolarOS-latest.iso.sha256
- name: "Publish ISO"
- # custom drone-scp image, source: https://git.b12f.io/pub-solar/drone-scp/
- # docker build --tag registry.greenbaum.cloud/library/drone-scp:v1.6.5 --file ./docker/Dockerfile.linux.amd64 .
- image: registry.greenbaum.cloud/library/drone-scp:v1.6.5
+ # https://github.com/appleboy/drone-scp/pull/141 got merged, yay
+ image: appleboy/drone-scp:1.6.5-linux-amd64
volumes:
- name: file-exchange
path: /var/nix/iso-cache
@@ -126,7 +125,7 @@ steps:
from_secret: iso_web_ssh_port
key:
from_secret: iso_web_ssh_key
- target: /srv/www/os/download
+ target: /data/srv/www/os/download
source:
- /var/nix/iso-cache/*.iso
- /var/nix/iso-cache/*.iso.sha256
@@ -148,6 +147,6 @@ volumes:
---
kind: signature
-hmac: 0c0994f0878cdb49172772f78c9a772f5c75830b49c1c22bd15db385fe857e17
+hmac: 6aee0ffe22111bb629c0a79940bfbc3fa75f68c5ed5c4bba68abf6797b87a7ab
...
diff --git a/flake.lock b/flake.lock
index e02ce1ac..42ee1e79 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
]
},
"locked": {
- "lastModified": 1677126346,
- "narHash": "sha256-4s+PPGC1M07QsPyeye5drc2JLa1lhDnCV3XAsG8+pH4=",
+ "lastModified": 1680281360,
+ "narHash": "sha256-XdLTgAzjJNDhAG2V+++0bHpSzfvArvr2pW6omiFfEJk=",
"owner": "ryantm",
"repo": "agenix",
- "rev": "c2a71c83c70844c5e31db69347e86af080bcdad0",
+ "rev": "e64961977f60388dd0b49572bb0fc453b871f896",
"type": "github"
},
"original": {
@@ -30,11 +30,11 @@
]
},
"locked": {
- "lastModified": 1673295039,
- "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
+ "lastModified": 1680266963,
+ "narHash": "sha256-IW/lzbUCOcldLHWHjNSg1YoViDnZOmz0ZJL7EH9OkV8=",
"owner": "LnL7",
"repo": "nix-darwin",
- "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
+ "rev": "99d4187d11be86b49baa3a1aec0530004072374f",
"type": "github"
},
"original": {
@@ -324,11 +324,11 @@
"utils": "utils_2"
},
"locked": {
- "lastModified": 1676257154,
- "narHash": "sha256-eW3jymNLpdxS5fkp9NWKyNtgL0Gqtgg1vCTofKXDF1g=",
+ "lastModified": 1679738842,
+ "narHash": "sha256-CvqRbsyDW756EskojZptDU590rez29RcHDV3ezoze08=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "2cb27c79117a2a75ff3416c3199a2dc57af6a527",
+ "rev": "83110c259889230b324bb2d35bef78bf5f214a1f",
"type": "github"
},
"original": {
@@ -340,11 +340,11 @@
},
"latest": {
"locked": {
- "lastModified": 1677063315,
- "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=",
+ "lastModified": 1680213900,
+ "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "988cc958c57ce4350ec248d2d53087777f9e1949",
+ "rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
"type": "github"
},
"original": {
@@ -356,11 +356,11 @@
},
"master": {
"locked": {
- "lastModified": 1677244726,
- "narHash": "sha256-lwzie+EgYjPianeH82eb0mEDPOmOcXqlOR5lBZ7dkkM=",
+ "lastModified": 1680514745,
+ "narHash": "sha256-5RUDdGhHxKKgHzzroHXuQkEu5S0lNxWyvxyzK6PHCCg=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "566169a4eaca1513d4fd396c239367b869fcdb0c",
+ "rev": "d846d8e2ec0461a141c01087d304502ddb341664",
"type": "github"
},
"original": {
@@ -372,11 +372,11 @@
},
"nixlib": {
"locked": {
- "lastModified": 1636849918,
- "narHash": "sha256-nzUK6dPcTmNVrgTAC1EOybSMsrcx+QrVPyqRdyKLkjA=",
+ "lastModified": 1679187309,
+ "narHash": "sha256-H8udmkg5wppL11d/05MMzOMryiYvc403axjDNZy1/TQ=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
- "rev": "28a5b0557f14124608db68d3ee1f77e9329e9dd5",
+ "rev": "44214417fe4595438b31bdb9469be92536a61455",
"type": "github"
},
"original": {
@@ -387,11 +387,11 @@
},
"nixos": {
"locked": {
- "lastModified": 1677075010,
- "narHash": "sha256-X+UmR1AkdR//lPVcShmLy8p1n857IGf7y+cyCArp8bU=",
+ "lastModified": 1680334310,
+ "narHash": "sha256-ISWz16oGxBhF7wqAxefMPwFag6SlsA9up8muV79V9ck=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "c95bf18beba4290af25c60cbaaceea1110d0f727",
+ "rev": "884e3b68be02ff9d61a042bc9bd9dd2a358f95da",
"type": "github"
},
"original": {
@@ -407,11 +407,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1676297861,
- "narHash": "sha256-YECUmK34xzg0IERpnbCnaO6z6YgfecJlstMWX7dqOZ8=",
+ "lastModified": 1679464055,
+ "narHash": "sha256-RiZpwkbm1GeKRqrTtGGsEDieJyplMSRG1bQzOZgY378=",
"owner": "nix-community",
"repo": "nixos-generators",
- "rev": "1e0a05219f2a557d4622bc38f542abb360518795",
+ "rev": "d5cd198c80ee62a801a078ad991c99c0175971cf",
"type": "github"
},
"original": {
@@ -422,11 +422,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1677232326,
- "narHash": "sha256-rAk2/80kLvA3yIMmSV86T1B4kNvwCFMSQ1FxXndaUB0=",
+ "lastModified": 1680070330,
+ "narHash": "sha256-aoT2YZCd9LEtiEULFLIF0ykKydgE72X8gw/k9/pRS5I=",
"owner": "nixos",
"repo": "nixos-hardware",
- "rev": "2d44015779cced4eec9df5b8dab238b9f6312cb2",
+ "rev": "a6aa8174fa61e55bd7e62d35464d3092aefe0421",
"type": "github"
},
"original": {
@@ -437,11 +437,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1637186689,
- "narHash": "sha256-NU7BhgnwA/3ibmCeSzFK6xGi+Bari9mPfn+4cBmyEjw=",
+ "lastModified": 1679198465,
+ "narHash": "sha256-VfXpHpniNWgg7pBzxb20pRX7kqn80LApPDQYTReiFCw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "7fad01d9d5a3f82081c00fb57918d64145dc904c",
+ "rev": "5a05160f7671434e1c833b1b01284b876e04eca4",
"type": "github"
},
"original": {
@@ -499,18 +499,6 @@
"type": "github"
}
},
- "nur": {
- "locked": {
- "lastModified": 0,
- "narHash": "sha256-koC6DBYmLCrgXA+AMHVaODf1uHYPmvcFygHfy3eg6vI=",
- "path": "/nix/store/6mfkswqi67m35qwv0vh7kpk8rypbl2rq-source",
- "type": "path"
- },
- "original": {
- "id": "nur",
- "type": "indirect"
- }
- },
"pub-solar": {
"locked": {
"lastModified": 1654372286,
@@ -540,7 +528,6 @@
"nixos": "nixos",
"nixos-generators": "nixos-generators",
"nixos-hardware": "nixos-hardware",
- "nur": "nur",
"pub-solar": "pub-solar",
"scan2paperless": "scan2paperless"
}
diff --git a/flake.nix b/flake.nix
index 426e9680..c4f25570 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,7 +50,6 @@
nixos,
home,
nixos-hardware,
- nur,
agenix,
deploy,
scan2paperless,
@@ -83,7 +82,6 @@
our = self.lib;
});
})
- nur.overlay
agenix.overlays.default
(import ./pkgs)
diff --git a/modules/core/boot.nix b/modules/core/boot.nix
index 0a7fc412..4f82a4b0 100644
--- a/modules/core/boot.nix
+++ b/modules/core/boot.nix
@@ -33,10 +33,10 @@ in {
};
};
- loader.systemd-boot.enable = true;
+ loader.systemd-boot.enable = lib.mkDefault true;
# Use latest LTS linux kernel by default
- kernelPackages = pkgs.linuxPackages_5_15;
+ kernelPackages = lib.mkDefault pkgs.linuxPackages_5_15;
# Support ntfs drives
supportedFilesystems = ["ntfs"];
diff --git a/modules/core/hibernation.nix b/modules/core/hibernation.nix
index c0dd97bb..74befd77 100644
--- a/modules/core/hibernation.nix
+++ b/modules/core/hibernation.nix
@@ -15,8 +15,8 @@ in {
};
resumeDevice = mkOption {
- type = types.str;
- default = "/dev/sda1";
+ type = types.nullOr types.str;
+ default = null;
description = "The location of the hibernation resume swap file.";
};
@@ -29,7 +29,7 @@ in {
config = {
boot = mkIf cfg.enable {
- resumeDevice = cfg.resumeDevice;
+ resumeDevice = mkIf (cfg.resumeDevice != null) cfg.resumeDevice;
kernelParams = mkIf (cfg.resumeOffset != null) ["resume_offset=${builtins.toString cfg.resumeOffset}"];
};
};
diff --git a/modules/core/services.nix b/modules/core/services.nix
index 7a825bc8..2d53dd74 100644
--- a/modules/core/services.nix
+++ b/modules/core/services.nix
@@ -10,7 +10,7 @@
# If you don't want the host to have SSH actually opened up to the net,
# set `services.openssh.openFirewall` to false in your config.
openFirewall = lib.mkDefault true;
- passwordAuthentication = false;
+ passwordAuthentication = lib.mkDefault false;
};
# Service that makes Out of Memory Killer more effective
diff --git a/modules/terminal-life/default.nix b/modules/terminal-life/default.nix
index a47c4d2b..d79079a8 100644
--- a/modules/terminal-life/default.nix
+++ b/modules/terminal-life/default.nix
@@ -58,6 +58,7 @@ in {
inherit config;
inherit pkgs;
inherit self;
+ inherit lib;
};
programs.fzf = import ./fzf {
inherit config;
diff --git a/modules/terminal-life/nvim/default.nix b/modules/terminal-life/nvim/default.nix
index 434ed4ad..6f708f78 100644
--- a/modules/terminal-life/nvim/default.nix
+++ b/modules/terminal-life/nvim/default.nix
@@ -1,6 +1,7 @@
{
config,
pkgs,
+ lib,
...
}: let
psCfg = config.pub-solar;
@@ -42,63 +43,65 @@ in {
universal-ctags
];
- plugins = with pkgs.vimPlugins; [
- nvim-cmp
- cmp-nvim-lsp
- cmp_luasnip
- luasnip
+ plugins = with pkgs.vimPlugins;
+ []
+ ++ lib.optionals (!cfg.lite) [
+ nvim-cmp
+ cmp-nvim-lsp
+ cmp_luasnip
+ luasnip
- lsp_extensions-nvim
- nvim-lspconfig
+ lsp_extensions-nvim
+ nvim-lspconfig
- instant-nvim-nvfetcher
+ instant-nvim-nvfetcher
- ack-vim
- vim-airline
- editorconfig-vim
- nnn-vim
- quick-scope
- suda-vim
- syntastic
- vim-vinegar
- vim-workspace-nvfetcher
+ ack-vim
+ vim-airline
+ editorconfig-vim
+ nnn-vim
+ quick-scope
+ suda-vim
+ syntastic
+ vim-vinegar
+ vim-workspace-nvfetcher
- sonokai
- vim-hybrid-material
- vim-airline-themes
- vim-apprentice-nvfetcher
+ sonokai
+ vim-hybrid-material
+ vim-airline-themes
+ vim-apprentice-nvfetcher
- fugitive
- vim-gitgutter
- vim-rhubarb
- vimagit-nvfetcher
+ fugitive
+ vim-gitgutter
+ vim-rhubarb
+ vimagit-nvfetcher
- fzf-vim
- fzfWrapper
- vim-highlightedyank
+ fzf-vim
+ fzfWrapper
+ vim-highlightedyank
- vim-beautify-nvfetcher
- vim-surround
+ vim-beautify-nvfetcher
+ vim-surround
- vim-bufkill
- vim-sensible
+ vim-bufkill
+ vim-sensible
- ansible-vim
- emmet-vim
- rust-vim
- vim-caddyfile-nvfetcher
- vim-go
- vim-javascript
- vim-json
- SchemaStore-nvim
- vim-markdown
- vim-nix
- vim-nixhash
- vim-ruby
- vim-toml
- vim-vue
- yats-vim
- ];
+ ansible-vim
+ emmet-vim
+ rust-vim
+ vim-caddyfile-nvfetcher
+ vim-go
+ vim-javascript
+ vim-json
+ SchemaStore-nvim
+ vim-markdown
+ vim-nix
+ vim-nixhash
+ vim-ruby
+ vim-toml
+ vim-vue
+ yats-vim
+ ];
extraConfig = builtins.concatStringsSep "\n" [
''
diff --git a/modules/terminal-life/nvim/preview-file.nix b/modules/terminal-life/nvim/preview-file.nix
index bc9e9aa5..2a52bdd8 100644
--- a/modules/terminal-life/nvim/preview-file.nix
+++ b/modules/terminal-life/nvim/preview-file.nix
@@ -31,6 +31,6 @@ with self; ''
--style="''${BAT_STYLE:-numbers}" \
--color=always \
--pager=never \
- --file-name=''$FILE \
+ --file-name="''$FILE" \
--highlight-line=$CENTER
''
diff --git a/overlays/waybar.nix b/overlays/waybar.nix
new file mode 100644
index 00000000..075f5d3e
--- /dev/null
+++ b/overlays/waybar.nix
@@ -0,0 +1,5 @@
+channels: final: prev: {
+ waybar = channels.latest.waybar.overrideAttrs (oldAttrs: rec {
+ inherit (prev.sources.waybar-nvfetcher) version src;
+ });
+}
diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix
index fb4a336e..addb0e89 100644
--- a/pkgs/_sources/generated.nix
+++ b/pkgs/_sources/generated.nix
@@ -6,13 +6,13 @@
}: {
F-Sy-H = {
pname = "F-Sy-H";
- version = "b935a87a75560f8173dd78deee6717c59d464e06";
+ version = "899f68b52b6b86a36cd8178eb0e9782d4aeda714";
src = fetchFromGitHub {
owner = "z-shell";
repo = "F-Sy-H";
- rev = "b935a87a75560f8173dd78deee6717c59d464e06";
+ rev = "899f68b52b6b86a36cd8178eb0e9782d4aeda714";
fetchSubmodules = false;
- sha256 = "sha256-448OlDnrDkUjvaSLDhXsa9bkgYXzj1Ju8CTpJVjH8LM=";
+ sha256 = "sha256-zhaXjrNL0amxexbZm4Kr5Y/feq1+2zW0O6eo9iZhmi0=";
};
};
instant-nvim-nvfetcher = {
@@ -39,46 +39,46 @@
};
ohmyzsh = {
pname = "ohmyzsh";
- version = "65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf";
+ version = "b602e0a066d8c98e8c02201ad16c764447fd8531";
src = fetchFromGitHub {
owner = "ohmyzsh";
repo = "ohmyzsh";
- rev = "65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf";
+ rev = "b602e0a066d8c98e8c02201ad16c764447fd8531";
fetchSubmodules = false;
- sha256 = "sha256-qyI7CU0vKhhADZfQtD73GsyAbqdMPhDQ1uA03h4erpw=";
+ sha256 = "sha256-O4thanOQpX/DHPdfW2p/RUXzIPj6GUp9EnKJfkh7yQM=";
};
};
powerlevel10k = {
pname = "powerlevel10k";
- version = "8091c8a3a8a845c70046684235a01cd500075def";
+ version = "a30145b0f82d06770e924e9eac064ed223a94e6b";
src = fetchFromGitHub {
owner = "romkatv";
repo = "powerlevel10k";
- rev = "8091c8a3a8a845c70046684235a01cd500075def";
+ rev = "a30145b0f82d06770e924e9eac064ed223a94e6b";
fetchSubmodules = false;
- sha256 = "sha256-I0/tktXCbZ3hMYTNvPoWfOEYWRgmHoXsar/jcUB6bpo=";
+ sha256 = "sha256-jnZXLrywUrJgTX1tFpoNH94r/jcGl2P6R7DoedluHxQ=";
};
};
rnix-lsp-nvfetcher = {
pname = "rnix-lsp-nvfetcher";
- version = "6925256babec4307479a4080b44f2be38056f210";
+ version = "95d40673fe43642e2e1144341e86d0036abd95d9";
src = fetchFromGitHub {
owner = "nix-community";
repo = "rnix-lsp";
- rev = "6925256babec4307479a4080b44f2be38056f210";
+ rev = "95d40673fe43642e2e1144341e86d0036abd95d9";
fetchSubmodules = false;
- sha256 = "sha256-OKLyIXIXhUnRB3Xw+7zI3u6XkwF7Mrbfz1XaasV6i7Q=";
+ sha256 = "sha256-F0s0m62S5bHNVWNHLZD6SeHiLrsDx98VQbRjDyIu+qQ=";
};
};
vim-apprentice-nvfetcher = {
pname = "vim-apprentice-nvfetcher";
- version = "9942d0bb0a5d82f7a24450b00051c1f2cc008659";
+ version = "59ad13661fa15edaf72c62218903c7817b5a3691";
src = fetchFromGitHub {
owner = "romainl";
repo = "Apprentice";
- rev = "9942d0bb0a5d82f7a24450b00051c1f2cc008659";
+ rev = "59ad13661fa15edaf72c62218903c7817b5a3691";
fetchSubmodules = false;
- sha256 = "sha256-Xs+vTdnihNbBFPOKsW+NB40pqN9eaadqzc0DIeNoOFo=";
+ sha256 = "sha256-03B9tmU9+6t2hxhOgZxBqJr9r41CAqhHLUkHYvFdcks=";
};
};
vim-beautify-nvfetcher = {
@@ -125,6 +125,17 @@
sha256 = "sha256-fhazQQqyFaO0fdoeNI9nBshwTDhKNHH262H/QThtuO0=";
};
};
+ waybar-nvfetcher = {
+ pname = "waybar-nvfetcher";
+ version = "09142fa322e080474de0f2dc3ea98036846550df";
+ src = fetchFromGitHub {
+ owner = "Alexays";
+ repo = "Waybar";
+ rev = "09142fa322e080474de0f2dc3ea98036846550df";
+ fetchSubmodules = false;
+ sha256 = "sha256-5KqQaaKwW14F/rVWGQ0qBUU0b3Z+v/Mq8lnSwqLtT7U=";
+ };
+ };
zsh-nix-shell = {
pname = "zsh-nix-shell";
version = "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08";
diff --git a/pkgs/sources.toml b/pkgs/sources.toml
index 5ec5e936..183c914b 100644
--- a/pkgs/sources.toml
+++ b/pkgs/sources.toml
@@ -46,3 +46,7 @@ fetch.github = "zeekay/vim-beautify"
[vim-apprentice-nvfetcher]
src.git = "https://github.com/romainl/Apprentice"
fetch.github = "romainl/Apprentice"
+
+[waybar-nvfetcher]
+src.git = "https://github.com/Alexays/Waybar"
+fetch.github = "Alexays/Waybar"
diff --git a/profiles/base-user/.config/waybar/config b/profiles/base-user/.config/waybar/config
index 77bb74b8..5dead19b 100644
--- a/profiles/base-user/.config/waybar/config
+++ b/profiles/base-user/.config/waybar/config
@@ -26,8 +26,22 @@
"spacing": 10
},
"clock": {
- "tooltip-format": "{:%Y %B}\n{calendar}",
- "format-alt": "{:%a %d. %h %H:%M}"
+ "tooltip-format": "{calendar}",
+ "format-alt": "{:%a %d. %h %H:%M}",
+ //"on-scroll": {
+ // "calendar": 1
+ //}
+ "calendar": {
+ "mode-mon-col" : 3,
+ "on-scroll": -1,
+ "on-click-right": "mode",
+ "format": {
+ "months": "{}",
+ "days": "{}",
+ "weekdays": "{}",
+ "today": "{}"
+ },
+ },
},
"backlight": {
// "device": "acpi_video1",
diff --git a/profiles/base-user/.config/waybar/style.css b/profiles/base-user/.config/waybar/style.css
index ef85a95a..31b2aab2 100644
--- a/profiles/base-user/.config/waybar/style.css
+++ b/profiles/base-user/.config/waybar/style.css
@@ -6,7 +6,7 @@
}
window#waybar {
- font-family: Hack;
+ font-family: Hack, FontAwesome;
font-weight: 500;
font-size: 14px;
background: rgba(11, 12, 13, 0.90);
diff --git a/profiles/base-user/session-variables.nix b/profiles/base-user/session-variables.nix
index 5bac79c1..fb816046 100644
--- a/profiles/base-user/session-variables.nix
+++ b/profiles/base-user/session-variables.nix
@@ -83,6 +83,9 @@
# TELEMETRY BS
VUEDX_TELEMETRY = "off";
+
+ # FZF shell history widget default colors
+ FZF_DEFAULT_OPTS = "--color=bg+:#2d2a2e,bg:#1a181a,spinner:#ef9062,hl:#7accd7 --color=fg:#d3d1d4,header:#7accd7,info:#e5c463,pointer:#ef9062 --color=marker:#ef9062,fg+:#d3d1d4,prompt:#e5c463,hl+:#7accd7";
};
envListNames = lib.attrsets.mapAttrsToList (name: value: name) variables;