steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

feat(sway,steveej-x13s): bumps and new display notes

Browse source
This commit is contained in:
steveej 2024-10-13 20:13:52 +02:00
parent f707f7ddc4
commit 3e942d1a41
4 changed files with 47 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

11
nix/home-manager/profiles/sway-desktop.nix
View file

@ -97,6 +97,17 @@ in {
pkgs.fuzzel pkgs.fuzzel
]; ];
# TODO: configure kanshi to always set the 5K resolution
# DP-1 "Philips Consumer Electronics Company PHL 499P9 AU02419010010 (DP-1 via DP)"
# Make: Philips Consumer Electronics Company
# Model: PHL 499P9
# Serial: AU02419010010
# Physical size: 1190x340 mm
# Enabled: yes
# Modes:
# 3840x1080 px, 59.967999 Hz (preferred)
# 5120x1440 px, 59.977001 Hz (current)
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
systemd.enable = true; systemd.enable = true;

58
nix/os/devices/steveej-x13s/flake.lock generated
View file

@ -165,16 +165,16 @@
"linux-jhovold": { "linux-jhovold": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725261528, "lastModified": 1728631036,
"narHash": "sha256-p2rP8fErEnrlrkl2l4ZfnWOG2U/ohAC9blx+sTpU4+I=", "narHash": "sha256-1LnClVjY6WS+IR9eqPFA7gzXm0cio3mY23NXj9cKHHs=",
"owner": "jhovold", "owner": "jhovold",
"repo": "linux", "repo": "linux",
"rev": "2997053728cd0675469399212061423e63b48c1f", "rev": "6a97bc22fa36010400b91e6d5979741c391112c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "jhovold", "owner": "jhovold",
"ref": "wip/sc8280xp-6.11-rc6", "ref": "wip/sc8280xp-6.12-rc2",
"repo": "linux", "repo": "linux",
"type": "github" "type": "github"
} }
@ -185,7 +185,9 @@
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nix-filter": "nix-filter", "nix-filter": "nix-filter",
"nixpkgs": "nixpkgs" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1725529869, "lastModified": 1725529869,
@ -242,29 +244,29 @@
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"linux-jhovold": "linux-jhovold", "linux-jhovold": "linux-jhovold",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1725606185, "lastModified": 1728680044,
"narHash": "sha256-ur40KNuaj90nv3tmNhozvNvhLWxFzyodtkYi/JOBZLE=", "narHash": "sha256-kDqUDwEEv1KPOObmdnO3zb5mFthFDHoPgzVDpmRIq44=",
"ref": "refs/heads/remaintain", "ref": "refs/heads/remaintain",
"rev": "759bf531bb9ffa1a45cabb01c6ee1bdb23b9b49b", "rev": "f691c125485b6764ebef0b9f148613d79de95525",
"revCount": 101, "revCount": 109,
"type": "git", "type": "git",
"url": "file:///home/steveej/src/others/nixos-x13s" "url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?branch=remaintain"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "file:///home/steveej/src/others/nixos-x13s" "url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?branch=remaintain"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1716509168, "lastModified": 1725432240,
"narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bfb7a882678e518398ce9a31a881538679f6f092", "rev": "ad416d066ca1222956472ab7d0555a6946746a80",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -288,37 +290,21 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1725634671, "lastModified": 1728621521,
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "narHash": "sha256-Fk8C/cywdAP//XjK1/CF2VMIRoQjhosCor71p84ff+c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "rev": "7045aa75c71e90ae3bbb486d35414b08add9c424",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-unstable-small",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1725432240,
"narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ad416d066ca1222956472ab7d0555a6946746a80",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1725826545, "lastModified": 1725826545,
"narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=", "narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=",
@ -342,7 +328,7 @@
"mycelium": "mycelium", "mycelium": "mycelium",
"nix-snapshotter": "nix-snapshotter", "nix-snapshotter": "nix-snapshotter",
"nixos-x13s": "nixos-x13s", "nixos-x13s": "nixos-x13s",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable"
} }
}, },

21
nix/os/devices/steveej-x13s/flake.nix
View file

@ -1,9 +1,10 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
# nixpkgs.follows = "nixpkgs-unstable";
# required for home-manager modules # required for home-manager modules
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small";
get-flake.url = "github:ursi/get-flake"; get-flake.url = "github:ursi/get-flake";
@ -15,8 +16,13 @@
}; };
nixos-x13s.url = nixos-x13s.url =
# "git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?branch=remaintain" "git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?branch=remaintain"
"/home/steveej/src/others/nixos-x13s" # 6.11.0
# "git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?branch=remaintain&rev=6b9efe77ca80653354981c720af3c4241ac71490"
# 6.12.0-rc6
# "git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?branch=remaintain&rev=bd580ee9c35fcb8a720122d5bb2f903f1b7395ee"
# "git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?branch=remaintain&rev=1286d20be2321a1a2d27f5d09257ebaf54ce0630"
#"/home/steveej/src/others/nixos-x13s"
# #
; ;
@ -25,6 +31,7 @@
# nixos-x13s.inputs.nixpkgs.follows = "nixpkgs"; # nixos-x13s.inputs.nixpkgs.follows = "nixpkgs";
mycelium.url = "github:threefoldtech/mycelium"; mycelium.url = "github:threefoldtech/mycelium";
mycelium.inputs.nixpkgs.follows = "nixpkgs";
nix-snapshotter = { nix-snapshotter = {
url = "github:yu-re-ka/nix-snapshotter"; url = "github:yu-re-ka/nix-snapshotter";
@ -42,14 +49,6 @@
nativeSystem = "aarch64-linux"; nativeSystem = "aarch64-linux";
nodeName = "steveej-x13s"; nodeName = "steveej-x13s";
pkgs = nixpkgs.legacyPackages.${nativeSystem};
pkgsCross = import self.inputs.nixpkgs {
system = "x86_64-linux";
crossSystem = {
config = "aarch64-unknown-linux-gnu";
};
};
repoFlake = get-flake ../../../..; repoFlake = get-flake ../../../..;
mkNixosConfiguration = {extraModules ? [], ...} @ attrs: mkNixosConfiguration = {extraModules ? [], ...} @ attrs:

8
nix/os/snippets/sway-desktop.nix
View file

@ -74,10 +74,10 @@ in {
extraPortals = [ extraPortals = [
# repoFlake.inputs.nixpkgs-wayland.packages.${pkgs.system}.xdg-desktop-portal-wlr # repoFlake.inputs.nixpkgs-wayland.packages.${pkgs.system}.xdg-desktop-portal-wlr
# pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-gtk
(pkgs.xdg-desktop-portal-gtk.override (_: { # (pkgs.xdg-desktop-portal-gtk.override (_: {
buildPortalsInGnome = false; # buildPortalsInGnome = false;
})) # }))
]; ];
}; };