diff --git a/flake.lock b/flake.lock index c1f8bdc..1c87fb9 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1697555443, - "narHash": "sha256-nsq8A+adEdN7bvVdz09LFyrHkTW5GtOzo/ctlHhyaaE=", + "lastModified": 1699783872, + "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", "owner": "nix-community", "repo": "home-manager", - "rev": "b3acf1dc78b38a2fe03b287fead44d7ad25ac7c5", + "rev": "280721186ab75a76537713ec310306f0eba3e407", "type": "github" }, "original": { @@ -30,11 +30,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1697569807, - "narHash": "sha256-NCyGgz4ppDf7uEfBrR7LYQI4BH9umOeUrxK25LyEdo4=", + "lastModified": 1700051522, + "narHash": "sha256-u9k9O8oN5udH3ReAjJKribuJD8jHGHu5MDkJAXpqplo=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "a0b675ec9e57af8bc631fc8cc54d062b58669a9f", + "rev": "9e3dccca76ca3af4e96ac80c2ddef4774dc1354b", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1694767346, - "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", + "lastModified": 1698134075, + "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", + "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", "type": "github" }, "original": { @@ -86,11 +86,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1697456312, - "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", + "lastModified": 1699781429, + "narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", + "rev": "e44462d6021bfe23dfb24b775cc7c390844f773d", "type": "github" }, "original": { @@ -125,18 +125,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1696410538, - "narHash": "sha256-ecDhdYLXWHsxMv+EWG36mCNDvzRbu9qfjH7dLxL7aGM=", + "lastModified": 1699292815, + "narHash": "sha256-HXu98PyBMKEWLqiTb8viuLDznud/SdkdJsx5A5CWx7I=", "owner": "wlroots", "repo": "wlroots", - "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", + "rev": "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", + "rev": "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1", "type": "gitlab" } }, @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1694628480, - "narHash": "sha256-Qg9hstRw0pvjGu5hStkr2UX1D73RYcQ9Ns/KnZMIm9w=", + "lastModified": 1697981233, + "narHash": "sha256-y8q4XUwx+gVK7i2eLjfR32lVo7TYvEslyzrmzYEaPZU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "8f45a6435069b9e24ebd3160eda736d7a391cbf2", + "rev": "22e7a65ff9633e1dedfa5317fdffc49f68de2ff2", "type": "github" }, "original": { diff --git a/global/home.nix b/global/home.nix index 058f54b..dc1c57d 100644 --- a/global/home.nix +++ b/global/home.nix @@ -157,6 +157,7 @@ in programs.ssh.matchBlocks = { "git.tristans.cloud" = { user = "git"; + hostname = "100.116.82.65"; port = 2222; }; "alpine" = { diff --git a/global/system.nix b/global/system.nix index 5fdaf1f..e3b8b6f 100644 --- a/global/system.nix +++ b/global/system.nix @@ -1,6 +1,6 @@ # https://search.nixos.org/options -user: { config, pkgs, ... }: +user: { config, pkgs, lib, ... }: { home-manager.users.${user}.imports = [ @@ -68,10 +68,10 @@ user: { config, pkgs, ... }: }; }; - i18n.defaultLocale = "en_GB.UTF-8"; + i18n.defaultLocale = lib.mkDefault "en_GB.UTF-8"; services.xserver = { - layout = "gb"; + layout = lib.mkDefault "gb"; xkbOptions = "caps:escape"; # extraLayouts = { # mine = { diff --git a/lib/modules/gamer.nix b/lib/modules/gamer.nix index 72535b0..3d6e7f8 100644 --- a/lib/modules/gamer.nix +++ b/lib/modules/gamer.nix @@ -6,13 +6,16 @@ with lib; }; config = mkIf config.roles.gamer.enable { + # required for heroic launcher + nixpkgs.config.permittedInsecurePackages = [ + "electron-24.8.6" + ]; home-manager.users.${user}.imports = [{ home.packages = with pkgs; [ airshipper minetest superTuxKart - osu-lazer xonotic heroic diff --git a/lib/modules/wayland.nix b/lib/modules/wayland.nix index 0c1f22c..4aa7fa0 100644 --- a/lib/modules/wayland.nix +++ b/lib/modules/wayland.nix @@ -57,6 +57,7 @@ in windowrule = float, title:wlogout windowrule = idleinhibit always, vrmonitor + windowrule = idleinhibit focus, steam_app bind = SUPER, h, movefocus,l bind = SUPER, l, movefocus,r