muon/flake
1
0
Fork 0
mirror of https://codeberg.org/muon/home.git synced 2025-12-06 08:07:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'vps' of codeberg.org:muon/home into vps

Browse source
This commit is contained in:
mups 2024-09-05 20:22:48 +00:00
commit 4e2d89e0f5
9 changed files with 304 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

255
flake.lock generated
View file

@ -1,5 +1,23 @@
{ {
"nodes": { "nodes": {
"actual": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1722699490,
"narHash": "sha256-sh0Fny196SJ4btq7bdHSWtFlbVj8GJ0UbpwIcDJ30mA=",
"ref": "refs/heads/main",
"rev": "e1f68d537270d3ca896cbdfd316e6940024da0b3",
"revCount": 12,
"type": "git",
"url": "https://git.xeno.science/xenofem/actual-nix.git"
},
"original": {
"type": "git",
"url": "https://git.xeno.science/xenofem/actual-nix.git"
}
},
"base16": { "base16": {
"inputs": { "inputs": {
"fromYaml": "fromYaml" "fromYaml": "fromYaml"
@ -115,13 +133,12 @@
} }
}, },
"flake-compat": { "flake-compat": {
"flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1696426674,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -146,10 +163,44 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
@ -164,7 +215,25 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": { "flake-utils_3": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": { "inputs": {
"systems": [ "systems": [
"stylix", "stylix",
@ -259,11 +328,69 @@
"type": "github" "type": "github"
} }
}, },
"nix-minecraft": { "nix-alien": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "nix-filter": "nix-filter",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1725216861,
"narHash": "sha256-GaCobLXfPYBuhxy2TdlEDAfS3PD4mrUj6NQIPOzQq48=",
"owner": "thiagokokada",
"repo": "nix-alien",
"rev": "f92c20327b240ce2098d227c3674d7c02beea51b",
"type": "github"
},
"original": {
"owner": "thiagokokada",
"repo": "nix-alien",
"type": "github"
}
},
"nix-filter": {
"locked": {
"lastModified": 1710156097,
"narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "3342559a24e85fc164b295c3444e8a139924675b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nix-index-database": {
"inputs": {
"nixpkgs": [
"nix-alien",
"nixpkgs"
]
},
"locked": {
"lastModified": 1723352546,
"narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-index-database",
"type": "github"
}
},
"nix-minecraft": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1720748198, "lastModified": 1720748198,
@ -280,6 +407,38 @@
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1719848872,
"narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1723362943,
"narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a58bc8ad779655e790115244571758e8de055e3d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1715266358, "lastModified": 1715266358,
"narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
@ -295,7 +454,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1724224976, "lastModified": 1724224976,
"narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
@ -311,7 +470,23 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_5": {
"locked": {
"lastModified": 1622516815,
"narHash": "sha256-ZjBd81a6J3TwtlBr3rHsZspYUwT9OdhDk+a/SgSEf7I=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7e9b0dff974c89e070da1ad85713ff3c20b0ca97",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "21.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1714912032, "lastModified": 1714912032,
"narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
@ -329,12 +504,34 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"actual": "actual",
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-alien": "nix-alien",
"nix-minecraft": "nix-minecraft", "nix-minecraft": "nix-minecraft",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_4",
"shabitica": "shabitica",
"stylix": "stylix" "stylix": "stylix"
} }
}, },
"shabitica": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1724518687,
"narHash": "sha256-rPKeUG3aKLHF/9t5zAQPvy/QKm/eBXFKP6X+Cr9E7Go=",
"owner": "lomenzel",
"repo": "shabitica",
"rev": "6013624a276b326530ebf8c616fc89e2f23fd3af",
"type": "github"
},
"original": {
"owner": "lomenzel",
"repo": "shabitica",
"type": "github"
}
},
"stylix": { "stylix": {
"inputs": { "inputs": {
"base16": "base16", "base16": "base16",
@ -344,12 +541,12 @@
"base16-kitty": "base16-kitty", "base16-kitty": "base16-kitty",
"base16-tmux": "base16-tmux", "base16-tmux": "base16-tmux",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_4",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_6",
"systems": "systems_2" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1724444244, "lastModified": 1724444244,
@ -394,6 +591,36 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

2
flake.nix
View file

@ -8,6 +8,8 @@
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";
nix-minecraft.url = "git+ssh://git@codeberg.org/nix-astral/nix-minecraft.git"; nix-minecraft.url = "git+ssh://git@codeberg.org/nix-astral/nix-minecraft.git";
shabitica.url = "github:lomenzel/shabitica"; shabitica.url = "github:lomenzel/shabitica";
actual.url = "git+https://git.xeno.science/xenofem/actual-nix.git";
nix-alien.url = "github:thiagokokada/nix-alien";
}; };
outputs = inputs@{ nixpkgs, home-manager, stylix, ... }: outputs = inputs@{ nixpkgs, home-manager, stylix, ... }:

8
hosts/muon/configuration.nix
View file

@ -7,6 +7,11 @@ in {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
inputs.shabitica.nixosModules."x86_64-linux".default inputs.shabitica.nixosModules."x86_64-linux".default
inputs.actual.nixosModules.default
];
environment.systemPackages = with inputs.nix-alien.packages.${system}; [
nix-alien
]; ];
# System # System
@ -34,9 +39,10 @@ in {
mods.server.sync.enable = true; mods.server.sync.enable = true;
mods.tailscale.enable = true; mods.tailscale.enable = true;
mods.openvpn.enable = false; mods.openvpn.enable = false;
mods.wireguard.enable = false; mods.wireguard.enable = true;
services.xserver.windowManager.i3.enable = true; services.xserver.windowManager.i3.enable = true;
services.actual.enable = true;
# Proprietary </3 # Proprietary </3
mods.unfree.steam.enable = true; mods.unfree.steam.enable = true;

2
modules/home/desktop/development.nix
View file

@ -16,7 +16,7 @@
}; };
searchEngines = { searchEngines = {
DEFAULT = "https://searx.be/?s={}"; DEFAULT = "https://searx.be/?q={}";
np = "https://search.nixos.org/packages?query={}"; np = "https://search.nixos.org/packages?query={}";
no = "https://search.nixos.org/options?query={}"; no = "https://search.nixos.org/options?query={}";
}; };

