diff --git a/colors.sh b/colors.sh index 1b71fdb..d7ccfdc 100644 --- a/colors.sh +++ b/colors.sh @@ -79,99 +79,3 @@ printf "\033]4;14;#74C7EC\007" # FFFFFF # White 15 printf "\033]4;15;#FFFFFF\007" - -# NEW COLORS 20241101 -# -# Nr # R G B H S B # Name -# FG # 250 250 250 0 0 98 # Daisy (White) -printf "\033]10;#FAFAFA\007" -# BG # 19 19 19 0 0 7 # - -printf "\033]11;#131313\007" - -# Regular colors (0-7) - -# Nr # R G B H S B # Name -# 0 # 61 61 61 0 0 24 # - (Black) -printf "\033]4;0;#3D3D3D\007" -# 1 # 186 19 61 345 90 73 # - (Red) -printf "\033]4;1;#BA133D\007" -# 2 # 61 186 19 105 90 73 # - (Green) -printf "\033]4;2;#3DBA13\007" -# 3 # 186 144 19 45 90 73 # - (Yellow) -printf "\033]4;3;#BA9013\007" -# 4 # 19 61 186 225 90 73 # - (Blue) -printf "\033]4;4;#133DBA\007" -# 5 # 144 19 186 285 90 73 # - (Magenta) -printf "\033]4;5;#9013BA\007" -# 6 # 19 186 144 165 90 73 # - (Cyan) -printf "\033]4;6;#13BA90\007" -# 7 # 186 186 186 0 0 73 # - (White) -printf "\033]4;7;#BABABA\007" - -# Bright colors (8-15) - -# Nr # R G B H S B # Name -# 8 # 122 122 122 0 0 48 # - (Black) -printf "\033]4;8;#363636\007" -# 9 # 250 25 81 345 90 98 # - (Red) -printf "\033]4;9;#FA1951\007" -# 10 # 81 250 25 105 90 98 # - (Green) -printf "\033]4;10;#51FA19\007" -# 11 # 250 194 25 45 90 98 # - (Yellow) -printf "\033]4;11;#FAC219\007" -# 12 # 25 81 250 225 90 98 # - (Blue) -printf "\033]4;12;#1951FA\007" -# 13 # 194 25 250 285 90 98 # - (Magenta) -printf "\033]4;13;#C219FA\007" -# 14 # 25 259 194 165 90 98 # - (Cyan) -printf "\033]4;14;#19FAC2\007" -# 15 # 250 250 250 0 0 98 # - (White) -printf "\033]4;15;#FAFAFA\007" - -# BRIGHTER -# -# Nr # R G B H S B # Name -# FG # 250 250 250 0 0 98 # Daisy (White) -printf "\033]11;#FAFAFA\007" -# BG # 19 19 19 0 0 7 # - -printf "\033]10;#131313\007" - -# Regular colors (0-7) - -# Nr # R G B H S B # Name -# 0 # 61 61 61 0 0 24 # - (Black) -printf "\033]4;0;#3D3D3D\007" -# 1 # 186 19 61 345 90 73 # - (Red) -printf "\033]4;1;#E62E4D\007" -# 2 # 61 186 19 105 90 73 # - (Green) -printf "\033]4;2;#4DE62E\007" -# 3 # 186 144 19 45 90 73 # - (Yellow) -printf "\033]4;3;#E6C72E\007" -# 4 # 19 61 186 225 90 73 # - (Blue) -printf "\033]4;4;#2E4CE6\007" -# 5 # 144 19 186 285 90 73 # - (Magenta) -printf "\033]4;5;#C52DE3\007" -# 6 # 19 186 144 165 90 73 # - (Cyan) -printf "\033]4;6;#2EE6C7\007" -# 7 # 186 186 186 0 0 73 # - (White) -printf "\033]4;7;#BABABA\007" - -# Bright colors (8-15) - -# Nr # R G B H S B # Name -# 8 # 122 122 122 0 0 48 # - (Black) -printf "\033]4;8;#7A7A7A\007" -# 9 # 250 25 81 345 90 98 # - (Red) -printf "\033]4;9;#FF002B\007" -# 10 # 81 250 25 105 90 98 # - (Green) -printf "\033]4;10;#2BFF00\007" -# 11 # 250 194 25 45 90 98 # - (Yellow) -printf "\033]4;11;#FFd500\007" -# 12 # 25 81 250 225 90 98 # - (Blue) -printf "\033]4;12;#002AFF\007" -# 13 # 194 25 250 285 90 98 # - (Magenta) -printf "\033]4;13;#D400FF\007" -# 14 # 25 259 194 165 90 98 # - (Cyan) -printf "\033]4;14;#00FFC0\007" -# 15 # 250 250 250 0 0 98 # - (White) -printf "\033]4;15;#FAFAFA\007" diff --git a/nixos/flake.lock b/nixos/flake.lock index 1a1cf80..91147eb 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -1,15 +1,54 @@ { "nodes": { + "devshell": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1713532798, + "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", + "owner": "numtide", + "repo": "devshell", + "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -25,11 +64,11 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1716736833, + "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", "type": "github" }, "original": { @@ -47,11 +86,11 @@ ] }, "locked": { - "lastModified": 1720066371, - "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=", + "lastModified": 1701208414, + "narHash": "sha256-xrQ0FyhwTZK6BwKhahIkUVZhMNk21IEI1nUcWSONtpo=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820", + "rev": "93e39cc1a087d65bcf7a132e75a650c44dd2b734", "type": "github" }, "original": { @@ -62,11 +101,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730883749, - "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=", + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", "type": "github" }, "original": { @@ -77,27 +116,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1730602179, - "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", + "lastModified": 1717265169, + "narHash": "sha256-IITcGd6xpNoyq9SZBigCkv4+qMHSqot0RDPR4xsZ2CA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c", + "rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-24.05", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "type": "github" }, "original": { @@ -116,15 +155,15 @@ "nixpkgs" ], "poetry2nix": "poetry2nix", - "systems": "systems_2", + "systems": "systems_3", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1724283233, - "narHash": "sha256-XMPn6YHwFOJCGLE9M5F3AEFKA0u+maf8CpIEWmvaQTQ=", + "lastModified": 1701455376, + "narHash": "sha256-FMLrMdi6JY7ZfqV5XnNj64jnDcGKznKZLn7O6OMO3u0=", "owner": "ThinkChaos", "repo": "openconnect-sso", - "rev": "94f1ddfef1662d56ede0a093bcfc3d23156bc1a1", + "rev": "20c0015c4264c72cc19ac272de0dc534309bd21b", "type": "github" }, "original": { @@ -158,11 +197,11 @@ ] }, "locked": { - "lastModified": 1721039874, - "narHash": "sha256-XANsG9GYHip8pxZpbqKf/YGv8tIa0xTh289Y+WNBNfw=", + "lastModified": 1701105783, + "narHash": "sha256-5IOI0xXGbhAkUZNNcPId48V78Q+/JlW0hzlif0zxRmM=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "d11c01e58587e5f21037ed6477465a7f26a32e27", + "rev": "0b2bff39e9bd4e6db3208e09c276ca83a063b370", "type": "github" }, "original": { @@ -173,7 +212,8 @@ }, "root": { "inputs": { - "flake-utils": "flake-utils", + "devshell": "devshell", + "flake-utils": "flake-utils_2", "home-manager": "home-manager", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", @@ -190,11 +230,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1730883027, - "narHash": "sha256-pvXMOJIqRW0trsW+FzRMl6d5PbsM4rWfD5lcKCOrrwI=", + "lastModified": 1717297459, + "narHash": "sha256-cZC2f68w5UrJ1f+2NWGV9Gx0dEYmxwomWN2B0lx0QRA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c5ae1e214ff935f2d3593187a131becb289ea639", + "rev": "ab2a43b0d21d1d37d4d5726a892f714eaeb4b075", "type": "github" }, "original": { @@ -233,6 +273,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -241,11 +296,11 @@ ] }, "locked": { - "lastModified": 1721769617, - "narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=", + "lastModified": 1699786194, + "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009", + "rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1", "type": "github" }, "original": { @@ -261,11 +316,11 @@ ] }, "locked": { - "lastModified": 1722363685, - "narHash": "sha256-XCf2PIAT6lH7BwytgioPmVf/wkzXjSKScC4KzcZgb64=", + "lastModified": 1715533576, + "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=", "owner": "gytis-ivaskevicius", "repo": "flake-utils-plus", - "rev": "6b10f51ff73a66bb29f3bc8151a59d217713f496", + "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", "type": "github" }, "original": { diff --git a/nixos/flake.nix b/nixos/flake.nix index 8c51697..cda9173 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -5,13 +5,17 @@ nixpkgs.url = "nixpkgs/nixos-24.05"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; + devshell = { + url = "github:numtide/devshell"; + inputs.nixpkgs.follows = "nixpkgs"; + }; flake-utils.url = "github:numtide/flake-utils"; home-manager = { url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; openconnect-sso = { - url = "github:ThinkChaos/openconnect-sso/fix/nix-flake"; + url = github:ThinkChaos/openconnect-sso/fix/nix-flake; inputs = { flake-utils.follows = "utils"; nixpkgs.follows = "nixpkgs"; @@ -29,7 +33,7 @@ outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, - flake-utils, home-manager, openconnect-sso, sops-nix, utils, + devshell, flake-utils, home-manager, openconnect-sso, sops-nix, utils, ... }: let system = "x86_64-linux"; diff --git a/nixos/hosts/Tibo-NixDesk/default.nix b/nixos/hosts/Tibo-NixDesk/default.nix index 11b7a40..7858bea 100644 --- a/nixos/hosts/Tibo-NixDesk/default.nix +++ b/nixos/hosts/Tibo-NixDesk/default.nix @@ -75,9 +75,9 @@ networking.hostName = "Tibo-NixDesk"; - services.xserver.xkb = { + services.xserver = { layout = "us"; - variant = "altgr-intl"; + xkbVariant = "altgr-intl"; }; system.stateVersion = "24.05"; diff --git a/nixos/hosts/Tibo-NixFat/default.nix b/nixos/hosts/Tibo-NixFat/default.nix index e295e2e..6f0e53c 100644 --- a/nixos/hosts/Tibo-NixFat/default.nix +++ b/nixos/hosts/Tibo-NixFat/default.nix @@ -19,7 +19,7 @@ networking = { networkmanager.enable = true; - openconnect-sso.enable = true; + # openconnect-sso.enable = true; }; nix = { @@ -80,7 +80,6 @@ programs = { zsh.enable = true; - steam.enable = true; }; hardware.bluetooth = { @@ -88,10 +87,7 @@ powerOnBoot = false; }; - networking = { - hostName = "Tibo-NixFat"; - networkmanager.wifi.powersave = true; - }; + networking.hostName = "Tibo-NixFat"; services = { # Handle the laptop lid switch as follows: @@ -109,8 +105,6 @@ # Touchpad libinput.enable = true; - - thermald.enable = true; }; system.stateVersion = "24.05"; diff --git a/nixos/modules/desktop/sway/default.nix b/nixos/modules/desktop/sway/default.nix index 15d3087..bab109b 100644 --- a/nixos/modules/desktop/sway/default.nix +++ b/nixos/modules/desktop/sway/default.nix @@ -108,8 +108,6 @@ in { source-han-serif-japanese ]; - hardware.opengl.enable = true; - security.polkit.enable = true; services = { @@ -144,14 +142,9 @@ in { extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; }; - programs = { - sway = { - enable = true; - package = pkgs.swayfx; - wrapperFeatures.gtk = true; - }; - - waybar.enable = true; + programs.sway = { + enable = true; + wrapperFeatures.gtk = true; }; sisyphus.users.wantedGroups = [ diff --git a/nixos/modules/hardware/yubikey/default.nix b/nixos/modules/hardware/yubikey/default.nix index 2134c87..708b9c1 100644 --- a/nixos/modules/hardware/yubikey/default.nix +++ b/nixos/modules/hardware/yubikey/default.nix @@ -25,17 +25,11 @@ in { ]; # Send a notification if the YubiKey is waiting for touch. - systemd.services.yubikey-touch-detector = { + systemd.user.services.yubikey-touch-detector = { enable = true; description = "Detects when your YubiKey is waiting for a touch"; - path = with pkgs; [ - gnupg - yubikey-touch-detector - ]; - wantedBy = [ - "graphical-session.target" - ]; - script = ''exec yubikey-touch-detector --libnotify''; + path = with pkgs; [ yubikey-touch-detector ]; + script = ''exec yubikey-touch-detector --notify''; environment.YUBIKEY_TOUCH_DETECTOR_LIBNOTIFY = "true"; }; }; diff --git a/nixos/modules/services/printing/default.nix b/nixos/modules/services/printing/default.nix index 9b8738a..b7352b3 100644 --- a/nixos/modules/services/printing/default.nix +++ b/nixos/modules/services/printing/default.nix @@ -10,7 +10,7 @@ in { printing.enable = true; avahi = { enable = true; - nssmdns4 = true; + nssmdns = true; openFirewall = true; }; }; diff --git a/nixos/modules/virtualisation/docker/default.nix b/nixos/modules/virtualisation/docker/default.nix index 51b9319..2218ff3 100644 --- a/nixos/modules/virtualisation/docker/default.nix +++ b/nixos/modules/virtualisation/docker/default.nix @@ -12,11 +12,6 @@ in { enableOnBoot = false; }; - # Updated version of deprecated enableNvidia. hardware.nvidia-container-toolkit.enable = true; - - sisyphus.users.wantedGroups = [ - "docker" - ]; }; } diff --git a/nixos/secrets/HomeLab.yaml b/nixos/secrets/HomeLab.yaml index f749611..9678afb 100644 --- a/nixos/secrets/HomeLab.yaml +++ b/nixos/secrets/HomeLab.yaml @@ -1,6 +1,4 @@ HomeLab: - Gitea: - ssh: ENC[AES256_GCM,data:+H9qhfOg5WlTB7pihvbJ9omY/zLTAADe8KzI4fbdZ7NuaM0auC95AIQqhwNNCZNglg9UGOVL662pY7dNhbQ/2iCLPHSPgFFXf3fx1moRRcYYQzoJxsgxp19FZQeGNJ0qfRf72xYbZQZKslyHQmcqDieoVTyhaLqTfgC8MQ/UZofw/ortmgME7z51rGV5sXXMjxpJpHz9JxiPwQEL0ABWDAeCqBVBzlqqwdmfKEdkcR4l3USHfH1iNF5XQ5V26I+UGDOyoixt1c/BXzD9xzKI7MUDoRz+qfC6C62LIlEgqZY5tWg+tVZnqobakxwH6d8pXtQ7vaIREEP0LqQMkrNcK8X+cDRteToQ1fcxtN1V+JfZSa9pVC+iGgvmSZ00q4bnOgTmgO9IZ80TvOR4bHpRhjM5l4JMbLBv2jqY1zeUx/5L3WNuYIm9sL5mWXkV/RAD8WCemNSWdKbGsvByEUeiFcxczL/vQ6y3fi+ntmXUgeXVy5zVNkNlYbqd+DemBmwZQb9D1T5T97i2ChciYb3/ON1NObja/bt0PTQa,iv:hIbwsPcDSfgDItlvFFy0vCjuQWvgoQHBH60v8nTVTNg=,tag:1T/TdTEy98TfgMzYAxfHKA==,type:str] Hugo: ssh: ENC[AES256_GCM,data:Tfuba25e4hJ8Ovl1IdVtDvg0L0sCc9sYTXstRg89IAUzwv/1u8mxdj9ka6ZKaSQr2QUaNWs0BoPV36O4bI2hTwoqhUarhXXZNnJKHtd8xBu/+kfMSOMGa5qD9V9m3L5OFdt+gdwhJxemeQNkvN0Vhsu4DJFPZRPmGflJ2HVRYaRW4AsI+JPqiWSEeKz40f3PQPJ2h26gF+pADmPwtEfcUGZdGnJXUsiYMC0aBEWWxyAgBgj5W+Nbe+OCopEX1qyRcR8qO+LONjuC0b5hcGeOXjWj/d1FnBfxDHeoxRGhNCo8TUk0ap1mpSAttdr55/C51duQfeV09Iow4nzUR2H0jmzojUAjKXXCkBsK6yjIKxW+4+4OKCC9ERz5mDmu5Z+4aFM7CpSquCAnDVFw1Uq9MJqAnSz6AGh29J4LUwMnVNtf+gQwzGyl/C9wE/Svm0UAwP19h6hLcM1rp6bV4xjfSXNDspUkz4Xr3RdPpTI1PemtMZIq8fP64q0FlFZeV62ctl9hCtDVRDo3fG3FUM08fa0OfJpVYjSEAOfC,iv:T8z+P5++cES9Co9d/2tcU0PbxZZM/5x63tcxIjBeQ0I=,tag:AjsulFme64/xEPjgZQFtow==,type:str] Nextcloud: @@ -20,8 +18,8 @@ sops: aDNUbFlhWWVoOWpjVlV1VTVJejlSMjQK6wCeCRdHY5oyTX6/R1U5AOGJyp0exi1A dWPUMfkKBBBkrR+G6ougd8o3FwFf+yfb5RhaTxxqjit6p2RyMjR64w== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-10-20T07:58:57Z" - mac: ENC[AES256_GCM,data:mmFgjE7rp7fXmPOnETGamHR3kUAguFCNNTQcEnD+uM4xeSp3QcB2g8tkKYaJAjkWWqKRSm9/Iu1NWOr9GWyu4O1h7ppWSvpKawWki6cHpqBl8JOwbx/SZi5bzU1lBtoJyT6hD1aCu9ENOMUkpPY3rKcYwbsRMJpKYsbXymPikcQ=,iv:kPB6ds8c4yc/w7Ny1d3DTyztQF4yTr0NyKgIHEzIKAg=,tag:VTpXRb5HaWDjVB52K7mByw==,type:str] + lastmodified: "2024-10-19T12:24:34Z" + mac: ENC[AES256_GCM,data:Bh/vHdsFCzk+YaRcZe/Eiq4xfLSDX1tSV4Jg8lFgzPqXCBwCgohDREZ8LSZPuQtStIugzyRNyPcnWrZcDwDiaS9klM5sIxjeGIF7ZDS81sQnQVNRyX/m9vl6AgVtP9KHgOpJwGObzuvNBE7XnOZ3q03/ah1LXRowJUn63wB4Qxk=,iv:GVLQUjm0bMHusD0F8gJ5DlZvqdDHPsT0VwxLhHh9ozE=,tag:cffv8wKTQ9UYrCPx+3zTMw==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 diff --git a/nixos/shells/c/default.nix b/nixos/shells/c/default.nix deleted file mode 100644 index 09a7f1d..0000000 --- a/nixos/shells/c/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - description = "C Flake"; - - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - flake-utils.url = "github:numtide/flake-utils"; - }; - - outputs = { self, flake-utils, nixpkgs }: - flake-utils.lib.eachDefaultSystem (system: - let - lib = import lib; - pkgs = import nixpkgs { - inherit system; - config.allowUnfree = true; - }; - in { - devShells.default = pkgs.mkShell { - packages = with pkgs; [ - cmake - gcc - gnumake - valgrind - - # You might want to use your own IDE. - (jetbrains.plugins.addPlugins jetbrains.clion [ "github-copilot" ]) - ]; - }; - }); -} diff --git a/nixos/shells/java/default.nix b/nixos/shells/java/default.nix deleted file mode 100644 index 676c946..0000000 --- a/nixos/shells/java/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - description = "Java Flake"; - - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - inputs.flake-utils.url = "github:numtide/flake-utils"; - - outputs = { self, nixpkgs, flake-utils }: - flake-utils.lib.eachDefaultSystem - ( system: - let - pkgs = import nixpkgs { - inherit system; - config.allowUnfree = true; - }; - in { - devShells.default = pkgs.mkShell { - packages = with pkgs; [ - jdk8 - openjdk17 - - # You might want to use your own IDE. - (jetbrains.plugins.addPlugins jetbrains.idea-ultimate [ "github-copilot" ]) - ]; - }; - }); -} diff --git a/nixos/shells/latex/default.nix b/nixos/shells/latex/default.nix deleted file mode 100644 index e2cb799..0000000 --- a/nixos/shells/latex/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - description = "LaTeX Flake"; - - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - inputs.flake-utils.url = "github:numtide/flake-utils"; - - outputs = { self, nixpkgs, flake-utils}: - flake-utils.lib.eachDefaultSystem - (system: - let - pkgs = import nixpkgs { - inherit system; - }; - in { - devShells.default = pkgs.mkShell { - packages = with pkgs; [ - texlive.combined.scheme-full - pgfplots - biber - ]; - }; - } - ); -} diff --git a/nixos/users/tdpeuter/default.nix b/nixos/users/tdpeuter/default.nix index 899086f..f97415b 100644 --- a/nixos/users/tdpeuter/default.nix +++ b/nixos/users/tdpeuter/default.nix @@ -36,13 +36,12 @@ in { }; fonts.packages = with pkgs; [ - corefonts # Calibri for Uni - font-awesome # Dependency of Vifm & zsh config - letter # Personal font - noto-fonts-cjk # Dependency of Zellij config - noto-fonts # Dependency of Zellij config - noto-fonts-color-emoji # Emoji's! - vistafonts # Microsoft fonts + corefonts # Calibri for Uni + font-awesome # Dependency of Vifm & zsh config + letter # Personal font + noto-fonts-cjk # Dependency of Zellij config + noto-fonts # Dependency of Zellij config + vistafonts # Microsoft fonts ]; sisyphus = { @@ -61,21 +60,20 @@ in { packages = (with pkgs; [ cmdtime # Zsh plugin icosystem # Personal icon theme - nextcloud-client spotify-adblock ]) ++ (with pkgs-unstable; [ brave chafa # Terminal image viewer duf # Df alternative - feishin # Jellyfin music client foot fzf glow # Terminal Markdown renderer jellyfin-media-player - libreoffice-fresh # Office tools - # FIXME Waiting for electron version to update, now insecure. - # logseq # Note taking - mpv # Media player + kitty + libreoffice-fresh + logseq + mpv + nextcloud-client nsxiv # Lightweight image viewer qalculate-gtk # Calculator spotify @@ -88,13 +86,11 @@ in { zsh-syntax-highlighting # SMB - cifs-utils - psmisc + cifs-utils psmisc # Linters and LSPs statix # Nix - # TODO Move to devshells - # ruff pylint # Python + ruff pylint # Python ]); pointerCursor = { @@ -136,14 +132,6 @@ in { cursorTheme = cursor; }; - services.syncthing = { - enable = true; - extraOptions = [ - "--no-default-folder" - ]; - tray.enable = true; - }; - xdg = { desktopEntries.spotify = { name = "Spotify"; diff --git a/nixos/users/tdpeuter/dotfiles.nix b/nixos/users/tdpeuter/dotfiles.nix index dd30c05..9766b08 100644 --- a/nixos/users/tdpeuter/dotfiles.nix +++ b/nixos/users/tdpeuter/dotfiles.nix @@ -72,14 +72,14 @@ in { ".config/zellij" = { source = ../../../stow/zellij/.config/zellij; }; - ".gnupg" = { - inherit (config.programs.gnupg.agent) enable; - source = ../../../stow/gnupg/.gnupg; + ".oh-my-zsh" = { + enable = config.users.users.tdpeuter.shell == pkgs.zsh; + source = "${pkgs.oh-my-zsh}/share/oh-my-zsh"; recursive = true; -# onChange = '' -# chmod 700 /home/tdpeuter/.gnupg -# chmod 600 /home/tdpeuter/.gnupg/* -# ''; + }; + ".oh-my-zsh/themes/tdpeuter.zsh-theme" = { + enable = config.users.users.tdpeuter.shell == pkgs.zsh; + source = ../../../stow/zsh/.oh-my-zsh/themes/tdpeuter.zsh-theme; }; ".ssh/config" = lib.mkIf config.sisyphus.programs.ssh.enable { inherit (config.sisyphus.programs.ssh) enable; @@ -97,15 +97,6 @@ in { }; } (lib.mkIf (config.users.users.tdpeuter.shell == pkgs.zsh) { - ".oh-my-zsh" = { - enable = config.users.users.tdpeuter.shell == pkgs.zsh; - source = "${pkgs.oh-my-zsh}/share/oh-my-zsh"; - recursive = true; - }; - ".oh-my-zsh/themes/tdpeuter.zsh-theme" = { - enable = config.users.users.tdpeuter.shell == pkgs.zsh; - source = ../../../stow/zsh/.oh-my-zsh/themes/tdpeuter.zsh-theme; - }; ".zshrc" = { source = ../../../stow/zsh/.zshrc; }; diff --git a/nixos/users/tdpeuter/secrets.nix b/nixos/users/tdpeuter/secrets.nix index e37b277..75939f3 100644 --- a/nixos/users/tdpeuter/secrets.nix +++ b/nixos/users/tdpeuter/secrets.nix @@ -32,7 +32,6 @@ in { "UGent/SubGit/ssh" = UGent; # HomeLab - "HomeLab/Gitea/ssh" = HomeLab; "HomeLab/Hugo/ssh" = HomeLab; "HomeLab/Nextcloud/ssh" = HomeLab; }); diff --git a/scripts/toggle-light-dark.sh b/scripts/toggle-light-dark.sh index 37817e6..ec38506 100755 --- a/scripts/toggle-light-dark.sh +++ b/scripts/toggle-light-dark.sh @@ -30,10 +30,6 @@ declare -A wallpaper wallpaper[${THEME_LIGHT}]="bg-light" wallpaper[${THEME_DARK}]="bg-dark" -declare -A icon -icon[${THEME_LIGHT}]="\uf185" -icon[${THEME_DARK}]="\uf186" - ############# ### Logic ### ############# @@ -52,14 +48,14 @@ while getopts ":m:g" option; do fi ;; g) - current_state="$(cat "${STATE_FILE}")" - next_state="${theme_next[${current_state}]}" - if [ "${current_state}" == "${THEME_DARK}" ]; then + previous_theme="$(cat ${STATE_FILE})" + if [ "${previous_theme}" == "${THEME_LIGHT}" ]; then class="activated" - percentage=100 + percentage=1 + else + percentage=0 fi - printf '{"text": "%s", "alt": "%s", "tooltip": "Set theme to %s", "percentage": %d, "class": "%s"}' \ - "${icon[${next_state}]}" "${gsettings_alt[${next_state}]}" "${next_state}" "${percentage:=0}" "${class:="none"}" + printf '{ "class": "%s", "percentage": %d }' "${class}" "${percentage}" exit 0 ;; *) @@ -124,7 +120,6 @@ fi if [ "$(command -v swaybg)" ]; then bg_path="${BG_DIR}/${wallpaper[${theme}]}" /run/current-system/sw/bin/cp "${bg_path}" "${STATE_DIR}/bg" && swaymsg reload & - # pkill --signal 13 "waybar" & fi # Vifm diff --git a/stow/ssh/.ssh/config b/stow/ssh/.ssh/config index 55c6397..d3f6834 100644 --- a/stow/ssh/.ssh/config +++ b/stow/ssh/.ssh/config @@ -31,12 +31,6 @@ Host subgit.ugent.be CanonicalizeHostname yes # Ignore capitalization # HomeLab -Host Gitea - User admin - HostName 192.168.0.24 - IdentitiesOnly yes - IdentityFile /run/secrets/HomeLab/Gitea/ssh - Host Hugo User admin HostName 192.168.0.11 diff --git a/stow/sway/.config/sway/modes b/stow/sway/.config/sway/modes index d62608f..074dab5 100644 --- a/stow/sway/.config/sway/modes +++ b/stow/sway/.config/sway/modes @@ -7,49 +7,40 @@ set $default "default" # Resizing set $mode_resize "Resize" bindsym $flag+r mode $mode_resize -mode $mode_resize { - bindsym { - $right resize grow width 10 px or 10 ppt - $up resize grow height 10 px or 10 ppt - $left resize shrink width 10 px or 10 ppt - $down resize shrink height 10 px or 10 ppt +mode $mode_resize bindsym { + $right resize grow width 10 px or 10 ppt + $up resize grow height 10 px or 10 ppt + $left resize shrink width 10 px or 10 ppt + $down resize shrink height 10 px or 10 ppt - Right resize grow width 10 px or 10 ppt - Up resize grow height 10 px or 10 ppt - Left resize shrink width 10 px or 10 ppt - Down resize shrink height 10 px or 10 ppt + Right resize grow width 10 px or 10 ppt + Up resize grow height 10 px or 10 ppt + Left resize shrink width 10 px or 10 ppt + Down resize shrink height 10 px or 10 ppt - Shift+$right resize grow width 50 px or 50 ppt - Shift+$up resize grow height 50 px or 50 ppt - Shift+$left resize shrink width 50 px or 50 ppt - Shift+$down resize shrink height 50 px or 50 ppt + Shift+$right resize grow width 50 px or 50 ppt + Shift+$up resize grow height 50 px or 50 ppt + Shift+$left resize shrink width 50 px or 50 ppt + Shift+$down resize shrink height 50 px or 50 ppt - Shift+Right resize grow width 50 px or 50 ppt - Shift+Up resize grow height 50 px or 50 ppt - Shift+Left resize shrink width 50 px or 50 ppt - Shift+Down resize shrink height 50 px or 50 ppt + Shift+Right resize grow width 50 px or 50 ppt + Shift+Up resize grow height 50 px or 50 ppt + Shift+Left resize shrink width 50 px or 50 ppt + Shift+Down resize shrink height 50 px or 50 ppt - $flag+$right move right - $flag+$up move up - $flag+$left move left - $flag+$down move down + $flag+$right move right + $flag+$up move up + $flag+$left move left + $flag+$down move down - $flag+Right move right - $flag+Up move up - $flag+Left move left - $flag+Down move down + $flag+Right move right + $flag+Up move up + $flag+Left move left + $flag+Down move down - $flag+r mode $default - Escape mode $default - Return mode $default - } - - bindgesture { - swipe:2:right resize grow width 10 px or 10 ppt - swipe:2:down resize grow height 10 px or 10 ppt - swipe:2:left resize shrink width 10 px or 10 ppt - swipe:2:up resize shrink height 10 px or 10 ppt - } + $flag+r mode $default + Escape mode $default + Return mode $default } # System actions @@ -103,8 +94,8 @@ mode $mode_screenshot bindsym { set $mode_launcher "Launch (f)irefox, (s)potify or (t)hunderbird." bindsym $flag+o mode $mode_launcher mode $mode_launcher bindsym { - f exec firefox, mode $default - t exec thunderbird, mode $default + f exec firefox + t exec thunderbird $flag+o mode $default Escape mode $default diff --git a/stow/vim/.vimrc b/stow/vim/.vimrc index 379ddb4..5995924 100644 --- a/stow/vim/.vimrc +++ b/stow/vim/.vimrc @@ -82,9 +82,6 @@ Plug 'prabirshrestha/vim-lsp' Plug 'sheerun/vim-polyglot' Plug 'vifm/vifm.vim' -" Coq -Plug 'whonore/Coqtail' - call plug#end() " }}} diff --git a/stow/waybar/.config/waybar/config b/stow/waybar/.config/waybar/config index 93f4b60..3b1a053 100644 --- a/stow/waybar/.config/waybar/config +++ b/stow/waybar/.config/waybar/config @@ -19,9 +19,9 @@ "include": [ // Import modules (!) - "./modules.json", -// "./default.json" - "./left.json" + "~/.config/waybar/modules.json", +// "~/.config/waybar/default.json" + "~/.config/waybar/left.json" ], }, @@ -36,7 +36,7 @@ "include": [ // Import modules (!) - "./modules.json" + "~/.config/waybar/modules.json" ], }] diff --git a/stow/waybar/.config/waybar/left.json b/stow/waybar/.config/waybar/left.json index 86b9a00..8ab0639 100644 --- a/stow/waybar/.config/waybar/left.json +++ b/stow/waybar/.config/waybar/left.json @@ -2,15 +2,16 @@ "modules-left": [ "sway/workspaces", "custom/scratchpad-indicator", + "mpris", "group/system" ], "modules-right": [ - "tray", - "sway/language", + "group/hardware", "bluetooth", "network", "pulseaudio", "group/battery", - "mpris" + "custom/sep", + "tray" ] } diff --git a/stow/waybar/.config/waybar/modern.css b/stow/waybar/.config/waybar/modern.css deleted file mode 100644 index 35ce570..0000000 --- a/stow/waybar/.config/waybar/modern.css +++ /dev/null @@ -1,80 +0,0 @@ -@define-color foreground rgb(202, 202, 202); -@define-color background rgb( 3, 3, 3); - -@define-color highlight-background alpha(@foreground, 0.4); - -@define-color accent #00897b; -@define-color white #ecf0f1; -@define-color warning-red #eb4d4b; - -* { - font-family: letter, "Font Awesome 6 Free", font-awesome, monospace; - font-size: 13px; - font-weight: 600; -} - -window#waybar { - border: none; - color: @white; - - transition-property: background-color; - transition-duration: .5s; -} - -window#waybar.keep { - background-color: @transparent; -} - -window#waybar.toggle { - background-color: alpha(@foreground, 0.4); -} - -tooltip { - background: alpha(@background, 0.8); -} -tooltip label { - color: @white; -} - -#workspaces button { - border: none; - padding: 0 8px; - border-radius: 5px; - animation: ws_normal 20s ease-in-out 1; -} - -#mode, -#workspaces button.focused { - background-color: alpha(@background, 0.2); -} - -#workspaces button:hover { - background-color: alpha(@background, 0.2); -} - -#battery, -#disk, -#bluetooth, -#clock, -#custom-browser, -#custom-scratchpad-indicator, -#custom-system-hibernate, #custom-system-lock, #custom-system-reboot, #custom-system-shutdown, #custom-system-sleep, -#custom-toggle-light-dark, -#custom-toggle-night-light, -#custom-toggle-notifications, -#cpu, -#idle_inhibitor, -#keyboard-state, -#memory, -#mpris, -#network, -#sway-language, -#sway-window, -#power-profiles-daemon, -#privacy, -#pulseaudio, -#temperature, -#tray { - color: @white; -} - diff --git a/stow/waybar/.config/waybar/modules.json b/stow/waybar/.config/waybar/modules.json index 03d10d6..026ad07 100644 --- a/stow/waybar/.config/waybar/modules.json +++ b/stow/waybar/.config/waybar/modules.json @@ -20,14 +20,13 @@ }, "bluetooth": { - /* bluetooth-b */ "format-disabled": "\uf294", "format-off": "\uf294", "format-on": "\uf294", "format-connected": "\uf294c", "max-length": 10.3, "on-click": "bluetoothctl power $( bluetoothctl show | sed -n 's/\\s*Powered: \\(yes\\|no\\)/\\1/p' | sed 's/yes/off/;s/no/on/' )", - "on-click-right": "foot -e bluetoothctl", + "on-click-right": "kitty -e bluetoothctl", "tooltip-format": "{status}", "tooltip-format-on": "{status}, no devices connected", "tooltip-format-connected": "{status} ({num_connections}):\n{device_enumerate}", @@ -37,20 +36,9 @@ "clock": { "format": "{:%H:%M}", - "format-alt": "{:%a %b %d, %Y %R}", + "format-alt": "{:%d/%m/%Y %H:%M}", "timezone": "Europe/Brussels", - "tooltip-format": "{:%Y %B}\n{calendar}", - "calendar": { - "mode-mon-col": 3, - "on-scroll": 1, - "format": { - /* Highlight today's date. */ - "today": "{}" - } - }, - "actions": { - "on-click": "mode" - } + "tooltip-format": "{:%Y %B}\n{calendar}" }, "custom/browser": { @@ -59,11 +47,39 @@ "tooltip-format": "Launch an application" }, + "custom/light-dark-toggle": { + "exec": "bash ${SCRIPT_DIR}/toggle-light-dark.sh -g", + "exec-on-event": true, + "on-click": "bash ${SCRIPT_DIR}/toggle-light-dark.sh", + // "format": "\uf042 ", + "format": "{icon}", + "format-icons": [ + "\uf185", + "\uf111" + ], + "tooltip": true, + "tooltip-format": "Toggle between light and dark mode" + }, + + "custom/keyboard-switch": { + "format": "\uf11c", + "on-click": "swaymsg input type:keyboard xkb_switch_layout next", + "tooltip-format": "Toggle keyboard layouts", + "tooltip": true + }, + + "custom/night-light-toggle": { + "on-click": "bash ${SCRIPT_DIR}/sunset.sh", + "format": "\uf0eb ", + "tooltip": true, + "tooltip-format": "Toggle night-light on or off" + }, + "custom/scratchpad-indicator": { "interval": 3, "return-type": "json", "exec": "swaymsg -t get_tree | jq --unbuffered --compact-output '(recurse(.nodes[]) | select(.name == \"__i3_scratch\") | .focus) as $scratch_ids | [.. | (.nodes? + .floating_nodes?) // empty | .[] | select(.id |IN($scratch_ids[]))] as $scratch_nodes | if ($scratch_nodes|length) > 0 then { text: \"\\($scratch_nodes | length)\", tooltip: $scratch_nodes | map(\"\\(.app_id // .window_properties.class) (\\(.id)): \\(.name)\") | join(\"\\n\") } else empty end'", - "format": "\uf2d2 {}", + "format": "{} \uf2d2", "on-click": "exec swaymsg 'scratchpad show'", "on-click-right": "exec swaymsg 'move scratchpad'" }, @@ -103,23 +119,6 @@ "on-click": "systemctl poweroff -i" }, - "custom/toggle-light-dark": { - "exec": "bash ${SCRIPT_DIR}/toggle-light-dark.sh -g", - "signal": 13, - "return-type": "json", - "on-click": "bash ${SCRIPT_DIR}/toggle-light-dark.sh", - // "format": "\uf042 ", - "format": "{}", - "tooltip": true - }, - - "custom/toggle-night-light": { - "on-click": "bash ${SCRIPT_DIR}/sunset.sh", - "format": "\uf0eb ", - "tooltip": true, - "tooltip-format": "Toggle night-light on or off" - }, - "custom/toggle-notifications": { "on-click": "bash ${SCRIPT_DIR}/do-not-disturb.sh", "tooltip-format": "Toggle notifications", @@ -128,9 +127,8 @@ }, "cpu": { - "interval": 10, "format": "{usage}% \uf2db", - "on-click": "foot -e top", + "on-click": "foot -e htop", "tooltip": true }, @@ -138,11 +136,6 @@ "orientation": "inherit", "modules": [ "battery", - "custom/sep", - "memory", - "cpu", - "temperature", - "custom/sep", "custom/system-shutdown", "custom/system-reboot", "custom/system-hibernate", @@ -150,6 +143,22 @@ "custom/system-lock", "custom/sep", "power-profiles-daemon", + "custom/sep" + ], + "drawer": { + "transition-duration": 500, + "transition-left-to-right": false, + "children-class": "drawer-child" + } + }, + + "group/hardware": { + "orientation": "inherit", + "modules": [ + "custom/sep", + "memory", + "cpu", + "temperature" ], "drawer": { "transition-duration": 500, @@ -164,6 +173,7 @@ "idle_inhibitor", "custom/light-dark-toggle", "custom/night-light-toggle", + "custom/keyboard-switch", "custom/toggle-notifications" ], "drawer": { @@ -217,27 +227,20 @@ "title", "artist" ], - "dynamic-len": 40 + "dynamic-len": 40, }, "network": { "format-disconnected": "\uf127", - "format-ethernet": "\uf6ff {ifname}: {ipadds}/{cidr}", /* network-wired */ - "format-wifi": "\uf1eb", /* wifi */ + "format-ethernet": "\uf6ff {ifname}: {ipadds}/{cidr}", + "format-wifi": "\uf1eb", "interval": 5, - "on-click-right": "foot -e nmtui", + "on-click-right": "kitty -e nmtui", "tooltip-format": "{ifname}: {ipaddr}", "tooltip-format-disconnected": "Disconnected", "tooltip-format-wifi": "{essid} ({signalStrength}%)\n{ifname}: {ipaddr}" }, - "sway/language": { - "format": "{short}", - "on-click": "swaymsg input type:keyboard xkb_switch_layout next", - "tooltip-format": "Switch keyboard layouts", - "tooltip": true - }, - "sway/window": { "max-length": 85 }, @@ -247,9 +250,7 @@ "disable-scroll": true, "format": "{icon}{name}", "format-icons": { - //"default": "\uf111", - "default": "", - //"focused": "\uf192", + "default": "", // Prevent showing workspace name literal. "urgent": "\uf071 " }, // "persistent_workspaces": { @@ -263,9 +264,9 @@ "tooltip": true, "format-icons": { "default": "", - "performance": "\uf135", + "performance": "", "balanced": "", - "power-saver": "\uf06c" + "power-saver": "" } }, @@ -289,23 +290,19 @@ "pulseaudio": { "format": "{volume}% {icon}{format_source}", - "format-muted": "\uf6a9{format_source}", /* volume-xmark */ + "format-muted": "\uf6a9{format_source}", "format-bluetooth": "{volume}% {icon}\uf294{format_source}", "format-bluetooth-muted": "\uf6a9 {icon}\uf294{format_source}", "format-source": " {volume}% \uf130", "format-source-muted": "", "format-icons": { - "headphone": "\uf58f", /*  headphones-simple */ - "hands-free": "\uf590", /*  headset */ - "headset": "\uf590", /*  headset */ - "phone": "\uf3ce", /* mobile */ - "portable": "\uf3ce", /* mobile */ - "car": "\uf1b9", /* car */ - "default": [ - "\uf026", /*  volume-off */ - "\uf027", /*  volume-low */ - "\uf028" /*  volume-high */ - ] + "headphone": "\uf58f", + "hands-free": "\uf590", + "headset": "\uf590", + "phone": "\uf3ce", + "portable": "\uf3ce", + "car": "\uf1b9", + "default": ["\uf026", "\uf027", "\uf028 "] }, "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle", "on-click-right": "pavucontrol", @@ -313,19 +310,12 @@ }, "temperature": { - "critical-threshold": 75, + "critical-threshold": 70, "format": "{temperatureC}°C {icon}", - "format-icons": [ - "\uf2cb", /*  temperature-empty */ - "\uf2ca", /*  temperature-quarter */ - "\uf2c9", /*  temperature-half */ - "\uf2c8", /*  temperature-three-quarters */ - "\uf2c7" /*  temperature-full */ - ] + "format-icons": ["\uf2cb", "\uf2c9", "\uf2c7"] }, "tray": { - "show-passive-items": true, "spacing": 10 } } diff --git a/stow/waybar/.config/waybar/style-dark.css b/stow/waybar/.config/waybar/style-dark.css deleted file mode 100644 index 49d4f87..0000000 --- a/stow/waybar/.config/waybar/style-dark.css +++ /dev/null @@ -1,10 +0,0 @@ -@define-color foreground rgb( 3, 3, 3); -@define-color background rgb(202, 202, 202); - -@define-color highlight-background alpha(@foreground, 0.4); - -* { - color: @foreground; - font-family: letter, "Font Awesome 6 Free", font-awesome, monospace; -} - diff --git a/stow/waybar/.config/waybar/style-light.css b/stow/waybar/.config/waybar/style-light.css deleted file mode 100644 index 2b875b5..0000000 --- a/stow/waybar/.config/waybar/style-light.css +++ /dev/null @@ -1,10 +0,0 @@ -@define-color foreground rgb(202, 202, 202); -@define-color background rgb( 3, 3, 3); - -@define-color highlight-background alpha(@foreground, 0.4); - -* { - color: @foreground; - background-color: red; -} - diff --git a/stow/waybar/.config/waybar/style.css b/stow/waybar/.config/waybar/style.css index 957cb40..f9fe080 100644 --- a/stow/waybar/.config/waybar/style.css +++ b/stow/waybar/.config/waybar/style.css @@ -9,41 +9,72 @@ * - round.css */ -@import "modern.css"; +@define-color transparent-black rgba(23, 23, 23, 0.9); +@define-color white #ecf0f1; +@define-color warning-red #eb4d4b; +@define-color accent #00897b; -#disk, +window#waybar { + font-family: letter, "Font Awesome 6 Free", font-awesome, monospace; + font-size: 13px; + -webkit-font-smoothing: antialiased; + transition-property: background-color; + transition-duration: .5s; +} + +#window, #workspaces { + margin: 0 5px; +} + +#workspaces button { + border: none; + border-radius: 0; + min-width: 30px; + padding: 0 5px; +} + +#workspaces button.focused { + background-color: transparent; + color: @white; +} + +#workspaces button:hover { + background-color: transparent; + color: @transparent-black; +} + +#workspaces button.urgent { + color: @white; + background-color: @warning-red; +} + +/* All modules individually. */ +#backlight, +#battery, #bluetooth, #clock, -#custom-browser, -#custom-scratchpad-indicator, -#custom-system-hibernate, #custom-system-lock, #custom-system-reboot, #custom-system-shutdown, #custom-system-sleep, -#custom-toggle-light-dark, -#custom-toggle-night-light, -#custom-toggle-notifications, #cpu, +#custom-browser, +#custom-light-dark-toggle, +#custom-night-light-toggle, +#custom-system-lock, #custom-system-sleep, #custom-system-hibernate, #custom-system-reboot, #custom-system-shutdown, +#custom-toggle-notifications, +#disk, +#group-hardware, +#group-system, #idle_inhibitor, #keyboard-state, #memory, +#mode, +#mpd, #mpris, #network, -#sway-language, -#sway-window, #power-profiles-daemon, -#privacy, +#privacy-item.audio-in, #privacy-item.audio-out, #privacy-item.screenshare, #pulseaudio, #temperature, #tray { - padding: 0 4px; -} - -/* FIXME */ -#battery { - padding: 0 0 0 4px; -} - -#window, -#workspaces { - margin: 0 4px; + padding: 0 5px; } /* If workspaces is the leftmost module, omit left margin */ @@ -56,6 +87,19 @@ margin-right: 0; } +@keyframes blink { + to { + background-color: #ffffff; + color: #000000; + } +} + +label:focus { + background-color: #000000; +} + +/* Module specific colours */ + #battery.charging, #battery.plugged { color: #ffffff; background-color: #26A65B; @@ -78,32 +122,27 @@ opacity: 0.6; } -#idle_inhibitor.activated { - background-color: #ecf0f1; - color: #2d3436; -} - #mpris { - color: #ecf0f1; + color: #2a5c45; min-width: 100px; } #mpris.spotify { background-color: #66cc99; - color: #2a5c45; } #mpris.vlc { background-color: #ffa000; } -#mpris.Feishin { - background: rgb(170,92,195); - background: linear-gradient(90deg, rgba(170,92,195,1) 0%, rgba(0,164,220,1) 100%); +#temperature.critical { + background-color: #eb4d4b; } -#temperature.critical { - background-color: @warning-red; +#custom_light-dark-toggle.activated, +#idle_inhibitor.activated { + background-color: #ecf0f1; + color: #2d3436; } #tray > .passive { @@ -112,34 +151,15 @@ #tray > .needs-attention { -gtk-icon-effect: highlight; - background-color: @warning-red; + background-color: #eb4d4b; } -#workspaces button.focused { - box-shadow: none; +#privacy-item.audio-in, +#privacy-item.audio-out, +#privacy-item.screenshare { + background-color: #ffaa01; + color: #2d3436; } -button { - /* Avoid rounded borders under each button name */ - border: none; - border-radius: 0; - box-shadow: none; -} - -/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ -button:hover { - background: inherit; - box-shadow: none; -} - -label:focus { - background-color: #000000; -} - -@keyframes blink { - to { - background-color: #ffffff; - color: #000000; - } -} +@import "sharp.css";