From 858fd257a4d36769289849c98f6805076c2304c2 Mon Sep 17 00:00:00 2001 From: Hendrik Sokolowski Date: Mon, 26 Dec 2022 15:08:02 +0100 Subject: [PATCH 1/7] define settings as defaults --- modules/core/boot.nix | 4 ++-- modules/core/services.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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/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 From 1c6a726d0123a9f80aa8afcc24da9b5b857532ed Mon Sep 17 00:00:00 2001 From: Hendrik Sokolowski Date: Mon, 26 Dec 2022 15:06:47 +0100 Subject: [PATCH 2/7] remove packages from lite mode --- modules/terminal-life/default.nix | 1 + modules/terminal-life/nvim/default.nix | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/terminal-life/default.nix b/modules/terminal-life/default.nix index 3b58243f..083f05e9 100644 --- a/modules/terminal-life/default.nix +++ b/modules/terminal-life/default.nix @@ -55,6 +55,7 @@ in { programs.neovim = import ./nvim { inherit config; inherit pkgs; + 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 93c8b15b..e1bfd4e6 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,7 +43,8 @@ in { universal-ctags ]; - plugins = with pkgs.vimPlugins; [ + plugins = with pkgs.vimPlugins; [ ] + ++ lib.optionals (!cfg.lite) [ nvim-cmp cmp-nvim-lsp cmp_luasnip From 25126fd8cacaf0b83eca6d56e30a1994bb9a874e Mon Sep 17 00:00:00 2001 From: Hendrik Sokolowski Date: Wed, 2 Nov 2022 20:55:05 +0100 Subject: [PATCH 3/7] Make resumeDevice optional --- modules/core/hibernation.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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}"]; }; }; From a301a91d24b3fdab4673c7f7cddc27545aa2a24e Mon Sep 17 00:00:00 2001 From: teutat3s Date: Tue, 28 Feb 2023 14:00:56 +0100 Subject: [PATCH 4/7] waybar: fix icon size --- profiles/base-user/.config/waybar/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); From a3c4719f9b3eaca57ee96ee83f0d349346b3be10 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Tue, 28 Feb 2023 13:59:38 +0100 Subject: [PATCH 5/7] waybar: use nvfetcher to get most recent version from master branch Want improved calendar view on right-click and scrolling through months --- overlays/waybar.nix | 5 +++ pkgs/_sources/generated.nix | 41 +++++++++++++++--------- pkgs/sources.toml | 4 +++ profiles/base-user/.config/waybar/config | 18 +++++++++-- 4 files changed, 51 insertions(+), 17 deletions(-) create mode 100644 overlays/waybar.nix 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", From 803c495778838f20a821497d771f70fb4ed10993 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sun, 5 Mar 2023 23:59:24 +0100 Subject: [PATCH 6/7] ci: upload ISO images to bigger /data disk --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index c554978e..35f2e30d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -125,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 @@ -147,6 +147,6 @@ volumes: --- kind: signature -hmac: d6187b243c1939eaf2803830e784aa89dd20edda9ba205940cf6caa2c615b6c6 +hmac: 6aee0ffe22111bb629c0a79940bfbc3fa75f68c5ed5c4bba68abf6797b87a7ab ... From 1f5b2b9d10628b3988774eafdcd0c929af2043d5 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Sun, 26 Mar 2023 15:14:33 +0200 Subject: [PATCH 7/7] flake: Remove nur It was perhaps added manually, not sure if the overlay was actually useful to anyone. --- flake.lock | 15 +-------------- flake.nix | 2 -- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 9602605f..dc21773b 100644 --- a/flake.lock +++ b/flake.lock @@ -282,18 +282,6 @@ "type": "github" } }, - "nur": { - "locked": { - "lastModified": 0, - "narHash": "sha256-koC6DBYmLCrgXA+AMHVaODf1uHYPmvcFygHfy3eg6vI=", - "path": "/nix/store/6mfkswqi67m35qwv0vh7kpk8rypbl2rq-source", - "type": "path" - }, - "original": { - "id": "nur", - "type": "indirect" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -304,8 +292,7 @@ "home": "home", "latest": "latest", "nixos": "nixos", - "nixos-hardware": "nixos-hardware", - "nur": "nur" + "nixos-hardware": "nixos-hardware" } }, "utils": { diff --git a/flake.nix b/flake.nix index d1f2599b..bd494148 100644 --- a/flake.nix +++ b/flake.nix @@ -44,7 +44,6 @@ nixos, home, nixos-hardware, - nur, agenix, deploy, ... @@ -76,7 +75,6 @@ our = self.lib; }); }) - nur.overlay agenix.overlays.default (import ./pkgs)