natto1784/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hosts and modules restructuring

Browse Source 
Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
This commit is contained in:
Amneesh Singh
2022-12-06 19:30:28 +05:30
parent d654ab9463
commit 42843126e3
19 changed files with 137 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
flake.lock generated
View File

@@ -22,11 +22,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1669924706,
"narHash": "sha256-5YdsL731ESOT8wZ6aBPG7V2AZxYglK/N8JJopp9R+Ow=",
"lastModified": 1670295974,
"narHash": "sha256-+oQzBTxrWag9XnIndTUXvilI78fuIlhRQ+iNtBrlUF8=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "7419dbeb120e44bfb8cbbb74f1b4e77b3f8401ab",
"rev": "2f7fff8ee668c01803cab2f0847151fdf647134e",
"type": "github"
},
"original": {
@@ -102,11 +102,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1669825171,
"narHash": "sha256-HxlZHSiRGXnWAFbIJMeujqBe2KgACYx5XDRY0EA9P+4=",
"lastModified": 1670280307,
"narHash": "sha256-3x+0whP1nCz5adQMIsBA3L9fI/ABOpRUJdbw0AmxBnU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "478610aa37c8339eacabfa03f07dacf5574edd47",
"rev": "2af0d07678fc15612345e0dd55337550dcf6465f",
"type": "github"
},
"original": {
@@ -157,11 +157,11 @@
},
"master": {
"locked": {
"lastModified": 1669939897,
"narHash": "sha256-DjVJK3t6HRxul4k6pNwfgGpjF5PirmZjgFjRvBTrlAk=",
"lastModified": 1670329699,
"narHash": "sha256-a2COGA8sIwGtiShuO8T8fgT+MhOhpGYdsywJP34DUEg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "67f5368df158a7ef2f020ccca17f88ab20caa786",
"rev": "2be8b0ec2fa3fc02c3fe6ed608d29743a1fd76e0",
"type": "github"
},
"original": {
@@ -200,11 +200,11 @@
},
"locked": {
"dir": "contrib",
"lastModified": 1669866653,
"narHash": "sha256-Xtis0StzXynHe7gnqgcl4sm2JHva9Y+KlVjaOaf/S3w=",
"lastModified": 1670297660,
"narHash": "sha256-OB1P48rxsqSqB50yTyvy75sLS5AdmJvtdRXtgCl5D8U=",
"owner": "neovim",
"repo": "neovim",
"rev": "1390e97c200ee265f72a4e2d7ec1a47fd65462ee",
"rev": "6d7b94ea086e17d16e2490e56572f17031924af5",
"type": "github"
},
"original": {
@@ -219,11 +219,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1669128192,
"narHash": "sha256-iBkK3E/S4XfQDi+2hr8WWitiIUZ5EWsmfTcR4jbIPNA=",
"lastModified": 1670183910,
"narHash": "sha256-qRZaqZ+KdxT7hXQBmRHxrpE4MqwiaBOQtOAxuJKtS0U=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "9f96bd578ee5c1511535adccd295383d79fb791d",
"rev": "ba6dd04cdb03d796054d0d2bb81f949690fc6efa",
"type": "github"
},
"original": {
@@ -234,11 +234,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1669261230,
"narHash": "sha256-AjddxRPd5y5jge77281P3O8+Cnafj842Xg59rwV4x+0=",
"lastModified": 1670047204,
"narHash": "sha256-5NcSGchQbl9DKMQ31qmgfscmrAg7qilJF/no2nBSRzs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8e8b5f3b1e899bf5d250279578c0283705b8cdb4",
"rev": "809f15f2e7fd66c3d3ba6aabffa946fbd67f93fc",
"type": "github"
},
"original": {
@@ -263,11 +263,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1669542132,
"narHash": "sha256-DRlg++NJAwPh8io3ExBJdNW7Djs3plVI5jgYQ+iXAZQ=",
"lastModified": 1669969257,
"narHash": "sha256-mOS13sK3v+kfgP+1Mh56ohiG8uVhLHAo7m/q9kqAehc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a115bb9bd56831941be3776c8a94005867f316a7",
"rev": "b72b8b94cf0c012b0252a9100a636cad69696666",
"type": "github"
},
"original": {
@@ -279,11 +279,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1669261230,
"narHash": "sha256-AjddxRPd5y5jge77281P3O8+Cnafj842Xg59rwV4x+0=",
"lastModified": 1670047204,
"narHash": "sha256-5NcSGchQbl9DKMQ31qmgfscmrAg7qilJF/no2nBSRzs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8e8b5f3b1e899bf5d250279578c0283705b8cdb4",
"rev": "809f15f2e7fd66c3d3ba6aabffa946fbd67f93fc",
"type": "github"
},
"original": {
@@ -339,11 +339,11 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1669900182,
"narHash": "sha256-EKxjHxRJnP1w+2nnm8pq4Uqkqa5McnfPXcO8cG8Mxzc=",
"lastModified": 1670235252,
"narHash": "sha256-5YWCit/Brz4EDT/TIwXT/5wxRxb+cz1Nls7ZodQeKiw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "bcb6dbbe30ce7631e5a0865dff1ab9b63d92977d",
"rev": "543070eafe8d5e86ebaa3095fd1e568db09b9b73",
"type": "github"
},
"original": {
@@ -355,11 +355,11 @@
},
"nixpkgs_8": {
"locked": {
"lastModified": 1669809720,
"narHash": "sha256-RMT77f6CPOYtLLQ2esj+EJ1BPVWxf4RDidjrSvA5OhI=",
"lastModified": 1670148586,
"narHash": "sha256-EcDfOiTHs0UBAtyGc0wxJJdhcMjrJEgWXjJutxZGA3E=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "227de2b3bbec142f912c09d5e8a1b4e778aa54fb",
"rev": "a2d2f70b82ada0eadbcb1df2bca32d841a3c1bf1",
"type": "github"
},
"original": {
@@ -387,11 +387,11 @@
},
"nur": {
"locked": {
"lastModified": 1669805596,
"narHash": "sha256-g1CPQZ+1jGhY4bsjppk+gH5jfzzqmPlqGHg0zSYS3Hw=",
"lastModified": 1670315682,
"narHash": "sha256-/v0RgZZIjvsFuJbJLUlzRbzSlYFXq3olgJTuJBNtcoY=",
"owner": "nix-community",
"repo": "NUR",
"rev": "c81b1e527f3a220abfa9bf8096153d52784c5007",
"rev": "af814db16c89385c65e758608296440555f61ccc",
"type": "github"
},
"original": {
@@ -407,11 +407,11 @@
"nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1669882574,
"narHash": "sha256-YvfuFvOHQeQEHPoQr8sp2wnryGOucldcleWNZjvH9uY=",
"lastModified": 1670314513,
"narHash": "sha256-NfUfsaA9RaTQWTjv1fMHqPkcI1u3rqddUPLLX4s47ZM=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "58c5eeb11792c32f45e1d9e06017727f722a23eb",
"rev": "66d0dd530766c323b5cb177773409be387231238",
"type": "github"
},
"original": {
@@ -422,11 +422,11 @@
},
"old": {
"locked": {
"lastModified": 1669764884,
"narHash": "sha256-1qWR/5+WtqxSedrFbUbM3zPMO7Ec2CGWaxtK4z4DdvY=",
"lastModified": 1670083709,
"narHash": "sha256-UL4czXyVoKSCqAbNkfJEu2M+XhIVNwBGkyDt+UbtA5E=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0244e143dc943bcf661fdaf581f01eb0f5000fcf",
"rev": "e09913998d89659044c29ef5df4a86542e78a2ef",
"type": "github"
},
"original": {
@@ -461,11 +461,11 @@
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1669862269,
"narHash": "sha256-/ar+cbAKAxd2Ng9b7EhrIMz9CP353RbmLecvyOidyUM=",
"lastModified": 1670293639,
"narHash": "sha256-RkPLwza77YkFgxKHGzfYAYVKiD9SeIvsOA7+ihiySwI=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "bfdf688742cf984c4837dbbe1c6cbca550365613",
"rev": "9767af967a0becaa3bb79eeda838dbf81295eb62",
"type": "github"
},
"original": {
@@ -476,11 +476,11 @@
},
"stable": {
"locked": {
"lastModified": 1669834992,
"narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=",
"lastModified": 1670193339,
"narHash": "sha256-oHTAhX4p6+uxcabq0rKL4EyKWPbDLGKec88ocPIU/2Y=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502",
"rev": "e169cf5b3b1e6cc4a25ff15087c2621605f83409",
"type": "github"
},
"original": {
@@ -492,11 +492,11 @@
},
"stable-small": {
"locked": {
"lastModified": 1669861251,
"narHash": "sha256-QyBI5QNT/nQRkCsZHnN3ImKCaxrtMArVqNioA7diwU4=",
"lastModified": 1670169715,
"narHash": "sha256-ZWekhqQrt9wETxTz19LssfeW6zzUOIG1fq6j+Ri0V3k=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "af4d0d532f413ad2fbb3a13f47c98c9fca1948e1",
"rev": "7187c12972bde6e2c00a3dae864e1aa92efcc316",
"type": "github"
},
"original": {

6
flake.nix
View File

@@ -47,10 +47,10 @@
inputs.nvim.overlay
inputs.rust.overlays.default
inputs.emacs.overlay
inputs.nix-gaming.overlays.default
channels
(_: _: {
nbfc-linux = inputs.nbfc.packages.${system}.nbfc-client-c;
gaming = inputs.nix-gaming.packages.${system};
})
];
config.allowUnfree = true;
@@ -67,8 +67,8 @@
./modules/vault-agent.nix
];
serverModules = [
./modules/min-pkgs.nix
./modules/min-stuff.nix
./modules/minpkgs.nix
./modules/minzsh.nix
];
homeModules = [
./home/modules/secret.nix

0
hosts/marisa/boot.nix Executable file → Normal file
View File

1
hosts/marisa/default.nix Executable file → Normal file
View File

@@ -6,6 +6,7 @@
./hardware.nix
./boot.nix
./services.nix
./stuff.nix
];
system.stateVersion = "21.05";
}

0
hosts/marisa/hardware.nix Executable file → Normal file
View File

0
hosts/marisa/networking.nix Executable file → Normal file
View File

0
hosts/marisa/services.nix Executable file → Normal file
View File

32
hosts/marisa/stuff.nix Normal file
View File

@@ -0,0 +1,32 @@
{ config, pkgs, ... }:
{
time.timeZone = "Asia/Kolkata";
security = {
sudo.enable = false;
doas = {
enable = true;
extraRules = [
{
users = [ ];
keepEnv = true;
persist = true;
}
];
};
};
programs = {
gnupg = {
agent = {
enable = true;
pinentryFlavor = "curses";
};
};
};
nix = {
package = pkgs.nixUnstable;
extraOptions = ''
experimental-features = nix-command flakes
'';
settings.trusted-users = [ "root" ];
};
}

0
hosts/remilia/boot.nix Executable file → Normal file
View File

1
hosts/remilia/default.nix Executable file → Normal file
View File

@@ -7,6 +7,7 @@
./boot.nix
./services.nix
./mailserver.nix
./stuff.nix
];
system.stateVersion = "21.11";

0
hosts/remilia/networking.nix Executable file → Normal file
View File

0
hosts/remilia/services.nix Executable file → Normal file
View File

32
hosts/remilia/stuff.nix Normal file
View File

@@ -0,0 +1,32 @@
{ config, pkgs, ... }:
{
time.timeZone = "Asia/Kolkata";
security = {
sudo.enable = false;
doas = {
enable = true;
extraRules = [
{
users = [ ];
keepEnv = true;
persist = true;
}
];
};
};
programs = {
gnupg = {
agent = {
enable = true;
pinentryFlavor = "curses";
};
};
};
nix = {
package = pkgs.nixUnstable;
extraOptions = ''
experimental-features = nix-command flakes
'';
settings.trusted-users = [ "root" ];
};
}

1
hosts/satori/nix.nix
View File

@@ -6,6 +6,7 @@
experimental-features = nix-command flakes
'';
settings = {
auto-optimise-store = true;
trusted-users = [ "root" "natto" ];
substituters = [
"https://nix-gaming.cachix.org"

1
hosts/satori/stuff.nix
View File

@@ -38,6 +38,7 @@
};
fonts.fonts = with pkgs; [
fira-mono
fira-code
lohit-fonts.devanagari
lohit-fonts.gurmukhi
nerdfonts

26
modules/min-stuff.nix
View File

@@ -1,26 +0,0 @@
{config, pkgs, ...}:
{
time.timeZone = "Asia/Kolkata";
environment = {
sessionVariables = {
EDITOR = "vim";
};
};
security = {
sudo.enable = false;
doas = {
enable = true;
extraRules = [
{
users = [ ];
keepEnv = true;
persist = true;
}
];
};
};
documentation.enable = false;
users.extraUsers.root = {
shell = pkgs.zsh;
};
}

16
modules/minpkgs.nix Normal file
View File

@@ -0,0 +1,16 @@
{ config, pkgs, ... }:
{
environment.systemPackages = with pkgs; [
git
htop
vim
wireguard-tools
vault
tree-sitter
rnix-lsp
nmap
gcc
fly
postgresql #for the client cli
];
}

23
modules/min-pkgs.nix → modules/minzsh.nix Executable file → Normal file
View File

@@ -1,19 +1,5 @@
{ lib, config, pkgs, ... }:
{ config }:
{
environment.systemPackages = with pkgs; [
git
htop
vim
wireguard-tools
vault
tree-sitter
rnix-lsp
nmap
gcc
fly
postgresql #for the client cli
];
programs = {
zsh = {
enable = true;
@@ -34,11 +20,4 @@
};
};
};
nix = {
package = pkgs.nixUnstable;
extraOptions = ''
experimental-features = nix-command flakes
'';
settings.trusted-users = [ "root" ];
};
}

2
modules/nvim/init.lua
View File

@@ -88,7 +88,7 @@ function _G.CompileRun()
['c'] = 'gcc ' .. file .. ' -o ' .. noext .. ' -Wno-unused-result ' .. ' && ' .. noext .. ' && rm ' .. noext,
['rust'] = 'rustc ' .. file .. ' -o ' .. noext .. ' && ' .. noext .. ' && rm ' .. noext,
['cpp'] = 'g++ -std=c++17 ' .. file .. ' -o ' .. noext .. ' -Wno-unused-result ' .. ' && ' .. noext .. ' && rm ' .. noext,
['haskell'] = 'ghc -dynamic ' .. file .. ' && ' .. noext .. ' && rm ' .. noext .. ' ' .. noext .. '.o ' .. noext .. '.hi',
['haskell'] = 'runhaskell ' .. file,
['sh'] = 'sh ' .. file,
['javascript']= 'node ' .. file,
['typescript']= 'tsc ' .. file .. ' && node ' .. noext .. '.js && rm ' .. noext .. '.js'