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

Compare commits

base: steveej:b99b06edf6cb72b67b82ecfa38c86a871de72511
Branches Tags
steveej:master
steveej:WIP-router0-nfmnk-tunnels
steveej:wip
steveej:wip-bpir3
steveej:pr_htz0
steveej:evolution_decsync
steveej:t14_relabel
steveej:t14_new_drive
steveej:srv0_drivechange
steveej:staging-steveej
steveej:pa600-unused
steveej:pr/odroidh2p-0
..
compare: steveej:63f3ec7a199f62d22040b3b1ec0fec52623fdc2e
Branches Tags
steveej:master
steveej:WIP-router0-nfmnk-tunnels
steveej:wip
steveej:wip-bpir3
steveej:pr_htz0
steveej:evolution_decsync
steveej:t14_relabel
steveej:t14_new_drive
steveej:srv0_drivechange
steveej:staging-steveej
steveej:pa600-unused
steveej:pr/odroidh2p-0

No commits in common. "b99b06edf6cb72b67b82ecfa38c86a871de72511" and "63f3ec7a199f62d22040b3b1ec0fec52623fdc2e" have entirely different histories.
b99b06edf6 ... 63f3ec7a19

4 changed files with 33 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nix/home-manager/configuration/graphical-fullblown.nix
View file

@ -131,7 +131,7 @@ in
# FIXME: depends on insecure openssl 1.1.1t # FIXME: depends on insecure openssl 1.1.1t
# kotatogram-desktop # kotatogram-desktop
pkgsUnstable.tdesktop pkgsUnstable.tdesktop
pkgsUnstable.signal-desktop-source nodeFlake.inputs.signal-desktop.packages.${pkgs.system}.default
# Virtualization # Virtualization
virt-manager virt-manager

4
nix/home-manager/programs/firefox.nix
View file

