tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

update and fix bits

Browse source
This commit is contained in:
tristan 2023-12-03 21:01:39 +00:00
parent 22e8556a47
commit d3649cf6e2
5 changed files with 28 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

38
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1697555443, "lastModified": 1699783872,
"narHash": "sha256-nsq8A+adEdN7bvVdz09LFyrHkTW5GtOzo/ctlHhyaaE=", "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b3acf1dc78b38a2fe03b287fead44d7ad25ac7c5", "rev": "280721186ab75a76537713ec310306f0eba3e407",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -30,11 +30,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1697569807, "lastModified": 1700051522,
"narHash": "sha256-NCyGgz4ppDf7uEfBrR7LYQI4BH9umOeUrxK25LyEdo4=", "narHash": "sha256-u9k9O8oN5udH3ReAjJKribuJD8jHGHu5MDkJAXpqplo=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "a0b675ec9e57af8bc631fc8cc54d062b58669a9f", "rev": "9e3dccca76ca3af4e96ac80c2ddef4774dc1354b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -70,11 +70,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1694767346, "lastModified": 1698134075,
"narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -86,11 +86,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1697456312, "lastModified": 1699781429,
"narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", "narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ca012a02bf8327be9e488546faecae5e05d7d749", "rev": "e44462d6021bfe23dfb24b775cc7c390844f773d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -125,18 +125,18 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1696410538, "lastModified": 1699292815,
"narHash": "sha256-ecDhdYLXWHsxMv+EWG36mCNDvzRbu9qfjH7dLxL7aGM=", "narHash": "sha256-HXu98PyBMKEWLqiTb8viuLDznud/SdkdJsx5A5CWx7I=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", "rev": "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", "rev": "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1",
"type": "gitlab" "type": "gitlab"
} }
}, },
@ -156,11 +156,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1694628480, "lastModified": 1697981233,
"narHash": "sha256-Qg9hstRw0pvjGu5hStkr2UX1D73RYcQ9Ns/KnZMIm9w=", "narHash": "sha256-y8q4XUwx+gVK7i2eLjfR32lVo7TYvEslyzrmzYEaPZU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "8f45a6435069b9e24ebd3160eda736d7a391cbf2", "rev": "22e7a65ff9633e1dedfa5317fdffc49f68de2ff2",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
global/home.nix
View file

@ -157,6 +157,7 @@ in
programs.ssh.matchBlocks = { programs.ssh.matchBlocks = {
"git.tristans.cloud" = { "git.tristans.cloud" = {
user = "git"; user = "git";
hostname = "100.116.82.65";
port = 2222; port = 2222;
}; };
"alpine" = { "alpine" = {

6
global/system.nix
View file

@ -1,6 +1,6 @@
# https://search.nixos.org/options # https://search.nixos.org/options
user: { config, pkgs, ... }: user: { config, pkgs, lib, ... }:
{ {
home-manager.users.${user}.imports = [ 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 = { services.xserver = {
layout = "gb"; layout = lib.mkDefault "gb";
xkbOptions = "caps:escape"; xkbOptions = "caps:escape";
# extraLayouts = { # extraLayouts = {
# mine = { # mine = {

5
lib/modules/gamer.nix
View file

@ -6,13 +6,16 @@ with lib;
}; };
config = mkIf config.roles.gamer.enable { config = mkIf config.roles.gamer.enable {
# required for heroic launcher
nixpkgs.config.permittedInsecurePackages = [
"electron-24.8.6"
];
home-manager.users.${user}.imports = [{ home-manager.users.${user}.imports = [{
home.packages = with pkgs; [ home.packages = with pkgs; [
airshipper airshipper
minetest minetest
superTuxKart superTuxKart
osu-lazer
xonotic xonotic
heroic heroic

1
lib/modules/wayland.nix
View file

@ -57,6 +57,7 @@ in
windowrule = float, title:wlogout windowrule = float, title:wlogout
windowrule = idleinhibit always, vrmonitor windowrule = idleinhibit always, vrmonitor
windowrule = idleinhibit focus, steam_app
bind = SUPER, h, movefocus,l bind = SUPER, h, movefocus,l
bind = SUPER, l, movefocus,r bind = SUPER, l, movefocus,r