winston/dotfiles
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

fix(linux): override sway

Browse source
This commit is contained in:
winston 2023-05-01 05:46:00 +02:00
parent 5f544227e7
commit aacc60231a
Signed by: winston
GPG key ID: 3786770EDBC2B481
4 changed files with 39 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
flake.lock
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682009832, "lastModified": 1682773107,
"narHash": "sha256-QdNOeFE7sI+0ddqVfn9vQDCUs7OdxhJ7evo9sdyP82Y=", "narHash": "sha256-+h94XeJnG3uk5imJlBi/1lVmcfCbxHpwZp5u7n3Krwg=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "a1ee4d333b092bc055655fb06229eb3013755812", "rev": "379d42fad6bc5c28f79d5f7ff2fa5f1c90cb7bf8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -113,11 +113,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682535786, "lastModified": 1682779989,
"narHash": "sha256-NH2a8yB8V25cglvcHDrvaTLvohzMgGLLZ4vnXQn4vOw=", "narHash": "sha256-H8AjcIBYFYrlRobYJ+n1B+ZJ6TsaaeZpuLn4iRqVvr4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d82c9af8175878a461a0fdf914e67cc446664570", "rev": "3144311f31194b537808ae6848f86f3dbf977d59",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -131,11 +131,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1682038408, "lastModified": 1682804856,
"narHash": "sha256-XNbXEtNMlHcqVBCiXClsf92ZShOJgzZ5uAKUPwh/HAs=", "narHash": "sha256-6wid+0ayFgmUUdEgKO7AmXEk6bUZNmq8bn4pFA0Kyhs=",
"owner": "nekowinston", "owner": "nekowinston",
"repo": "nur", "repo": "nur",
"rev": "e27d77ad3f5be8273424eb515d107e69c8de695f", "rev": "a2df2ca00e11a1b5e3c5d5e10c200a32f5461834",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -198,11 +198,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1682173319, "lastModified": 1682817260,
"narHash": "sha256-tPhOpJJ+wrWIusvGgIB2+x6ILfDkEgQMX0BTtM5vd/4=", "narHash": "sha256-kFMXzKNj4d/0Iqbm5l57rHSLyUeyCLMuvlROZIuuhvk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ee7ec1c71adc47d2e3c2d5eb0d6b8fbbd42a8d1c", "rev": "db1e4eeb0f9a9028bcb920e00abbc1409dd3ef36",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -214,11 +214,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1682109806, "lastModified": 1682900373,
"narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=", "narHash": "sha256-+ckiCxbGFSs1/wHKCXAZnvb37Htf6k5nmQE3T0Y7hK8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2362848adf8def2866fabbffc50462e929d7fffb", "rev": "8b3bc690e201c8d3cbd14633dbf3462a820e73f2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -246,11 +246,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1682109806, "lastModified": 1682779028,
"narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=", "narHash": "sha256-tFfSbwSLobpHRznAa35KEU3R+fsFWTlmpFhTUdXq8RE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2362848adf8def2866fabbffc50462e929d7fffb", "rev": "54abe781c482f51ff4ff534ebaba77db5bd97442",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -260,29 +260,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": {
"locked": {
"lastModified": 1673947312,
"narHash": "sha256-xx/2nRwRy3bXrtry6TtydKpJpqHahjuDB5sFkQ/XNDE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2d38b664b4400335086a713a0036aafaa002c003",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1682576338, "lastModified": 1682906770,
"narHash": "sha256-+I4oXCpugPSaZ7SKI35OLSF/hy+rlZ/iNOGvcjqM2h4=", "narHash": "sha256-0QOoDy++SZxgVue3ImU4T+ESpdjr4FdvKgQHJIP32Dg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "342c8e2c9e72b2c3f6bd18f491e5b8bf7d5fcd9a", "rev": "77a4b1338c7460d6d241969e3258713bbd7078dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -300,11 +284,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1682326782, "lastModified": 1682596858,
"narHash": "sha256-wj7p7iEwQXAfTZ6QokAe0dMbpQk5u7ympDnaiPvbv1w=", "narHash": "sha256-Hf9XVpqaGqe/4oDGr30W8HlsWvJXtMsEPHDqHZA6dDg=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "56cd2d47a9c937be98ab225cf014b450f1533cdb", "rev": "fb58866e20af98779017134319b5663b8215d912",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -333,11 +317,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1682539132, "lastModified": 1682823324,
"narHash": "sha256-djX/Vp1snR1XHyk400HKCfwWVoLBE8uiQalTXMH7Kj0=", "narHash": "sha256-KNu3OAqVyoKwnDP+gqptjQYCnZXxEwXccR89c0r1/8k=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "4a330ead6a990365c9bb48f30523ac048fb6d8ae", "rev": "4f308f76633f81253a12b80e7b05b80d325005b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -349,14 +333,16 @@
"swayfx": { "swayfx": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"nixpkgs": "nixpkgs_5" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1682312035, "lastModified": 1682880664,
"narHash": "sha256-tiLO0eYKASUuvs12CWujAwZ55lj2FVnoutIB6ntfRdw=", "narHash": "sha256-q3f6MHXeY+uZz0nCqEC19Z7wJVtx6JcIjwyKt+1yIl0=",
"owner": "willpower3309", "owner": "willpower3309",
"repo": "swayfx", "repo": "swayfx",
"rev": "3d1b294cc078c96120a4fb44a885a0eebe07ba96", "rev": "74e7012b21d48200cf67608f965befe5a308a8bb",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View file

@ -20,6 +20,8 @@
# dev # dev
swayfx.url = "github:willpower3309/swayfx"; swayfx.url = "github:willpower3309/swayfx";
swayfx.inputs.nixpkgs.follows = "nixpkgs";
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
}; };
@ -48,6 +50,7 @@
}; };
}; };
}; };
sway-unwrapped = swayfx.packages.${prev.system}.default;
}; };
commonHMConfig = { commonHMConfig = {
username, username,
@ -73,7 +76,7 @@
if pkgs.stdenv.isDarwin if pkgs.stdenv.isDarwin
then "/Users/${username}/.config/nixpkgs" then "/Users/${username}/.config/nixpkgs"
else "/home/${username}/.config/nixpkgs"; else "/home/${username}/.config/nixpkgs";
inherit machine swayfx; inherit machine;
}; };
}; };
}; };
@ -147,7 +150,6 @@
if pkgs.stdenv.isDarwin if pkgs.stdenv.isDarwin
then "/Users/${username}/.config/nixpkgs" then "/Users/${username}/.config/nixpkgs"
else "/home/${username}/.config/nixpkgs"; else "/home/${username}/.config/nixpkgs";
inherit swayfx;
machine.personal = false; machine.personal = false;
}; };
}; };

