Compare commits

..

4 Commits

Author SHA1 Message Date
Renovate Bot
fdcb0ede25 Lock file maintenance
Some checks are pending
Nix Build / build-nixos (pull_request) Successful in 7m35s
Nix Build / build-nixos (push) Waiting to run
2025-02-22 02:04:23 +00:00
soraefir
74182b2a3e
fix umu
All checks were successful
Nix Build / build-nixos (push) Successful in 24m26s
2025-02-21 23:53:13 +01:00
soraefir
12646765c2
Disabled user sops for now
Some checks failed
Nix Build / build-nixos (push) Failing after 2m9s
2025-02-21 21:48:43 +01:00
soraefir
495862c294
Removed umu input 2025-02-21 21:47:39 +01:00
4 changed files with 38 additions and 68 deletions

89
flake.lock generated
View File

@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739103745, "lastModified": 1739298463,
"narHash": "sha256-c53dcRaw0F4Os9WD05HwIRs9kTDZw4Mxe1XK4edEALo=", "narHash": "sha256-oAFv9jKwwA7d7384d2LeywDSgwhvb3ZnrwbfoWPhXsI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "a3dda0d10ce9aa1d1dfb7a6c139ea8c2872c74bd", "rev": "f239e5aadd6d23c48e085c2de3397e2058e54d16",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -78,11 +78,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739548217, "lastModified": 1739933872,
"narHash": "sha256-rlv64erpr36xdmMDPgf9rhRXBYZ0BZb5nrw2ZPSk1sQ=", "narHash": "sha256-UhuvTR4OrWR+WBaRCZm4YMkvjJhZ1KZo/jRjE41m+Ek=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "678b22642abde2ee77ae2218ab41d802f010e5b0", "rev": "6ab392f626a19f1122d1955c401286e1b7cf6b53",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -174,11 +174,11 @@
}, },
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1738816619, "lastModified": 1740089251,
"narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "2eccff41bab80839b1d25b303b53d339fbb07087", "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -210,11 +210,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739570999, "lastModified": 1739757849,
"narHash": "sha256-eCc0/Q4bPpe4/AS+uzIrHLJcR6BxPQ69q2kD0/Qe6rU=", "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "254d47082e23dbf72fdeca1da6fe1da420f478d8", "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -300,11 +300,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1739665242, "lastModified": 1740169613,
"narHash": "sha256-eKIMpBXaGrB/V/afS4pjropo50FgLE1t1W2aMI4/mhA=", "narHash": "sha256-3bTa0nEDQTsfi+aDiGHikthn6dMuVOTCtsS0cvDV6Uw=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "897ee276dc0a8a6b11a8102b225a9e969faac0bf", "rev": "f4b148df1e2d8edc96bd878a4cfde32ca6515ac8",
"revCount": 5823, "revCount": 5836,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -449,11 +449,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739048933, "lastModified": 1739891528,
"narHash": "sha256-ck6MaoYvISBQKqZR+HcxXnx0wOhyCauxfVMaV5zhJxQ=", "narHash": "sha256-h8HOCZ/rw2Buzku+GKF77VXxrGjCSOQkLhptiEKMYg0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "e4e018a2ca6f5a9c33511973454199e1c7c85499", "rev": "61a5382f4b1ab578064d470b1b3d3f0df396b8ba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -508,11 +508,11 @@
}, },
"nixUnstable": { "nixUnstable": {
"locked": { "locked": {
"lastModified": 1739451785, "lastModified": 1740019556,
"narHash": "sha256-3ebRdThRic9bHMuNi2IAA/ek9b32bsy8F5R4SvGTIog=", "narHash": "sha256-vn285HxnnlHLWnv59Og7muqECNMS33mWLM14soFIv2g=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1128e89fd5e11bb25aedbfc287733c6502202ea9", "rev": "dad564433178067be1fbdfcce23b546254b6d641",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -524,11 +524,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1739484910, "lastModified": 1739923778,
"narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=", "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8", "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -555,11 +555,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1739446958, "lastModified": 1739866667,
"narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -576,11 +576,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1739669254, "lastModified": 1740186587,
"narHash": "sha256-081l707GpIdFlnY7wA6Qa4hvfkbO/BVxNZPK9WgvLhE=", "narHash": "sha256-kPaYbFAZYo4QAiDLAD+5YKw9FNBntxojgWS5TOY11Ls=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "84bb49a5943bded2f83ce483c5102bea01ba6d5e", "rev": "93be748a381ae0c5e97b64ffe9bafaa77312a974",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -623,8 +623,7 @@
"nixUnstable": "nixUnstable", "nixUnstable": "nixUnstable",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nur": "nur", "nur": "nur",
"sops-nix": "sops-nix", "sops-nix": "sops-nix"
"umu": "umu"
} }
}, },
"sops-nix": { "sops-nix": {
@ -683,30 +682,6 @@
"type": "github" "type": "github"
} }
}, },
"umu": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"dir": "packaging/nix",
"lastModified": 1739600212,
"narHash": "sha256-ai1gK6Q08/Y+QwS1jwPBIUI5Z3EjVg5UIiiNafscSlQ=",
"ref": "refs/heads/main",
"rev": "e9438ae2f5f046421e355789345d9981b7c3f9d8",
"revCount": 989,
"submodules": true,
"type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/"
},
"original": {
"dir": "packaging/nix",
"submodules": true,
"type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/"
}
},
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": [ "hyprland-protocols": [

View File

@ -21,11 +21,6 @@
url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
umu = {
url =
"git+https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix&submodules=1";
inputs.nixpkgs.follows = "nixpkgs";
};
sops-nix = { sops-nix = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View File

@ -13,9 +13,9 @@
#SOPS #SOPS
sops.defaultSopsFile = ./sops/${config.usercfg.username}.yaml; # sops.defaultSopsFile = ./sops/${config.usercfg.username}.yaml;
sops.age.keyFile = "/var/lib/sops-nix/age-key.txt"; # sops.age.keyFile = "/var/lib/sops-nix/age-key.txt";
sops.age.generateKey = true; # sops.age.generateKey = true;
sops.secrets."github_user_key" = { }; # sops.secrets."github_user_key" = { };
sops.secrets."curse_forge_key" = { }; # sops.secrets."curse_forge_key" = { };
} }

View File

@ -15,7 +15,7 @@
openttd-jgrpp openttd-jgrpp
bottles bottles
lutris lutris
inputs.umu.packages.${pkgs.system}.umu unstable.umu-launcher
wine wine
]; ];
}; };