cachyos again + cleanup
This commit is contained in:
parent
3408de28a2
commit
e63c95d319
@ -31,10 +31,8 @@
|
|||||||
|
|
||||||
#kernel options
|
#kernel options
|
||||||
boot = {
|
boot = {
|
||||||
# kernelPackages = pkgs.linuxPackages_cachyos-lto;
|
kernelPackages = pkgs.linuxPackages_cachyos-lto;
|
||||||
kernelPackages = pkgs.linuxPackages_6_10;
|
# kernelPackages = pkgs.linuxPackages_6_10;
|
||||||
|
|
||||||
supportedFilesystems = [ "zfs" ];
|
|
||||||
|
|
||||||
kernel.sysctl = {
|
kernel.sysctl = {
|
||||||
#for profiling
|
#for profiling
|
||||||
|
|||||||
6
etcnixos/flake.lock
generated
6
etcnixos/flake.lock
generated
@ -316,11 +316,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727613673,
|
"lastModified": 1727665282,
|
||||||
"narHash": "sha256-qqIffTQfxMYo3MKQ9BoY2s2mdKZNnUiksdnxv81js9U=",
|
"narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "f5c239fa9acb27f0a5326ba2949c00fada89ca9f",
|
"rev": "11c43c830e533dad1be527ecce379fcf994fbbb5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@ -15,6 +15,9 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
|
kernelPackages = pkgs.linuxPackages_6_10;
|
||||||
|
supportedFilesystems = [ "zfs" ];
|
||||||
|
|
||||||
kernelPatches = [
|
kernelPatches = [
|
||||||
#for making ALVR support better :)
|
#for making ALVR support better :)
|
||||||
{
|
{
|
||||||
|
|||||||
51
home-manager/flake.lock
generated
51
home-manager/flake.lock
generated
@ -33,11 +33,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727595111,
|
"lastModified": 1727688294,
|
||||||
"narHash": "sha256-i9Pz4vOnBdn1nqJmOL1+gP+A3nrK2WkOR8AO6RoIkQg=",
|
"narHash": "sha256-bbisTJPMAObX/GD6tXjR1+4F/ED/jZgiZnFcXjnLC7k=",
|
||||||
"owner": "orhun",
|
"owner": "orhun",
|
||||||
"repo": "binsider",
|
"repo": "binsider",
|
||||||
"rev": "b1116e6118d3b6c481d9d99b25c23e2155260b97",
|
"rev": "3f4f742cfc759425ef767605417ff19d257023f9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -68,22 +68,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"firefox-mod-theme": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1727035403,
|
|
||||||
"narHash": "sha256-xkVZOZRGrL5YKEXb0R701F71vGJ+K5BFpugtqPwf4XQ=",
|
|
||||||
"owner": "datguypiko",
|
|
||||||
"repo": "Firefox-Mod-Blur",
|
|
||||||
"rev": "694566afa267fe6d5eb5c97a87e116ba794ea293",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "datguypiko",
|
|
||||||
"repo": "Firefox-Mod-Blur",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-parts": {
|
"flake-parts": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs-lib": "nixpkgs-lib"
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
@ -153,11 +137,11 @@
|
|||||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727573335,
|
"lastModified": 1727701561,
|
||||||
"narHash": "sha256-RCcDnBgJpP8GVdIrmS7IFhpUCWQjaYS4j7NBT6cbZ3s=",
|
"narHash": "sha256-WY8hXcI5835QYQL7aSo2N2mpzt7iZzmt+I+//zqLNcA=",
|
||||||
"owner": "sodiboo",
|
"owner": "sodiboo",
|
||||||
"repo": "niri-flake",
|
"repo": "niri-flake",
|
||||||
"rev": "415bbec6b9482afa0605682cf31064964ae705c6",
|
"rev": "31730f5948bdcbe2f909feb414912f0abdc1fbd7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -186,11 +170,11 @@
|
|||||||
"niri-unstable": {
|
"niri-unstable": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727525902,
|
"lastModified": 1727699256,
|
||||||
"narHash": "sha256-NUsPodaJn384rLdPawH1u1cxHzE25EdrXMLkpRTkGFA=",
|
"narHash": "sha256-/8+/LrIClf0ME2sC1R25p7JXT7n17xHDElCd8I/VOoc=",
|
||||||
"owner": "YaLTeR",
|
"owner": "YaLTeR",
|
||||||
"repo": "niri",
|
"repo": "niri",
|
||||||
"rev": "c04ccafd0a2cb26c1f6a4835f4cbb01ffdb926a6",
|
"rev": "b501a9b303d9722173565d4b8f7f044a38cbc099",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -264,7 +248,6 @@
|
|||||||
"inputs": {
|
"inputs": {
|
||||||
"agenix": "agenix",
|
"agenix": "agenix",
|
||||||
"binsider": "binsider",
|
"binsider": "binsider",
|
||||||
"firefox-mod-theme": "firefox-mod-theme",
|
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"niri": "niri",
|
"niri": "niri",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
@ -281,11 +264,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727577080,
|
"lastModified": 1727663505,
|
||||||
"narHash": "sha256-2LPT76Acp6ebt7fCt90eq/M8T2+X09s/yTVgfVFrtno=",
|
"narHash": "sha256-83j/GrHsx8GFUcQofKh+PRPz6pz8sxAsZyT/HCNdey8=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "73a833855442ce8cee710cf4d8d054fea1c81196",
|
"rev": "c2099c6c7599ea1980151b8b6247a8f93e1806ee",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -381,15 +364,15 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727287465,
|
"lastModified": 1727680504,
|
||||||
"narHash": "sha256-XQAf5M593WmxgaXagtkci/H9DA3jSVx1TJk6F3X5VQo=",
|
"narHash": "sha256-QYlWZwUSwrM7BuO+dXclZIwoPvBIuJr6GpFKv9XKFPI=",
|
||||||
"owner": "MarceColl",
|
"owner": "ch4og",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "96f1b5d80bf7360cb77c9b521f388324f18383a0",
|
"rev": "a026029bd9c953559a6990a5c0c80e355ed8a9dc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "MarceColl",
|
"owner": "ch4og",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -31,7 +31,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
zen-browser = {
|
zen-browser = {
|
||||||
url = "github:MarceColl/zen-browser-flake";
|
url = "github:ch4og/zen-browser-flake";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -46,12 +46,6 @@
|
|||||||
url = "github:Matoking/vdf/support_new_bvdf";
|
url = "github:Matoking/vdf/support_new_bvdf";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
firefox-mod-theme = {
|
|
||||||
url = "github:datguypiko/Firefox-Mod-Blur";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
@ -71,7 +65,6 @@
|
|||||||
pkgs = import nixpkgs { };
|
pkgs = import nixpkgs { };
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
||||||
homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration {
|
homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration {
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
extraSpecialArgs = {
|
extraSpecialArgs = {
|
||||||
@ -82,13 +75,11 @@
|
|||||||
niri.homeModules.config
|
niri.homeModules.config
|
||||||
agenix.homeManagerModules.age
|
agenix.homeManagerModules.age
|
||||||
|
|
||||||
# add declarative rust modules
|
|
||||||
(
|
(
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
rust-overlay.overlays.default
|
rust-overlay.overlays.default
|
||||||
niri.overlays.niri
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# home-manager stuff
|
# home-manager stuff
|
||||||
|
|||||||
@ -1,19 +0,0 @@
|
|||||||
diff --git a/main.qml b/main.qml
|
|
||||||
index 1e685385..7c747eba 100644
|
|
||||||
--- a/main.qml
|
|
||||||
+++ b/main.qml
|
|
||||||
@@ -72,12 +72,14 @@ Window {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ /*
|
|
||||||
// check if we have access to settings and if not show an error
|
|
||||||
if (!hasShownSettingsAccess && !LLM.hasSettingsAccess()) {
|
|
||||||
errorSettingsAccess.open();
|
|
||||||
hasShownSettingsAccess = true;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
+ */
|
|
||||||
|
|
||||||
// check for first time start of this version
|
|
||||||
if (!hasCheckedFirstStart) {
|
|
||||||
@ -15,8 +15,6 @@
|
|||||||
|
|
||||||
#manage bluetooth devices
|
#manage bluetooth devices
|
||||||
blueman
|
blueman
|
||||||
|
|
||||||
niri-unstable
|
|
||||||
];
|
];
|
||||||
|
|
||||||
#bluetooth manager
|
#bluetooth manager
|
||||||
@ -30,7 +28,6 @@
|
|||||||
|
|
||||||
#window manager
|
#window manager
|
||||||
programs.niri = {
|
programs.niri = {
|
||||||
package = pkgs.niri-unstable;
|
|
||||||
settings = import ./progs/niri.nix { inherit config pkgs homeDirectory; };
|
settings = import ./progs/niri.nix { inherit config pkgs homeDirectory; };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user