mirror of
https://github.com/youwen5/nixos.git
synced 2024-11-28 11:43:51 -08:00
Compare commits
4 commits
9e52ef6c28
...
dc86e970e7
Author | SHA1 | Date | |
---|---|---|---|
dc86e970e7 | |||
4516685bb9 | |||
6c200053b2 | |||
ca88c64494 |
8 changed files with 86 additions and 13 deletions
38
flake.lock
38
flake.lock
|
@ -157,6 +157,22 @@
|
|||
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
|
||||
}
|
||||
},
|
||||
"flake-compat_4": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
|
@ -727,6 +743,7 @@
|
|||
"nix-homebrew": "nix-homebrew",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixvim": "nixvim",
|
||||
"spicetify": "spicetify",
|
||||
"stablepkgs": "stablepkgs"
|
||||
}
|
||||
},
|
||||
|
@ -771,6 +788,27 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"spicetify": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_4",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724472954,
|
||||
"narHash": "sha256-65NfzEvwdJGHsOZA+w4AUFUG10RyfuQltct3h++gsw0=",
|
||||
"owner": "Gerg-L",
|
||||
"repo": "spicetify-nix",
|
||||
"rev": "3caf2a241f7af52419ce97c6682b0467219ab914",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Gerg-L",
|
||||
"repo": "spicetify-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"stablepkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1724098845,
|
||||
|
|
14
flake.nix
14
flake.nix
|
@ -53,20 +53,16 @@
|
|||
url = "github:nix-community/nixvim";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
spicetify = {
|
||||
url = "github:Gerg-L/spicetify-nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = {
|
||||
self,
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
catppuccin,
|
||||
lanzaboote,
|
||||
stablepkgs,
|
||||
bleedingpkgs,
|
||||
lix-module,
|
||||
nix-darwin,
|
||||
nix-homebrew,
|
||||
apple-silicon,
|
||||
...
|
||||
} @ inputs: let
|
||||
in {
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
../../modules/nixos/fonts
|
||||
../../modules/nixos/greeter
|
||||
../../modules/nixos/core
|
||||
../../modules/nixos/hamachi
|
||||
../../overlays
|
||||
|
||||
catppuccin.nixosModules.catppuccin
|
||||
|
@ -33,6 +34,7 @@
|
|||
../../users/youwen/common/neofetch
|
||||
../../users/youwen/common/neovim
|
||||
../../users/youwen/common
|
||||
../../users/youwen/linux/spicetify
|
||||
./home-manager-extras
|
||||
catppuccin.homeManagerModules.catppuccin
|
||||
nixvim.homeManagerModules.nixvim
|
||||
|
|
4
modules/nixos/hamachi/default.nix
Normal file
4
modules/nixos/hamachi/default.nix
Normal file
|
@ -0,0 +1,4 @@
|
|||
{
|
||||
services.logmein-hamachi.enable = true;
|
||||
programs.haguichi.enable = true;
|
||||
}
|
|
@ -1,6 +1,19 @@
|
|||
{
|
||||
let
|
||||
universalAllowedPorts = [27016 42805];
|
||||
universalAllowedRanges = [
|
||||
{
|
||||
from = 42852;
|
||||
to = 42872;
|
||||
}
|
||||
];
|
||||
in {
|
||||
services.openssh.enable = true;
|
||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||
networking.firewall = {
|
||||
allowedTCPPorts = universalAllowedPorts;
|
||||
allowedUDPPorts = universalAllowedPorts;
|
||||
allowedUDPPortRanges = universalAllowedRanges;
|
||||
allowedTCPPortRanges = universalAllowedRanges;
|
||||
};
|
||||
networking.firewall.enable = true;
|
||||
networking.nameservers = ["1.1.1.1" "1.0.0.1"];
|
||||
}
|
||||
|
|
|
@ -43,6 +43,7 @@
|
|||
"$mod, T, exec, kitty"
|
||||
"$mod, E, exec, dolphin"
|
||||
"$mod, R, exec, pavucontrol"
|
||||
"$mod, M, exec, thunderbird"
|
||||
|
||||
# Window actions
|
||||
"$mod, Q, killactive"
|
||||
|
|
|
@ -4,7 +4,6 @@ in {
|
|||
home.packages =
|
||||
(createCommon pkgs)
|
||||
++ (with pkgs; [
|
||||
spotify
|
||||
bitwarden-desktop
|
||||
modrinth-app
|
||||
lutris
|
||||
|
|
20
users/youwen/linux/spicetify/default.nix
Normal file
20
users/youwen/linux/spicetify/default.nix
Normal file
|
@ -0,0 +1,20 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
spicepkgs = inputs.spicetify.legacyPackages.${pkgs.system};
|
||||
in {
|
||||
imports = [
|
||||
inputs.spicetify.homeManagerModules.default
|
||||
];
|
||||
|
||||
programs.spicetify = {
|
||||
enable = true;
|
||||
theme = spicepkgs.themes.catppuccin;
|
||||
colorScheme = "mocha";
|
||||
enabledExtensions = with spicepkgs.extensions; [
|
||||
lastfm
|
||||
];
|
||||
};
|
||||
}
|
Loading…
Reference in a new issue