3
modules/home/desktop/media.nix
View file

@ -7,6 +7,9 @@
# Audio # Audio
pulseaudio pulseaudio
pavucontrol pavucontrol
# Podcasts
gpodder
]; ];
programs.mpv.enable = true; programs.mpv.enable = true;
}; };

14
modules/home/desktop/social.nix
View file

@ -1,4 +1,14 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }:
let
vesktop-nogain = (pkgs.vesktop.overrideAttrs (previousAttrs: {
patches = previousAttrs.patches ++ [
(builtins.fetchurl {
url = "https://codeberg.org/muon/gists/raw/branch/main/micfix.patch";
sha256 = "18zmq68m5mx3s924iqfbmm8a7r8qbjnw86hvvax2vg8w94g7mrqp";
})
];
}));
in {
options.mods.social.enable = options.mods.social.enable =
lib.mkEnableOption "enables social media clients"; lib.mkEnableOption "enables social media clients";
@ -7,7 +17,7 @@
# Communication # Communication
kotatogram-desktop kotatogram-desktop
signal-desktop signal-desktop
vesktop vesktop-nogain
# Video # Video
freetube freetube

37
modules/home/terminal/development.nix
View file

@ -3,7 +3,17 @@
lib.mkEnableOption "enables cli editor"; lib.mkEnableOption "enables cli editor";
config = lib.mkIf config.mods.terminal.development.enable { config = lib.mkIf config.mods.terminal.development.enable {
# home.packages = with pkgs; []; home.packages = with pkgs; [
# Nix
nil
# Rust
rust-analyzer
lldb_18
# GLSL
glsl_analyzer
];
programs.direnv = { programs.direnv = {
enable = true; enable = true;
@ -18,13 +28,13 @@
settings = { settings = {
keys.normal = { keys.normal = {
"esc" = ["collapse_selection" "keep_primary_selection"]; "esc" = [ "collapse_selection" "keep_primary_selection" ];
}; };
editor = { editor = {
line-number = "relative"; line-number = "relative";
completion-replace = true; completion-replace = true;
bufferline = "always"; bufferline = "always";
rulers = [80]; rulers = [ 80 ];
soft-wrap.enable = true; soft-wrap.enable = true;
indent-guides.render = true; indent-guides.render = true;
cursor-shape = { cursor-shape = {
@ -34,6 +44,27 @@
}; };
}; };
}; };
languages.language-server = {
glsl.command = "${pkgs.glsl_analyzer}/bin/glsl_analyzer";
};
languages.language = [
{
name = "nix";
auto-format = true;
formatter.command = "${pkgs.nixfmt}/bin/nixfmt";
}
{
name = "rust";
auto-format = true;
formatter.command = "rustfmt";
}
{
name = "glsl";
language-servers = [ "glsl" ];
}
];
}; };
}; };
} }

2
modules/nixos/core/network.nix
View file

@ -15,6 +15,7 @@
config = { config = {
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
services.resolved.enable = true;
services.tailscale.enable = config.mods.tailscale.enable; services.tailscale.enable = config.mods.tailscale.enable;
@ -29,6 +30,7 @@
wg0 = { wg0 = {
address = [ "10.0.0.2/24" "fdc9:281f:04d7:9ee9::2/64" ]; address = [ "10.0.0.2/24" "fdc9:281f:04d7:9ee9::2/64" ];
dns = [ "10.0.0.1" "fdc9:281f:04d7:9ee9::1" ]; dns = [ "10.0.0.1" "fdc9:281f:04d7:9ee9::1" ];
mtu = 1500;
privateKeyFile = "/home/muon/wireguard-keys/private"; privateKeyFile = "/home/muon/wireguard-keys/private";
peers = [ peers = [

2
modules/nixos/core/nix.nix
View file

@ -21,4 +21,6 @@
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
]; ];
}; };
programs.nix-ld.enable = true;
} }