Compare commits
10
Commits
00446ffcde
...
e816281497
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e816281497 | ||
|
|
50daa6dc1d | ||
|
|
3bf0c1aedf | ||
|
|
76cfc4f130 | ||
|
|
fb98f18ae6 | ||
|
|
28b1427de2 | ||
|
|
588fc2da2d | ||
|
|
a98f8437a6 | ||
|
|
bb0e885ce4 | ||
|
|
8c0953390d |
+5
-1
@@ -68,6 +68,10 @@
|
||||
|
||||
# Enable the X11 windowing system.
|
||||
services.xserver.enable = true;
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
enable32bit = true;
|
||||
};
|
||||
services.xserver.xkb.layout = "us";
|
||||
services.xserver.xkb.options = "caps:escape";
|
||||
|
||||
@@ -357,7 +361,7 @@
|
||||
server = "dynamicdns.park-your-domain.com";
|
||||
ssl = true;
|
||||
username = "centraldogma.site";
|
||||
domains = ["@" "www"];
|
||||
domains = ["@" "www", "*"];
|
||||
usev4 = "webv4, webv4=ipify-ipv4";
|
||||
passwordFile = config.sops.secrets."namecheap/ddyn_password".path;
|
||||
interval = "5mins";
|
||||
|
||||
+34
-26
@@ -9,7 +9,6 @@
|
||||
-- Create your files separately and then require them like this:
|
||||
-- require("myColors")
|
||||
|
||||
|
||||
------------------
|
||||
---- MONITORS ----
|
||||
------------------
|
||||
@@ -17,22 +16,20 @@
|
||||
-- See https://wiki.hypr.land/configuring/core/monitors/
|
||||
hl.monitor({
|
||||
output = "",
|
||||
mode = "preferred",
|
||||
mode = "highrr",
|
||||
position = "auto",
|
||||
scale = "auto",
|
||||
})
|
||||
|
||||
|
||||
---------------------
|
||||
---- MY PROGRAMS ----
|
||||
---------------------
|
||||
|
||||
-- Set programs that you use
|
||||
local terminal = "kitty"
|
||||
local terminal = "alacritty"
|
||||
local fileManager = "dolphin"
|
||||
local menu = "hyprlauncher"
|
||||
|
||||
|
||||
-------------------
|
||||
---- AUTOSTART ----
|
||||
-------------------
|
||||
@@ -42,12 +39,9 @@ local menu = "hyprlauncher"
|
||||
-- Autostart necessary processes (like notifications daemons, status bars, etc.)
|
||||
-- Or execute your favorite apps at launch like this:
|
||||
--
|
||||
-- hl.on("hyprland.start", function ()
|
||||
-- hl.exec_cmd(terminal)
|
||||
-- hl.exec_cmd("nm-applet")
|
||||
-- hl.exec_cmd("waybar & hyprpaper & firefox")
|
||||
-- end)
|
||||
|
||||
hl.on("hyprland.start", function()
|
||||
hl.exec_cmd("lan-mouse daemon")
|
||||
end)
|
||||
|
||||
-------------------------------
|
||||
---- ENVIRONMENT VARIABLES ----
|
||||
@@ -58,7 +52,6 @@ local menu = "hyprlauncher"
|
||||
hl.env("XCURSOR_SIZE", "24")
|
||||
hl.env("HYPRCURSOR_SIZE", "24")
|
||||
|
||||
|
||||
-----------------------
|
||||
----- PERMISSIONS -----
|
||||
-----------------------
|
||||
@@ -77,7 +70,6 @@ hl.env("HYPRCURSOR_SIZE", "24")
|
||||
-- hl.permission("/usr/(lib|libexec|lib64)/xdg-desktop-portal-hyprland", "screencopy", "allow")
|
||||
-- hl.permission("/usr/(bin|local/bin)/hyprpm", "plugin", "allow")
|
||||
|
||||
|
||||
-----------------------
|
||||
---- LOOK AND FEEL ----
|
||||
-----------------------
|
||||
@@ -85,7 +77,7 @@ hl.env("HYPRCURSOR_SIZE", "24")
|
||||
-- Refer to https://wiki.hypr.land/configuring/core/config-options/
|
||||
hl.config({
|
||||
general = {
|
||||
gaps_in = 5,
|
||||
gaps_in = 4,
|
||||
gaps_out = 20,
|
||||
|
||||
border_size = 2,
|
||||
@@ -140,7 +132,7 @@ hl.curve("almostLinear", { type = "bezier", points = { {0.5, 0.5}, {0.75, 1}
|
||||
hl.curve("quick", { type = "bezier", points = { { 0.15, 0 }, { 0.1, 1 } } })
|
||||
|
||||
-- Default springs
|
||||
hl.curve("easy", { type = "spring", mass = 1, stiffness = 238.1191, damping = 24.21279333 })
|
||||
hl.curve("easy", { type = "spring", mass = 1, stiffness = 238.1191, dampening = 24.21279333 })
|
||||
|
||||
hl.animation({ leaf = "global", enabled = true, speed = 10, bezier = "default" })
|
||||
hl.animation({ leaf = "border", enabled = true, speed = 5.39, bezier = "easeOutQuint" })
|
||||
@@ -210,7 +202,6 @@ hl.config({
|
||||
},
|
||||
})
|
||||
|
||||
|
||||
---------------
|
||||
---- INPUT ----
|
||||
---------------
|
||||
@@ -220,7 +211,7 @@ hl.config({
|
||||
kb_layout = "us",
|
||||
kb_variant = "",
|
||||
kb_model = "",
|
||||
kb_options = "",
|
||||
kb_options = "caps:swapescape",
|
||||
kb_rules = "",
|
||||
|
||||
follow_mouse = 1,
|
||||
@@ -236,7 +227,7 @@ hl.config({
|
||||
hl.gesture({
|
||||
fingers = 3,
|
||||
direction = "horizontal",
|
||||
action = "workspace"
|
||||
action = "workspace",
|
||||
})
|
||||
|
||||
-- Example per-device config
|
||||
@@ -246,7 +237,6 @@ hl.device({
|
||||
sensitivity = -0.5,
|
||||
})
|
||||
|
||||
|
||||
---------------------
|
||||
---- KEYBINDINGS ----
|
||||
---------------------
|
||||
@@ -257,11 +247,14 @@ local mainMod = "SUPER" -- Sets "Windows" key as main modifier
|
||||
hl.bind(mainMod .. " + Q", hl.dsp.exec_cmd(terminal))
|
||||
local closeWindowBind = hl.bind(mainMod .. " + C", hl.dsp.window.close())
|
||||
-- closeWindowBind:set_enabled(false)
|
||||
hl.bind(mainMod .. " + M", hl.dsp.exec_cmd("command -v hyprshutdown >/dev/null 2>&1 && hyprshutdown || hyprctl dispatch 'hl.dsp.exit()'"))
|
||||
hl.bind(
|
||||
mainMod .. " + M",
|
||||
hl.dsp.exec_cmd("command -v hyprshutdown >/dev/null 2>&1 && hyprshutdown || hyprctl dispatch 'hl.dsp.exit()'")
|
||||
)
|
||||
hl.bind(mainMod .. " + E", hl.dsp.exec_cmd(fileManager))
|
||||
hl.bind(mainMod .. " + V", hl.dsp.window.float({ action = "toggle" }))
|
||||
hl.bind(mainMod .. " + R", hl.dsp.exec_cmd(menu))
|
||||
hl.bind(mainMod .. " + P", hl.dsp.window.pseudo())
|
||||
hl.bind(mainMod .. " + R", hl.dsp.exec_cmd(menu))
|
||||
hl.bind(mainMod .. " + J", hl.dsp.layout("togglesplit")) -- dwindle only
|
||||
|
||||
-- Move focus with mainMod + arrow keys
|
||||
@@ -291,10 +284,26 @@ hl.bind(mainMod .. " + mouse:272", hl.dsp.window.drag(), { mouse = true })
|
||||
hl.bind(mainMod .. " + mouse:273", hl.dsp.window.resize(), { mouse = true })
|
||||
|
||||
-- Laptop multimedia keys for volume and LCD brightness
|
||||
hl.bind("XF86AudioRaiseVolume", hl.dsp.exec_cmd("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"), { locked = true, repeating = true })
|
||||
hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"), { locked = true, repeating = true })
|
||||
hl.bind("XF86AudioMute", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"), { locked = true, repeating = true })
|
||||
hl.bind("XF86AudioMicMute", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"), { locked = true, repeating = true })
|
||||
hl.bind(
|
||||
"XF86AudioRaiseVolume",
|
||||
hl.dsp.exec_cmd("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"),
|
||||
{ locked = true, repeating = true }
|
||||
)
|
||||
hl.bind(
|
||||
"XF86AudioLowerVolume",
|
||||
hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"),
|
||||
{ locked = true, repeating = true }
|
||||
)
|
||||
hl.bind(
|
||||
"XF86AudioMute",
|
||||
hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"),
|
||||
{ locked = true, repeating = true }
|
||||
)
|
||||
hl.bind(
|
||||
"XF86AudioMicMute",
|
||||
hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"),
|
||||
{ locked = true, repeating = true }
|
||||
)
|
||||
hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%+"), { locked = true, repeating = true })
|
||||
hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%-"), { locked = true, repeating = true })
|
||||
|
||||
@@ -304,7 +313,6 @@ hl.bind("XF86AudioPause", hl.dsp.exec_cmd("playerctl play-pause"), { locked = tr
|
||||
hl.bind("XF86AudioPlay", hl.dsp.exec_cmd("playerctl play-pause"), { locked = true })
|
||||
hl.bind("XF86AudioPrev", hl.dsp.exec_cmd("playerctl previous"), { locked = true })
|
||||
|
||||
|
||||
--------------------------------
|
||||
---- WINDOWS AND WORKSPACES ----
|
||||
--------------------------------
|
||||
|
||||
@@ -6,9 +6,5 @@ return {
|
||||
"alejandra",
|
||||
},
|
||||
},
|
||||
format_on_save = {
|
||||
timeout_ms = 1000,
|
||||
lsp_format = "fallback",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
Generated
+6
-6
@@ -102,11 +102,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1790010537,
|
||||
"narHash": "sha256-rsDlQDQkCVnSkEfDTWlaFjp7vpke5taFkeTseT7DUxQ=",
|
||||
"lastModified": 1790110821,
|
||||
"narHash": "sha256-4vgPxAtYGryB/9SZVFMrcRKmNcOqcN3+MwRJPTVpb1o=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "a6c231d51f2a434e164020eae31de96ca0a56d65",
|
||||
"rev": "a5768f1a46942657352e58037b7891bdcbc0741f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -174,11 +174,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1789921291,
|
||||
"narHash": "sha256-Ft/BRnIqw1MywFoXydKobjjWmDFgDdYtSpJliE8+yUw=",
|
||||
"lastModified": 1790046670,
|
||||
"narHash": "sha256-MYiI+CzL0tuWgRPjGsKCDHqYs2T3OzMlMQWOYWG0qso=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "44a91898084f46797b5fac650c7e8c9ac38c43d4",
|
||||
"rev": "6774f7bc253789b113a4f39285dc0fa100abeacc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
# The home.packages option allows you to install Nix packages into your
|
||||
# environment.
|
||||
home.packages = with pkgs; [
|
||||
fish
|
||||
# # It is sometimes useful to fine-tune packages, for example, by applying
|
||||
# # overrides. You can do that directly here, just don't forget the
|
||||
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of
|
||||
@@ -40,6 +41,7 @@
|
||||
home.file = {
|
||||
".config/nvim".source = ./dotfiles/nvim;
|
||||
".config/hypr".source = ./dotfiles/hypr;
|
||||
".config/lan-mouse".source = ./dotfiles/lan-mouse;
|
||||
# # Building this configuration will create a copy of 'dotfiles/screenrc' in
|
||||
# # the Nix store. Activating the configuration will then make '~/.screenrc' a
|
||||
# # symlink to the Nix store copy.
|
||||
@@ -68,9 +70,8 @@
|
||||
};
|
||||
|
||||
home.shellAliases = {
|
||||
dogma-rebuild = "sudo nixos-rebuild switch --flake ${config.home.homeDirectory}#dogma-nixos";
|
||||
dogma-rebuild = "sudo nixos-rebuild switch --flake ${config.home.homeDirectory}/nixos/#dogma-nixos";
|
||||
cdproj = "cd ${config.home.homeDirectory}/projects/nixos-dogma";
|
||||
working = "echo aaa";
|
||||
};
|
||||
|
||||
# Home Manager can also manage your environment variables through
|
||||
|
||||
+13
-3
@@ -21,6 +21,8 @@
|
||||
# The home.packages option allows you to install Nix packages into your
|
||||
# environment.
|
||||
home.packages = with pkgs; [
|
||||
fish
|
||||
alacritty
|
||||
# # It is sometimes useful to fine-tune packages, for example, by applying
|
||||
# # overrides. You can do that directly here, just don't forget the
|
||||
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of
|
||||
@@ -51,6 +53,9 @@
|
||||
# org.gradle.daemon.idletimeout=3600000
|
||||
# '';
|
||||
};
|
||||
programs.alacritty = {
|
||||
enable = true;
|
||||
};
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
shell = "${pkgs.zsh}/bin/zsh";
|
||||
@@ -97,8 +102,6 @@
|
||||
SOPS_EDITOR = "nvim";
|
||||
EDITOR = "nvim";
|
||||
VISUAL = "nvim";
|
||||
TEST = "test";
|
||||
TEST_A = "testa";
|
||||
};
|
||||
|
||||
# Let Home Manager install and manage itself.
|
||||
@@ -141,8 +144,10 @@
|
||||
};
|
||||
alias = {
|
||||
#Add and commit
|
||||
ac = "!git add $1 && git commit -m $2";
|
||||
ac = ''!f() {git add -A && git commit "$@";}; f'';
|
||||
cm = "commit";
|
||||
};
|
||||
credential.helper = "store --file=${config.sops.templates.".git-credentials".path}";
|
||||
# credential-helper = {
|
||||
#
|
||||
# };
|
||||
@@ -164,6 +169,11 @@
|
||||
gnumake
|
||||
unzip
|
||||
wget
|
||||
nil
|
||||
statix
|
||||
lazygit
|
||||
luarocks
|
||||
nil
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -40,12 +40,13 @@
|
||||
};
|
||||
};
|
||||
|
||||
programs.steam.enable = true;
|
||||
|
||||
sops.templates."factorio.json".content = builtins.toJSON {
|
||||
service_username = config.sops.placeholder."factorio/service_username";
|
||||
service_token = config.sops.placeholder."factorio/service_token";
|
||||
gamepassword = config.sops.placeholder."factorio/gamepassword";
|
||||
};
|
||||
|
||||
sops.templates."duplicity.env".content = builtins.toJSON {};
|
||||
|
||||
sops.templates."caddy.env" = {
|
||||
@@ -96,6 +97,11 @@
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
inotify-tools
|
||||
opencode
|
||||
steam
|
||||
nnn
|
||||
hyprlauncher
|
||||
qbittorrent
|
||||
pinentry-qt
|
||||
ddclient
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
services.xserver.enable = true;
|
||||
services.xserver.xkb.layout = "us";
|
||||
services.xserver.xkb.options = "caps:escape";
|
||||
services.xserver.displayManager.lightdm.autoLogin.timeout = 1;
|
||||
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
|
||||
+31
-33
@@ -26,7 +26,7 @@
|
||||
environmentFile = config.sops.templates."caddy.env".path;
|
||||
virtualHosts."centraldogma.site:".extraConfig = ''
|
||||
|
||||
root * /srv/root/
|
||||
root /srv/root/
|
||||
file_server
|
||||
encode zstd gzip
|
||||
|
||||
@@ -50,9 +50,6 @@
|
||||
virtualHosts."git.centraldogma.site:".extraConfig = ''
|
||||
reverse_proxy /* 127.0.0.1:3000
|
||||
'';
|
||||
virtualHosts."spy.centraldogma.site:".extraConfig = ''
|
||||
reverse_proxy /* 192.168.1.78:4444
|
||||
'';
|
||||
};
|
||||
|
||||
services.flaresolverr.enable = true;
|
||||
@@ -62,7 +59,6 @@
|
||||
package = pkgs.mongodb-ce;
|
||||
initialRootPasswordFile = config.sops.secrets."mongodb/initial_password".path;
|
||||
};
|
||||
|
||||
services.jackett.enable = true;
|
||||
|
||||
services.factorio = {
|
||||
@@ -71,9 +67,9 @@
|
||||
requireUserVerification = true;
|
||||
username = "TheMaskedMan95";
|
||||
admins = ["TheMaskedMan95"];
|
||||
extraSettingsFile = config.sops.templates."factorio.json".path;
|
||||
game-name = "Realm of the Masked Men";
|
||||
description = "No Dogs allowed";
|
||||
extraSettingsFile = config.sops.templates."factorio.json".path;
|
||||
saveName = "SPACExxxx";
|
||||
openFirewall = true;
|
||||
};
|
||||
@@ -89,6 +85,7 @@
|
||||
domains = [
|
||||
"@"
|
||||
"www"
|
||||
"*"
|
||||
];
|
||||
usev4 = "webv4, webv4=ipify-ipv4";
|
||||
passwordFile = config.sops.secrets."namecheap/ddyn_password".path;
|
||||
@@ -107,31 +104,32 @@
|
||||
};
|
||||
};
|
||||
|
||||
services.adguardhome = {
|
||||
enable = true;
|
||||
host = "0.0.0.0";
|
||||
port = 3003;
|
||||
settings = {
|
||||
allowDHCP = true;
|
||||
dns = {
|
||||
upstream_dns = [
|
||||
"9.9.9.9#dns.quad9.net"
|
||||
"149.112.112.112#dns.quad9.net"
|
||||
];
|
||||
};
|
||||
filtering = {
|
||||
protection_enabled = true;
|
||||
filtering_enabled = true;
|
||||
parental_enabled = true;
|
||||
safe_search.enabled = false;
|
||||
};
|
||||
filters = map (url: {
|
||||
enabled = true;
|
||||
url = url;
|
||||
}) [
|
||||
"https://adguardteam.github.io/HostlistsRegistry/assets/filter_9.txt"
|
||||
"https://adguardteam.github.io/HostlistsRegistry/assets/filter_11.txt"
|
||||
];
|
||||
};
|
||||
};
|
||||
# services.adguardhome = {
|
||||
# enable = true;
|
||||
# host = "0.0.0.0";
|
||||
# port = 3003;
|
||||
# settings = {
|
||||
# allowDHCP = true;
|
||||
# dns = {
|
||||
# upstream_dns = [
|
||||
# "9.9.9.9#dns.quad9.net"
|
||||
# "149.112.112.112#dns.quad9.net"
|
||||
# ];
|
||||
# };
|
||||
# filtering = {
|
||||
# protection_enabled = true;
|
||||
# filtering_enabled = true;
|
||||
# parental_enabled = true;
|
||||
# safe_search.enabled = false;
|
||||
# };
|
||||
# filters =
|
||||
# map (url: {
|
||||
# enabled = true;
|
||||
# url = url;
|
||||
# }) [
|
||||
# "https://adguardteam.github.io/HostlistsRegistry/assets/filter_9.txt"
|
||||
# "https://adguardteam.github.io/HostlistsRegistry/assets/filter_11.txt"
|
||||
# ];
|
||||
# };
|
||||
# };
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user