@ -29,8 +29,6 @@ let
auto-tab-discard auto-tab-discard
youtube-recommended-videos youtube-recommended-videos
display-_anchors
]; ];
customAddons = [ customAddons = [
@ -319,7 +317,7 @@ in
}; };
programs.firefox = { programs.firefox = {
enable = true; enable = true;
package = pkgs.firefox-esr; package = pkgs.firefox-esr-128;
profiles = mkProfiles { profiles = mkProfiles {
"personal" = mkProfile { "personal" = mkProfile {

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

@ -38,11 +38,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745812220, "lastModified": 1743598667,
"narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=", "narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "d0c543d740fad42fe2c035b43c9d41127e073c78", "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -72,21 +72,6 @@
} }
}, },
"flake-compat": { "flake-compat": {
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": {
"locked": { "locked": {
"lastModified": 1733328505, "lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
@ -100,7 +85,7 @@
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
} }
}, },
"flake-compat_3": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -191,15 +176,12 @@
} }
}, },
"get-flake": { "get-flake": {
"inputs": {
"flake-compat": "flake-compat"
},
"locked": { "locked": {
"lastModified": 1745945175, "lastModified": 1714237590,
"narHash": "sha256-JGDbJRl5v1snA4JX+yp6m3UA6Mazr59Hrgz+UhhP91M=", "narHash": "sha256-9gtHdGbzFHaR20xORN8IYd67ROWS+1nqQ5CsPf9MD8I=",
"owner": "ursi", "owner": "ursi",
"repo": "get-flake", "repo": "get-flake",
"rev": "38401aa2b3a99c77d0c02727471e99e7de2fc366", "rev": "a6c57417d1b857b8be53aba4095869a0f438c502",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -232,16 +214,16 @@
"linux-jhovold": { "linux-jhovold": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1745847827, "lastModified": 1742827326,
"narHash": "sha256-ewM7Rpd6On6ys3OkcWOtR7TNWSRZRLZpRP7L9syhn6s=", "narHash": "sha256-HJdy4JgRvFojago9I0InGPkAwsJ0xv7NvVS05JygWsc=",
"owner": "jhovold", "owner": "jhovold",
"repo": "linux", "repo": "linux",
"rev": "1786db28b335abb5a0fa1e8a27e9950a73f64acf", "rev": "cf34af9cea0db94254af3897c5e403364cb2eb5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "jhovold", "owner": "jhovold",
"ref": "wip/sc8280xp-6.15-rc4", "ref": "wip/sc8280xp-6.14",
"repo": "linux", "repo": "linux",
"type": "github" "type": "github"
} }
@ -249,7 +231,7 @@
"mycelium": { "mycelium": {
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nix-filter": "nix-filter", "nix-filter": "nix-filter",
"nixpkgs": [ "nixpkgs": [
@ -257,11 +239,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745920427, "lastModified": 1742897527,
"narHash": "sha256-E5uUuKv7Mn0/EfmffRQZpSeATcSzJFVeYVF6Cn7KbJc=", "narHash": "sha256-yhA9KYzOC7QLa+4pFVBrwWsjDWGvuWl9l0YVBwxw4cg=",
"owner": "threefoldtech", "owner": "threefoldtech",
"repo": "mycelium", "repo": "mycelium",
"rev": "1eec5651bf5f194b7f7875ec2483582ccebf1cc1", "rev": "60d8f4a9f102bf12cc4bc05fca8a252fccd10fe5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -287,7 +269,7 @@
}, },
"nix-snapshotter": { "nix-snapshotter": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_2",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -317,11 +299,11 @@
"x13s-bt-linux-firmware": "x13s-bt-linux-firmware" "x13s-bt-linux-firmware": "x13s-bt-linux-firmware"
}, },
"locked": { "locked": {
"lastModified": 1745914252, "lastModified": 1743245017,
"narHash": "sha256-u8hbsI+oW+cO+omdGeY6Q+Z/NvVZaHIZS70f1mq1gac=", "narHash": "sha256-zCZc3p8zD9GOKxnlghzXOZbewVKQkkEvcDO+XT+iyrY=",
"ref": "bump", "ref": "bump",
"rev": "8bd7972c74b12b45aee190ce2ddd6960a0771af6", "rev": "f4591e4478838272ec024c2bd346001af919a79a",
"revCount": 147, "revCount": 143,
"type": "git", "type": "git",
"url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git" "url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git"
}, },
@ -345,11 +327,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1746055187, "lastModified": 1743703532,
"narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", "rev": "bdb91860de2f719b57eef819b5617762f7120c70",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -361,16 +343,16 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1745930157, "lastModified": 1743814133,
"narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", "narHash": "sha256-drDyYyUmjeYGiHmwB9eOPTQRjmrq3Yz26knwmMPLZFk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", "rev": "250b695f41e0e2f5afbf15c6b12480de1fe0001b",
"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"
} }
@ -400,11 +382,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745037528, "lastModified": 1742243404,
"narHash": "sha256-twzHVBNEX6daUCFwtjn3X7WaJnwRqHeAxX0MB7kosHo=", "narHash": "sha256-j3jdXEU+c6xPa4zdzN2PYNsRkdlgldb1q0aBY50+AdM=",
"owner": "youwen5", "owner": "youwen5",
"repo": "signal-desktop-flake", "repo": "signal-desktop-flake",
"rev": "1b41af6489574da6ba1e0186235c87acbf57163f", "rev": "226d1cbe55bd07d9f66bf801619a7495189e102d",
"type": "github" "type": "github"
}, },
"original": { "original": {

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

@ -2,7 +2,7 @@
inputs = { inputs = {
nixpkgs.follows = "nixpkgs-unstable"; nixpkgs.follows = "nixpkgs-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small";
# nixpkgs-unstable.url = "github:steveej-forks/nixpkgs/nixos-unstable"; # nixpkgs-unstable.url = "github:steveej-forks/nixpkgs/nixos-unstable";
get-flake.url = "github:ursi/get-flake"; get-flake.url = "github:ursi/get-flake";