Compare commits
No commits in common. "39ef00af7cc217a50cbad0bb484693b1e701a531" and "7c9a4be1fc97bd1e051678476d01d75496c08358" have entirely different histories.
39ef00af7c
...
7c9a4be1fc
12 changed files with 25 additions and 69 deletions
37
flake.lock
37
flake.lock
|
@ -1696,22 +1696,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_20": {
|
||||
"locked": {
|
||||
"lastModified": 1727348695,
|
||||
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1727686113,
|
||||
|
@ -1906,8 +1890,7 @@
|
|||
"sops-nix": "sops-nix",
|
||||
"stylix": "stylix",
|
||||
"xdg-portal-hyprland": "xdg-portal-hyprland",
|
||||
"yazi": "yazi",
|
||||
"zen-browser": "zen-browser"
|
||||
"yazi": "yazi"
|
||||
}
|
||||
},
|
||||
"rust-analyzer-src": {
|
||||
|
@ -2429,24 +2412,6 @@
|
|||
"repo": "yazi",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"zen-browser": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_20"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1727721329,
|
||||
"narHash": "sha256-QYlWZwUSwrM7BuO+dXclZIwoPvBIuJr6GpFKv9XKFPI=",
|
||||
"owner": "MarceColl",
|
||||
"repo": "zen-browser-flake",
|
||||
"rev": "e6ab73f405e9a2896cce5956c549a9cc359e5fcc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "MarceColl",
|
||||
"repo": "zen-browser-flake",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
|
|
@ -81,9 +81,6 @@
|
|||
eww.url = "github:elkowar/eww";
|
||||
anyrun.url = "github:Kirottu/anyrun";
|
||||
# wezterm.url = "github:notohh/wezterm?dir=nix&ref=nix-add-overlay";
|
||||
|
||||
botoh.url = "git+https://git.flake.sh/notohh/botoh";
|
||||
zen-browser.url = "github:MarceColl/zen-browser-flake";
|
||||
deploy-rs = {
|
||||
url = "github:serokell/deploy-rs";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
@ -96,5 +93,6 @@
|
|||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
botoh.url = "git+https://git.flake.sh/notohh/botoh";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
../../services
|
||||
../../programs/anyrun
|
||||
../../programs/eww
|
||||
# ../../programs/browsers/firefox
|
||||
../../programs/browsers/firefox
|
||||
../../programs/terminal/wezterm
|
||||
../../programs/terminal/zellij
|
||||
../../programs/media/cava.nix
|
||||
|
@ -21,6 +21,7 @@
|
|||
../../wayland/services/hyprpaper.nix
|
||||
../../wayland/programs/hyprlock.nix
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
chromium
|
||||
vesktop
|
||||
|
@ -52,9 +53,7 @@
|
|||
moonlight-qt
|
||||
kitty
|
||||
tetrio-desktop
|
||||
waydroid
|
||||
inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin
|
||||
inputs.zen-browser.packages.${pkgs.system}.default
|
||||
(callPackage ../../../pkgs/passgen {})
|
||||
(callPackage ../../../pkgs/forex {})
|
||||
(callPackage ../../../pkgs/cpm {})
|
||||
|
|
|
@ -77,6 +77,7 @@ $env.config = {
|
|||
metric: true # true => KB, MB, GB (ISO standard), false => KiB, MiB, GiB (Windows standard)
|
||||
format: "auto" # b, kb, kib, mb, mib, gb, gib, tb, tib, pb, pib, eb, eib, zb, zib, auto
|
||||
}
|
||||
use_grid_icons: true
|
||||
footer_mode: "25" # always, never, number_of_rows, auto
|
||||
float_precision: 2
|
||||
# buffer_editor: "emacs" # command that will be used to edit the current line buffer with ctrl+o, if unset fallback to $env.EDITOR and $env.VISUAL
|
||||
|
|
|
@ -3,16 +3,16 @@
|
|||
inputs,
|
||||
...
|
||||
}: {
|
||||
wayland.windowManager.hyprland.plugins = [
|
||||
inputs.hyprland-plugins.packages.${pkgs.system}.csgo-vulkan-fix
|
||||
];
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
plugins = [
|
||||
inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo
|
||||
];
|
||||
plugin = {
|
||||
csgo-vulkan-fix = {
|
||||
res_w = 1280;
|
||||
res_h = 1024;
|
||||
class = "cs2";
|
||||
fix_mouse = true;
|
||||
hyprexpo = {
|
||||
columns = 3;
|
||||
gap_size = 5;
|
||||
bg_col = "rgb(111111)";
|
||||
workspace_method = "center current";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
./config/general.nix
|
||||
./config/binds.nix
|
||||
./config/rules.nix
|
||||
./config/plugins.nix
|
||||
# ./config/plugins.nix
|
||||
];
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
|
|
|
@ -27,6 +27,7 @@ _: {
|
|||
};
|
||||
};
|
||||
|
||||
sound.enable = true;
|
||||
hardware.pulseaudio.enable = false;
|
||||
security.rtkit.enable = true;
|
||||
}
|
||||
|
|
|
@ -85,7 +85,6 @@
|
|||
*.flake.sh
|
||||
*.clickhouse.com
|
||||
*.discord.com
|
||||
*.last.fm
|
||||
'';
|
||||
in {
|
||||
ads = [
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
{...}: {
|
||||
imports = [
|
||||
./restic.nix
|
||||
# ./authelia.nix
|
||||
./authelia.nix
|
||||
./forgejo.nix
|
||||
./rustypaste.nix
|
||||
# ./hedgedoc.nix
|
||||
./hedgedoc.nix
|
||||
./grafana.nix
|
||||
./vaultwarden.nix
|
||||
# ./conduit.nix
|
||||
|
|
|
@ -11,8 +11,8 @@
|
|||
|
||||
### game servers
|
||||
# ./terraria.nix
|
||||
# ./factorio.nix
|
||||
./minecraft.nix
|
||||
./factorio.nix
|
||||
# ./minecraft.nix
|
||||
# ./foundryvtt.nix
|
||||
];
|
||||
}
|
||||
|
|
|
@ -6,11 +6,11 @@ _: {
|
|||
ports = ["25565:25565" "24454:24454/udp"];
|
||||
environment = {
|
||||
EULA = "TRUE";
|
||||
VERSION = "1.20.1";
|
||||
MEMORY = "6G";
|
||||
VERSION = "1.19.2";
|
||||
MEMORY = "4G";
|
||||
TYPE = "FABRIC";
|
||||
# FABRIC_LOADER_VERSION = "0.15.11";
|
||||
# FABRIC_LAUNCHER_VERSION = "0.11.2";
|
||||
FABRIC_LOADER_VERSION = "0.14.23";
|
||||
FABRIC_LAUNCHER_VERSION = "0.11.2";
|
||||
};
|
||||
volumes = ["/home/notoh/docker/modded-mc:/data:rw"];
|
||||
};
|
||||
|
|
|
@ -17,10 +17,8 @@
|
|||
../../pkgs/overlays.nix
|
||||
];
|
||||
|
||||
virtualisation = {
|
||||
libvirtd.enable = true;
|
||||
waydroid.enable = true;
|
||||
};
|
||||
virtualisation.libvirtd.enable = true;
|
||||
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
# finalPackage = inputs.hyprland.packages.${pkgs.system}.default;
|
||||
|
@ -30,10 +28,6 @@
|
|||
services = {
|
||||
pcscd.enable = true;
|
||||
flatpak.enable = true;
|
||||
avahi = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
|
@ -92,6 +86,5 @@
|
|||
libvirt
|
||||
qemu_kvm
|
||||
zulu
|
||||
zulu17
|
||||
];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue