mirror of
https://git.gay/xqtc/nixos-config
synced 2024-11-22 21:50:33 +01:00
merge
This commit is contained in:
commit
35bac4a89a
|
@ -8,11 +8,13 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
user = "xqtc";
|
user = "xqtc";
|
||||||
dataDir = "/home/xqtc/syncthing";
|
dataDir = "/home/xqtc/syncthing";
|
||||||
|
overrideDevices = false;
|
||||||
|
overrideFolders = false;
|
||||||
configDir = "${config.services.syncthing.dataDir}/.config/syncthing";
|
configDir = "${config.services.syncthing.dataDir}/.config/syncthing";
|
||||||
settings = {
|
settings = {
|
||||||
gui = {
|
gui = {
|
||||||
user = "xqtc";
|
user = "xqtc";
|
||||||
# insecureSkipHostcheck = true;
|
# insecureSkipHostcheck = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
36
flake.lock
36
flake.lock
|
@ -49,11 +49,11 @@
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "pkgs/firefox-addons",
|
"dir": "pkgs/firefox-addons",
|
||||||
"lastModified": 1712989815,
|
"lastModified": 1713167493,
|
||||||
"narHash": "sha256-RWP/TMdNnDfOnhK3CMDxezX9L+bALjqvnZXY16EvtA0=",
|
"narHash": "sha256-Atjqvb9WOUyLzEgAVEXzBzPgymf2wT2K4i0XBdatbN0=",
|
||||||
"owner": "rycee",
|
"owner": "rycee",
|
||||||
"repo": "nur-expressions",
|
"repo": "nur-expressions",
|
||||||
"rev": "612713b8c55be97af5b4ff75ab5f427fde25328c",
|
"rev": "26277125de089543b890b70334211c6e1405db30",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -245,11 +245,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713019815,
|
"lastModified": 1713166971,
|
||||||
"narHash": "sha256-jzTo97VeKMNfnKw3xU+uiU5C7wtnLudsbwl/nwPLC7s=",
|
"narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "8fdf329526f06886b53b94ddf433848a0d142984",
|
"rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -267,11 +267,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1712759992,
|
"lastModified": 1712989663,
|
||||||
"narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=",
|
"narHash": "sha256-r2X/DIAyKOLiHoncjcxUk1TENWDTTaigRBaY53Cts/w=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9",
|
"rev": "40ab43ae98cb3e6f07eaeaa3f3ed56d589da21b0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -335,11 +335,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-master": {
|
"nixpkgs-master": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713032949,
|
"lastModified": 1713176148,
|
||||||
"narHash": "sha256-WZR0/LpLkSsajw9uFwUCEWBA9QtWWRRBNScnvwjJHCM=",
|
"narHash": "sha256-4tvZfC2iv7McdRjHvuAoZqmYDsUruTnU1EM2/Rt2OHU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "44f5a5f39c795cf7a2281529e732b0dcd9427140",
|
"rev": "20a3a2181494145baed7ad006727f3e15bc12f15",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -367,11 +367,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1712791164,
|
"lastModified": 1712963716,
|
||||||
"narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
|
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
|
"rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -410,11 +410,11 @@
|
||||||
"pre-commit-hooks": "pre-commit-hooks"
|
"pre-commit-hooks": "pre-commit-hooks"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713008785,
|
"lastModified": 1713167695,
|
||||||
"narHash": "sha256-fblaj6/83OQYrD1UHBjLapxjGQaC4edouX4g2X8CVhk=",
|
"narHash": "sha256-P+X1SeTYzkZI9VXsuTNkHjHmY77n1lXsjOb3Xs7eMsQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "21c233919d747d3375e3a173b65f7f26ccf01256",
|
"rev": "99068dab4b6d6dc55fb50cfaf807b156115e8d89",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -21,7 +21,7 @@ with inputs; {
|
||||||
leechblock-ng
|
leechblock-ng
|
||||||
darkreader
|
darkreader
|
||||||
stylus
|
stylus
|
||||||
violentmonkey
|
violentmonkey
|
||||||
vimium-c
|
vimium-c
|
||||||
noscript
|
noscript
|
||||||
];
|
];
|
||||||
|
@ -83,6 +83,22 @@ with inputs; {
|
||||||
definedAliases = ["@no"];
|
definedAliases = ["@no"];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
"Nix Dev" = {
|
||||||
|
urls = [
|
||||||
|
{
|
||||||
|
template = "https://nix.dev/search.html";
|
||||||
|
params = [
|
||||||
|
{
|
||||||
|
name = "q";
|
||||||
|
value = "{searchTerms}";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
||||||
|
definedAliases = ["@nd"];
|
||||||
|
};
|
||||||
|
|
||||||
"NixOS Wiki" = {
|
"NixOS Wiki" = {
|
||||||
urls = [
|
urls = [
|
||||||
{
|
{
|
||||||
|
|
|
@ -16,8 +16,8 @@
|
||||||
enabled-extensions = [
|
enabled-extensions = [
|
||||||
"user-theme@gnome-shell-extensions.gcampax.github.com"
|
"user-theme@gnome-shell-extensions.gcampax.github.com"
|
||||||
"trayIconsReloaded@selfmade.pl"
|
"trayIconsReloaded@selfmade.pl"
|
||||||
"burn-my-windows@schneegans.github.com"
|
"burn-my-windows@schneegans.github.com"
|
||||||
"desktop-cube@schneegans.github.com"
|
"desktop-cube@schneegans.github.com"
|
||||||
"Vitals@CoreCoding.com"
|
"Vitals@CoreCoding.com"
|
||||||
"dash-to-panel@jderose9.github.com"
|
"dash-to-panel@jderose9.github.com"
|
||||||
# "blur-my-shell@aunetx"
|
# "blur-my-shell@aunetx"
|
||||||
|
@ -64,12 +64,11 @@
|
||||||
gnomeExtensions.desktop-cube
|
gnomeExtensions.desktop-cube
|
||||||
catppuccin-cursors.mochaPink
|
catppuccin-cursors.mochaPink
|
||||||
];
|
];
|
||||||
# home.pointerCursor = {
|
# home.pointerCursor = {
|
||||||
# gtk.enable = true;
|
# gtk.enable = true;
|
||||||
# x11.enable = true;
|
# x11.enable = true;
|
||||||
# name = "Catppuccin-Mocha-Pink-Cursors";
|
# name = "Catppuccin-Mocha-Pink-Cursors";
|
||||||
# package = pkgs.catppuccin-cursors.mochaPink;
|
# package = pkgs.catppuccin-cursors.mochaPink;
|
||||||
# # size = 24;
|
# # size = 24;
|
||||||
# };
|
# };
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
pkgs.steam
|
pkgs.steam
|
||||||
pkgs.protonup-qt
|
pkgs.protonup-qt
|
||||||
pkgs.via
|
pkgs.via
|
||||||
|
pkgs.telegram-desktop
|
||||||
# pkgs.spotify
|
# pkgs.spotify
|
||||||
]
|
]
|
||||||
else [];
|
else [];
|
||||||
|
@ -19,18 +20,22 @@ in {
|
||||||
home.packages =
|
home.packages =
|
||||||
[
|
[
|
||||||
pkgs.neofetch
|
pkgs.neofetch
|
||||||
pkgs.uwufetch
|
# pkgs.uwufetch
|
||||||
maxfetch
|
maxfetch
|
||||||
pkgs.btop
|
pkgs.btop
|
||||||
pkgs.iftop
|
pkgs.iftop
|
||||||
pkgs.ranger
|
pkgs.ranger
|
||||||
|
|
||||||
|
pkgs.openvpn
|
||||||
|
|
||||||
pkgs.moodle-dl
|
pkgs.moodle-dl
|
||||||
|
|
||||||
pkgs.anki
|
pkgs.anki
|
||||||
|
|
||||||
pkgs.obsidian
|
pkgs.obsidian
|
||||||
|
|
||||||
|
pkgs.syncthingtray
|
||||||
|
|
||||||
pkgs.brightnessctl
|
pkgs.brightnessctl
|
||||||
pkgs.pavucontrol
|
pkgs.pavucontrol
|
||||||
|
|
||||||
|
@ -50,7 +55,6 @@ in {
|
||||||
|
|
||||||
pkgs.signal-desktop
|
pkgs.signal-desktop
|
||||||
pkgs.vesktop
|
pkgs.vesktop
|
||||||
pkgs.telegram-desktop
|
|
||||||
pkgs.element-desktop
|
pkgs.element-desktop
|
||||||
|
|
||||||
pkgs.qbittorrent
|
pkgs.qbittorrent
|
||||||
|
@ -62,6 +66,7 @@ in {
|
||||||
pkgs.neovide
|
pkgs.neovide
|
||||||
|
|
||||||
pkgs.xournalpp
|
pkgs.xournalpp
|
||||||
|
pkgs.zathura
|
||||||
|
|
||||||
pkgs.ripgrep
|
pkgs.ripgrep
|
||||||
|
|
||||||
|
|
|
@ -147,8 +147,8 @@
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
|
|
||||||
# Open ports in the firewall.
|
# Open ports in the firewall.
|
||||||
networking.firewall.allowedTCPPorts = [22];
|
networking.firewall.allowedTCPPorts = [22 2234];
|
||||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
networking.firewall.allowedUDPPorts = [2234];
|
||||||
# Or disable the firewall altogether.
|
# Or disable the firewall altogether.
|
||||||
# networking.firewall.enable = false;
|
# networking.firewall.enable = false;
|
||||||
|
|
||||||
|
|
|
@ -43,6 +43,20 @@ with lib; {
|
||||||
grafana.heroin.trade {
|
grafana.heroin.trade {
|
||||||
reverse_proxy http://127.0.0.1:2342
|
reverse_proxy http://127.0.0.1:2342
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
demos.heroin.trade {
|
||||||
|
root * /var/www/demos/
|
||||||
|
file_server browse
|
||||||
|
}
|
||||||
|
jellyfin.heroin.trade {
|
||||||
|
reverse_proxy http://127.0.0.1:8096
|
||||||
|
}
|
||||||
|
calibre.heroin.trade {
|
||||||
|
reverse_proxy http://localhost:3000
|
||||||
|
}
|
||||||
|
grafana.heroin.trade {
|
||||||
|
reverse_proxy http://127.0.0.1:2342
|
||||||
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue