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

Home manager, too!

Browse source
This commit is contained in:
Daniel Flanagan 2024-12-02 13:27:49 -06:00
parent fd4d4ffa1a
commit e9f6f85251
5 changed files with 32 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
flake.nix
View file

@ -13,7 +13,7 @@
git-hooks.url = "github:cachix/git-hooks.nix"; git-hooks.url = "github:cachix/git-hooks.nix";
git-hooks.inputs.nixpkgs.follows = "nixpkgs"; git-hooks.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.url = "github:nix-community/home-manager/release-24.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
home-manager-unstable.url = "github:nix-community/home-manager"; home-manager-unstable.url = "github:nix-community/home-manager";
@ -245,21 +245,21 @@
# wezterm = (import nixpkgs {inherit (prev) system;}).wezterm; # wezterm = (import nixpkgs {inherit (prev) system;}).wezterm;
final.wezterm = wezterm; final.wezterm = wezterm;
zellij = prev.zellij.overrideAttrs rec { # zellij = prev.zellij.overrideAttrs rec {
version = "0.41.0"; # version = "0.41.0";
src = prev.fetchFromGitHub { # src = prev.fetchFromGitHub {
owner = "zellij-org"; # owner = "zellij-org";
repo = "zellij"; # repo = "zellij";
rev = "v0.41.0"; # rev = "v0.41.0";
hash = "sha256-A+JVWYz0t9cVA8XZciOwDkCecsC2r5TU2O9i9rVg7do="; # hash = "sha256-A+JVWYz0t9cVA8XZciOwDkCecsC2r5TU2O9i9rVg7do=";
}; # };
cargoDeps = prev.zellij.cargoDeps.overrideAttrs (prev.lib.const { # cargoDeps = prev.zellij.cargoDeps.overrideAttrs (prev.lib.const {
name = "zellij-vendor.tar.gz"; # name = "zellij-vendor.tar.gz";
inherit src; # inherit src;
outputHash = "sha256-WxrMI7fV0pNsGjbNpXLr+xnMdWYkC4WxIeN4OK3ZPIE="; # outputHash = "sha256-WxrMI7fV0pNsGjbNpXLr+xnMdWYkC4WxIeN4OK3ZPIE=";
}); # });
}; # };
final.zellij = zellij; # final.zellij = zellij;
}; };
unstable-packages = final: _prev: { unstable-packages = final: _prev: {

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

@ -99,8 +99,8 @@ in {
follow_mouse = 2; follow_mouse = 2;
repeat_delay = 200; repeat_delay = 180;
repeat_rate = 60; repeat_rate = 120;
touchpad = { touchpad = {
natural_scroll = "yes"; natural_scroll = "yes";

9
modules/nixos/default.nix
View file

@ -695,8 +695,13 @@
}; };
fonts = {pkgs, ...}: { fonts = {pkgs, ...}: {
fonts.packages = with pkgs; [ fonts.packages = [
nerd-fonts.symbols-only (
# allow nixpkgs 24.11 and unstable to both work
if builtins.hasAttr "nerd-fonts" pkgs
then (pkgs.nerd-fonts.symbols-only)
else (pkgs.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
)
pkgs.iosevkaLyteTerm pkgs.iosevkaLyteTerm
]; ];
}; };

6
nixos/beefcake.nix
View file

@ -268,7 +268,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
]; ];
}; };
services.nextcloud = { services.nextcloud = {
enable = true; enable = false;
hostName = "nextcloud.h.lyte.dev"; hostName = "nextcloud.h.lyte.dev";
maxUploadSize = "100G"; maxUploadSize = "100G";
extraAppsEnable = true; extraAppsEnable = true;
@ -304,10 +304,12 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
serviceConfig.Group = "nextcloud"; serviceConfig.Group = "nextcloud";
}; };
services.phpfpm.pools.nextcloud.settings = { services.phpfpm = lib.mkIf config.services.nextcloud.enable {
pools.nextcloud.settings = {
"listen.owner" = "caddy"; "listen.owner" = "caddy";
"listen.group" = "caddy"; "listen.group" = "caddy";
}; };
};
services.caddy.virtualHosts."nextcloud.h.lyte.dev" = let services.caddy.virtualHosts."nextcloud.h.lyte.dev" = let
fpm-nextcloud-pool = config.services.phpfpm.pools.nextcloud; fpm-nextcloud-pool = config.services.phpfpm.pools.nextcloud;

2
nixos/dragon.nix
View file

@ -6,7 +6,7 @@
}: { }: {
imports = [ imports = [
{ {
system.stateVersion = "24.05"; system.stateVersion = "24.11";
home-manager.users.daniel.home.stateVersion = "24.05"; home-manager.users.daniel.home.stateVersion = "24.05";
networking.hostName = "dragon"; networking.hostName = "dragon";
} }