2
home/apps/i3.nix
View file

@ -3,7 +3,6 @@
lib, lib,
flakePath, flakePath,
pkgs, pkgs,
swayfx,
... ...
}: let }: let
inherit (pkgs.stdenv.hostPlatform) isLinux; inherit (pkgs.stdenv.hostPlatform) isLinux;
@ -461,7 +460,6 @@ in {
wayland.windowManager.sway = lib.mkIf isLinux { wayland.windowManager.sway = lib.mkIf isLinux {
enable = true; enable = true;
package = swayfx;
config = config =
commonConfig {wayland = true;} commonConfig {wayland = true;}
// { // {

4
machines/common/linux/xsession.nix
View file

@ -34,10 +34,10 @@
default_session = let default_session = let
swaycmd = pkgs.writeShellScript "swaycmd" '' swaycmd = pkgs.writeShellScript "swaycmd" ''
export NIXOS_OZONE_WL=1 XDG_CURRENT_DESKTOP=sway export NIXOS_OZONE_WL=1 XDG_CURRENT_DESKTOP=sway
sway > /tmp/sway.log 2>&1 ${pkgs.sway}/bin/sway > /tmp/sway.log 2>&1
''; '';
in { in {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd ${swaycmd}"; command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --cmd ${swaycmd}";
user = "greeter"; user = "greeter";
}; };
}; };