diff --git a/flake.lock b/flake.lock index bad6266..c1f8bdc 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1694134858, - "narHash": "sha256-fG/ESauOGmiojKlpJG8gB62dJa5Wd+ZIuiDMKK/HD3g=", + "lastModified": 1697555443, + "narHash": "sha256-nsq8A+adEdN7bvVdz09LFyrHkTW5GtOzo/ctlHhyaaE=", "owner": "nix-community", "repo": "home-manager", - "rev": "19c6a4081b14443420358262f8416149bd79561a", + "rev": "b3acf1dc78b38a2fe03b287fead44d7ad25ac7c5", "type": "github" }, "original": { @@ -30,11 +30,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1694193424, - "narHash": "sha256-aTSjv6ydg56AHB2CrOr89LYdnPYK+yKx7GG/55AMoyM=", + "lastModified": 1697569807, + "narHash": "sha256-NCyGgz4ppDf7uEfBrR7LYQI4BH9umOeUrxK25LyEdo4=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "664827473583f8e986f9fb2a37a13e9b3a232cc2", + "rev": "a0b675ec9e57af8bc631fc8cc54d062b58669a9f", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1693844670, - "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=", + "lastModified": 1694767346, + "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1", + "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", "type": "github" }, "original": { @@ -86,11 +86,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1693985761, - "narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=", + "lastModified": 1697456312, + "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0bffda19b8af722f8069d09d8b6a24594c80b352", + "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", "type": "github" }, "original": { @@ -125,18 +125,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1692976565, - "narHash": "sha256-eBKkG7tMxg92NskEn8dHRFY245JwjirWRoOZzW6DnUw=", + "lastModified": 1696410538, + "narHash": "sha256-ecDhdYLXWHsxMv+EWG36mCNDvzRbu9qfjH7dLxL7aGM=", "owner": "wlroots", "repo": "wlroots", - "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294", + "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294", + "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", "type": "gitlab" } }, @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1694025408, - "narHash": "sha256-oJNhGfZH8Z2w3ztXdzsYVg32//cWEcPVDM3+tp/ZVfU=", + "lastModified": 1694628480, + "narHash": "sha256-Qg9hstRw0pvjGu5hStkr2UX1D73RYcQ9Ns/KnZMIm9w=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "022469529c8bc95acf222dc5a62389b04c8b1205", + "rev": "8f45a6435069b9e24ebd3160eda736d7a391cbf2", "type": "github" }, "original": { diff --git a/global/system.nix b/global/system.nix index 3692ba9..5fdaf1f 100644 --- a/global/system.nix +++ b/global/system.nix @@ -73,6 +73,13 @@ user: { config, pkgs, ... }: services.xserver = { layout = "gb"; xkbOptions = "caps:escape"; +# extraLayouts = { +# mine = { +# description = "my layout"; +# languages = [ "eng" ]; +# symbolsFile = ./xkblayout; +# }; +# }; }; hardware.opentabletdriver.enable = true; @@ -136,7 +143,6 @@ user: { config, pkgs, ... }: services.dbus.enable = true; programs.light.enable = true; programs.dconf.enable = true; - programs.sway.enable = true; programs.tmux.enable = true; programs.tmux.extraConfig = '' diff --git a/global/xkblayout b/global/xkblayout new file mode 100644 index 0000000..7df1ac3 --- /dev/null +++ b/global/xkblayout @@ -0,0 +1,9 @@ + +xkb_keycodes { + = 78; +} + +xkb_symbols { + key.type = "ALPHABETIC"; + key { [ U0108, U0109 ] }; +} diff --git a/lib/modules/email.nix b/lib/modules/email.nix index b4fdd9e..f360724 100644 --- a/lib/modules/email.nix +++ b/lib/modules/email.nix @@ -112,7 +112,7 @@ in t = :toggle-threads = :view - D = :trash + D = :mv Trash C = :compose @@ -148,7 +148,7 @@ in | = :pipe -m S = :save H = :toggle-headers - D = :trash + D = :mv Trash = :prev-part = :next-part J = :next diff --git a/lib/modules/gamer.nix b/lib/modules/gamer.nix index a379337..a2de16d 100644 --- a/lib/modules/gamer.nix +++ b/lib/modules/gamer.nix @@ -12,6 +12,9 @@ with lib; airshipper minetest superTuxKart + osu-lazer + xonotic + heroic BeatSaberModManager gamemode @@ -28,6 +31,7 @@ with lib; "steam" "steam-run" "steam-original" + "osu-lazer" ]; programs.steam = { diff --git a/lib/modules/personal.nix b/lib/modules/personal.nix index 82ce573..d7d274d 100644 --- a/lib/modules/personal.nix +++ b/lib/modules/personal.nix @@ -31,6 +31,8 @@ with lib; krita organicmaps anki + hugo + libsForQt5.neochat ]; }]; diff --git a/lib/modules/wayland.nix b/lib/modules/wayland.nix index 2cb36ff..0c1f22c 100644 --- a/lib/modules/wayland.nix +++ b/lib/modules/wayland.nix @@ -169,6 +169,10 @@ in ''; }; + wayland.windowManager.sway = mkIf cfg.sway { + enable = true; + }; + programs.swaylock = { enable = true; package = pkgs.swaylock-effects; @@ -254,12 +258,11 @@ in * { min-height: 0; - text-shadow: 0 0 3px #080C39, 1px 1px black; } window#waybar { font-size: small; - background: none; + background: rgba(0,0,0,0.8); } #workspaces button { @@ -269,7 +272,14 @@ in } #workspaces button.active { - background: rgba(155,155,155,0.3); + background: rgba(255,255,255,0.8); + padding: 0px 1rem; + color: black; + } + + #workspaces button.inactive:hover { + background: rgba(255,255,255,0.4); + color: black; } .modules-right widget label {