lytedev/nix
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade to latest nixos-unstable nixpkgs

Browse source
This commit is contained in:
Daniel Flanagan 2023-11-21 21:11:09 -06:00
parent e700880c9f
commit 36e9f9c51e
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
7 changed files with 16 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -276,11 +276,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1697723726, "lastModified": 1700390070,
"narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
modules/home-manager/firefox.nix
View file

@ -5,7 +5,7 @@
enable = true; enable = true;
# TODO: uses nixpkgs.pass so pass otp doesn't work # TODO: uses nixpkgs.pass so pass otp doesn't work
package = pkgs.firefox.override {extraNativeMessagingHosts = [pkgs.passff-host];}; package = pkgs.firefox.override {nativeMessagingHosts = [pkgs.passff-host];};
# extensions = with pkgs.nur.repos.rycee.firefox-addons; [ # extensions = with pkgs.nur.repos.rycee.firefox-addons; [
# ublock-origin # ublock-origin

4
modules/home-manager/hyprland.nix
View file

@ -27,6 +27,10 @@
"desc:Dell Inc. DELL U2720Q D3TM623,3840x2160@60,3840x0,1.5,transform,3" "desc:Dell Inc. DELL U2720Q D3TM623,3840x2160@60,3840x0,1.5,transform,3"
]; ];
xwayland = {
force_zero_scaling = true;
};
exec-once = [ exec-once = [
"hyprpaper" "hyprpaper"
"mako" "mako"

4
modules/nixos/postgres.nix
View file

@ -6,9 +6,7 @@
ensureUsers = [ ensureUsers = [
{ {
name = "daniel"; name = "daniel";
ensurePermissions = { ensureDBOwnership = true;
"DATABASE daniel" = "ALL PRIVILEGES";
};
} }
]; ];
enableTCPIP = true; enableTCPIP = true;

19
nixos/beefcake/default.nix
View file

@ -119,12 +119,6 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
owner = config.systemd.services.plausible.serviceConfig.User; owner = config.systemd.services.plausible.serviceConfig.User;
group = config.systemd.services.plausible.serviceConfig.Group; group = config.systemd.services.plausible.serviceConfig.Group;
}; };
plausible-erlang-cookie = {
path = "/var/lib/plausible/plausible-erlang-cookie";
mode = "0440";
owner = config.systemd.services.plausible.serviceConfig.User;
group = config.systemd.services.plausible.serviceConfig.Group;
};
plausible-secret-key-base = { plausible-secret-key-base = {
path = "/var/lib/plausible/plausible-secret-key-base"; path = "/var/lib/plausible/plausible-secret-key-base";
mode = "0440"; mode = "0440";
@ -415,7 +409,6 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
services.plausible = { services.plausible = {
# TODO: enable # TODO: enable
enable = false; enable = false;
releaseCookiePath = config.sops.secrets.plausible-erlang-cookie.path;
database = { database = {
clickhouse.setup = true; clickhouse.setup = true;
postgres = { postgres = {
@ -442,21 +435,15 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
ensureUsers = [ ensureUsers = [
{ {
name = "daniel"; name = "daniel";
ensurePermissions = { ensureDBOwnership = true;
"DATABASE daniel" = "ALL PRIVILEGES";
};
} }
{ {
name = "plausible"; name = "plausible";
ensurePermissions = { ensureDBOwnership = true;
"DATABASE plausible" = "ALL PRIVILEGES";
};
} }
{ {
name = "nextcloud"; name = "nextcloud";
ensurePermissions = { ensureDBOwnership = true;
"DATABASE nextcloud" = "ALL PRIVILEGES";
};
} }
]; ];
dataDir = "/storage/postgres"; dataDir = "/storage/postgres";

6
nixos/foxtrot/default.nix
View file

@ -40,7 +40,7 @@
extraConfig = '' extraConfig = ''
HandlePowerKey=suspend-then-hibernate HandlePowerKey=suspend-then-hibernate
IdleAction=suspend-then-hibernate IdleAction=suspend-then-hibernate
IdleActionSec=1m IdleActionSec=10m
''; '';
}; };
systemd.sleep.extraConfig = "HibernateDelaySec=30m"; systemd.sleep.extraConfig = "HibernateDelaySec=30m";
@ -49,7 +49,7 @@
services.fwupd.extraRemotes = ["lvfs-testing"]; services.fwupd.extraRemotes = ["lvfs-testing"];
hardware.opengl.extraPackages = [ hardware.opengl.extraPackages = [
pkgs.rocmPackages.clr.icd # pkgs.rocmPackages.clr.icd
pkgs.amdvlk pkgs.amdvlk
# encoding/decoding acceleration # encoding/decoding acceleration
pkgs.libvdpau-va-gl pkgs.libvdpau-va-gl
@ -63,7 +63,7 @@
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
systemd-boot.enable = true; systemd-boot.enable = true;
}; };
kernelPackages = pkgs.linuxPackages_6_5; kernelPackages = pkgs.linuxPackages_latest;
# sudo filefrag -v /swap/swapfile | awk '$1=="0:" {print substr($4, 1, length($4)-2)}' # sudo filefrag -v /swap/swapfile | awk '$1=="0:" {print substr($4, 1, length($4)-2)}'
# the above won't work for btrfs, instead you need # the above won't work for btrfs, instead you need
# btrfs inspect-internal map-swapfile -r /swap/swapfile # btrfs inspect-internal map-swapfile -r /swap/swapfile

2
nixos/thinker/default.nix
View file

@ -25,7 +25,7 @@
extraConfig = '' extraConfig = ''
HandlePowerKey=suspend-then-hibernate HandlePowerKey=suspend-then-hibernate
IdleAction=suspend-then-hibernate IdleAction=suspend-then-hibernate
IdleActionSec=1m IdleActionSec=10m
''; '';
}; };
systemd.sleep.extraConfig = "HibernateDelaySec=30m"; systemd.sleep.extraConfig = "HibernateDelaySec=30m";