diff --git a/configuration.nix b/configuration.nix index c23ba50..161bb79 100644 --- a/configuration.nix +++ b/configuration.nix @@ -163,6 +163,8 @@ ); }) + pfetch-rs + ]; services.zfs = { diff --git a/flake.lock b/flake.lock index 8abad20..f5488de 100644 --- a/flake.lock +++ b/flake.lock @@ -34,6 +34,27 @@ "type": "github" } }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1735344290, + "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "613691f285dad87694c2ba1c9e6298d04736292d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, "nix-minecraft": { "inputs": { "flake-compat": "flake-compat", @@ -43,11 +64,11 @@ ] }, "locked": { - "lastModified": 1735004788, - "narHash": "sha256-4fR1BPM2IJWbCaoAQqkVr+DhDzpgGhbfLcl7V2fd0ME=", + "lastModified": 1735609543, + "narHash": "sha256-2+sJqwaileD2izqMv/k6Z7iLlHOF8T4kRWflCGURzN4=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "cc5f59e353d94a907cd9e06919aaecb093b59d46", + "rev": "2faa9fdd8d29df54d6cec075055cf1dcf50de280", "type": "github" }, "original": { @@ -58,11 +79,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1734954597, - "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "def1d472c832d77885f174089b0d34854b007198", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "type": "github" }, "original": { @@ -74,16 +95,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735531152, + "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -106,6 +127,7 @@ }, "root": { "inputs": { + "home-manager": "home-manager", "nix-minecraft": "nix-minecraft", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index 1264196..9bc4c54 100644 --- a/flake.nix +++ b/flake.nix @@ -2,16 +2,23 @@ description = "Flake for server muffin"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - nix-minecraft.url = "github:Infinidoge/nix-minecraft"; - nix-minecraft.inputs.nixpkgs.follows = "nixpkgs"; + nix-minecraft = { + url = "github:Infinidoge/nix-minecraft"; + inputs.nixpkgs.follows = "nixpkgs"; + }; vpn-confinement.url = "github:Maroka-chan/VPN-Confinement"; nixpkgs-qbt.url = "github:NixOS/nixpkgs/pull/287923/head"; + + home-manager = { + url = "github:nix-community/home-manager/release-24.11"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = @@ -21,6 +28,7 @@ nixos-hardware, vpn-confinement, nixpkgs-qbt, + home-manager, ... }@inputs: let @@ -101,6 +109,19 @@ { nixpkgs.overlays = [ nix-minecraft.overlay ]; } + + home-manager.nixosModules.home-manager + ( + { + pkgs, + username, + home-manager, + ... + }: + { + home-manager.users.${username} = import ./home.nix; + } + ) ] ++ (with nixos-hardware.nixosModules; [ common-cpu-amd-pstate diff --git a/home.nix b/home.nix new file mode 100644 index 0000000..cda675a --- /dev/null +++ b/home.nix @@ -0,0 +1,31 @@ +{ pkgs, username, ... }: +{ + home.stateVersion = "24.11"; + programs.fish = + let + eza = "${pkgs.eza}/bin/eza --color=always --group-directories-first"; + coreutils = "${pkgs.coreutils}/bin"; + in + { + enable = true; + + interactiveShellInit = '' + #disable greeting + set fish_greeting + + #fixes gnupg password entry + export GPG_TTY=(${coreutils}/tty) + + #pfetch on shell start (disable pkgs because of execution time) + PF_INFO="ascii title os host kernel uptime memory editor wm" ${pkgs.pfetch-rs}/bin/pfetch + ''; + + shellAliases = { + # from DistroTube's dot files: Changing "ls" to "eza" + ls = "${eza} -al"; + la = "${eza} -a"; + ll = "${eza} -l"; + lt = "${eza} -aT"; + }; + }; +} diff --git a/services/caddy.nix b/services/caddy.nix index 6b6e811..4c887ab 100644 --- a/services/caddy.nix +++ b/services/caddy.nix @@ -65,7 +65,7 @@ in reverse_proxy :${builtins.toString config.services.matrix-conduit.settings.global.port} ''; - # Exact duplicate of matrix.gardling.com + # Exact duplicate of matrix.DOMAIN_NAME "${matrix_hostname}:8448".extraConfig = config.services.caddy.virtualHosts."${config.services.matrix-conduit.settings.global.server_name }".extraConfig; diff --git a/services/minecraft.nix b/services/minecraft.nix index 27f27e0..ff3893b 100644 --- a/services/minecraft.nix +++ b/services/minecraft.nix @@ -44,8 +44,8 @@ in with pkgs; builtins.attrValues { FabricApi = fetchurl { - url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/KEv54FjE/fabric-api-0.111.0%2B1.21.4.jar"; - sha512 = "ca6e1f0a6178f48b319891ca666ddaa186c094b6402e64e9d45e9f206d0985b0dbb00dfc833b14f26013463845ee1496356d4d8c0028eee4db9524e2cf2df618"; + url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/5tj7y3PJ/fabric-api-0.114.0%2B1.21.4.jar"; + sha512 = "5e801dd76fa4ca0d393cd8c82059556bee420d8610e1ffb09c2c90eb487e997acb5061ec571250db1fe57491505f304b8222fcbe02243048c5df809a610d94a6"; }; FerriteCore = fetchurl { @@ -64,13 +64,13 @@ in }; moonrise = fetchurl { - url = "https://cdn.modrinth.com/data/KOHu7RCS/versions/FZCC8uFL/Moonrise-Fabric-0.2.0-beta.6%2Bb70443e.jar"; - sha512 = "1574d3a0f81220ff1daacbda79ce889ac4120ebeb8ad51fdce11a27413603f9e5d37fdcfbb90f206b50559fa65aec68d515559cf91d223116e4f314aa69cf468"; + url = "https://cdn.modrinth.com/data/KOHu7RCS/versions/a8Zqa1bJ/Moonrise-Fabric-0.2.0-beta.7%2B6ec14ff.jar"; + sha512 = "4ebc97764038aebd0b4bc5f6b25f9356419cf32f6c8bd64016665d9aad5c9f79ca9df2decac3038f7f713ff595c2b3286b3a1eb4d6debcd6639a52556416581a"; }; squaremap = fetchurl { - url = "https://jenkins.jpenilla.xyz/job/squaremap/lastSuccessfulBuild/artifact/build/libs/squaremap-fabric-mc1.21.4-1.3.4-SNAPSHOT+53d7948.jar"; - sha256 = "v1iCRTXvTLuxEy1hzbd9fVXmY62nqBAhFTEfdIu7sAk="; + url = "https://jenkins.jpenilla.xyz/job/squaremap/lastSuccessfulBuild/artifact/build/libs/squaremap-fabric-mc1.21.4-1.3.4-SNAPSHOT+022b4b3.jar"; + sha256 = "1625xlbmaj2rcxm1rlbgnm3c8sjnld48qk588p8vpy5i5xfx7ry2"; }; } );