Compare commits

..

No commits in common. "4c415ebe5107afdcd0f11100bde76d61a78f5be6" and "c71d218ee32beba107dd818f65f88aef34c22da2" have entirely different histories.

5 changed files with 25 additions and 29 deletions

View file

@ -160,11 +160,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1703178811, "lastModified": 1702203126,
"narHash": "sha256-Orbqa8DvszYZ38XGWAs43hVs++czt2N6/Y0sFRLhJms=", "narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "fb5ac0c870a1b3ffea70e02ab1720d991ce812ae", "rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -230,16 +230,16 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1703200384, "lastModified": 1702296239,
"narHash": "sha256-q5j06XOsy0qHOarsYPfZYJPWbTbc8sryRxianlEPJN0=", "narHash": "sha256-9OPu0MMa+iVf6I3nqZsJ0ssLUvK6dVqueuJldlwdqgQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0b3d618173114c64ab666f557504d6982665d328", "rev": "fecdbce27a28ca6a434b6065e2a54dd87d1e44b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-23.11", "ref": "release-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -326,11 +326,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1703013332, "lastModified": 1702151865,
"narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -342,11 +342,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1702830618, "lastModified": 1701436327,
"narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -363,11 +363,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1703185304, "lastModified": 1702334607,
"narHash": "sha256-CKsV786NBB8fuls4vyKGTfOz9bkpAn2lh8PKL8YLZ+M=", "narHash": "sha256-C5UavWJC9xN2uFbn0G6Vc6t5GTwZCiQTwV/SUFR4ru4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "43d20e833267ffd026af692060fb344960930fe1", "rev": "c9149122a8930b370678bf59b7b3226a2a6ee76a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -388,11 +388,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1702456155, "lastModified": 1700922917,
"narHash": "sha256-I2XhXGAecdGlqi6hPWYT83AQtMgL+aa3ulA85RAEgOk=", "narHash": "sha256-ej2fch/T584b5K9sk1UhmZF7W6wEfDHuoUYpFN8dtvM=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "007a45d064c1c32d04e1b8a0de5ef00984c419bc", "rev": "e5ee5c5f3844550c01d2131096c7271cec5e9b78",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -4,13 +4,9 @@
inputs = { inputs = {
utils.url = "github:numtide/flake-utils"; utils.url = "github:numtide/flake-utils";
nixvim.url = "github:nix-community/nixvim"; nixvim.url = "github:nix-community/nixvim";
nixpkgs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
url = "github:nixos/nixpkgs/nixos-unstable";
# url = "github:NixOS/nixpkgs/b477b25191fc94ce764428520b83b6b64366e3c8";
};
nixpkgs-stable = { nixpkgs-stable = {
url = "github:NixOS/nixpkgs/release-23.11"; url = "github:NixOS/nixpkgs/release-23.05";
}; };
kmonad.url = "github:kmonad/kmonad?dir=nix"; kmonad.url = "github:kmonad/kmonad?dir=nix";

View file

@ -42,7 +42,7 @@ let
rmtrash rmtrash
testdisk # file recovery https://itsfoss.com/recover-deleted-files-linux/ testdisk # file recovery https://itsfoss.com/recover-deleted-files-linux/
xdotool xdotool
#pkgs-stable.vhs pkgs-stable.vhs
pkgs-stable.nodejs # required for coc-nvim pkgs-stable.nodejs # required for coc-nvim
@ -74,7 +74,7 @@ let
libsForQt5.ark # kde archive manager libsForQt5.ark # kde archive manager
libsForQt5.kio # extra file-type click support libsForQt5.kio # extra file-type click support
libsForQt5.kio-extras # even more extra file-type click support libsForQt5.kio-extras # even more extra file-type click support
# libsForQt5.soundkonverter # audio cd ripping libsForQt5.soundkonverter # audio cd ripping
# Kdenlive and deps # Kdenlive and deps
pkgs-stable.libsForQt5.kdenlive pkgs-stable.libsForQt5.kdenlive

View file

@ -3,7 +3,7 @@
{ {
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud28; package = pkgs.nextcloud27;
enableImagemagick = true; enableImagemagick = true;
nginx.recommendedHttpHeaders = true; nginx.recommendedHttpHeaders = true;
https = true; https = true;

View file

@ -33,7 +33,7 @@ in
systemd.enable = true; systemd.enable = true;
# Whether to enable patching wlroots for better Nvidia support # Whether to enable patching wlroots for better Nvidia support
# enableNvidiaPatches = true; enableNvidiaPatches = true;
extraConfig = lib.strings.concatStrings [ extraConfig = lib.strings.concatStrings [
monitor_config monitor_config
'' ''