Skip to content

Commit

Permalink
template and edits for kurumi
Browse files Browse the repository at this point in the history
  • Loading branch information
luqmanishere committed May 21, 2024
1 parent 66e652f commit 1706f30
Show file tree
Hide file tree
Showing 14 changed files with 146 additions and 189 deletions.
2 changes: 2 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@

fenrys-cross =
nixpkgs.legacyPackages.x86_64-linux.pkgsCross.aarch64-multiplatform.nixos ./systems/fenrys.nix;

kurumi = self.nixos-flake.lib.mkLinuxSystem ./systems/kurumi;
};
};

Expand Down
2 changes: 1 addition & 1 deletion home/editors/astronvim/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ in {

programs.neovim = {
enable = true;
package = pkgs.neovim-nightly;
# package = pkgs.neovim-nightly;
# package = inputs.neovim-flake.packages.${pkgs.system}.neovim;
# we avoid using the wrapped neovim thing
};
Expand Down
8 changes: 8 additions & 0 deletions home/tools/pidgin.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{pkgs, ...}: {
config = {
programs.pidgin = {
enable = true;
plugins = [];
};
};
}
2 changes: 2 additions & 0 deletions home/tools/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
ip = "ip --color=auto";

tm = "tmux attach -t main || tmux new -s main";

nvimdev = "NVIM_APPNAME=\"nvimdev\" nvim";
};
shellAbbrs = {
psg = "ps ax | grep -i";
Expand Down
7 changes: 7 additions & 0 deletions nix/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,25 @@
nil
alejandra
nh
ripgrep
];
scripts = {
menu = {
description = "show this menu";
exec = help-menu;
};

# build systems
nix-build-asuna = {
description = "Builds toplevel NixOS image for host asuna";
exec = nix-build "asuna";
};

nix-build-kurumi = {
description = "Builds toplevel NixOS image for host kurumi";
exec = nix-build "kurumi";
};

rebuild-switch-asuna = {
description = "Switch into the configuration for host asuna";
exec = rebuild-switch "asuna";
Expand Down
7 changes: 7 additions & 0 deletions nixos/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ in {
./shells.nix
./nh.nix
./power.nix
./polkit.nix
];

home-manager.useGlobalPkgs = true;
Expand Down Expand Up @@ -64,6 +65,12 @@ in {
hostname = "fenrys";
nixosModules = [];
};

# desktop config
kurumi = mkSystem {
hostname = "kurumi";
nixosModules = [];
};
};
};
}
12 changes: 11 additions & 1 deletion nixos/nix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ in {
};

# put nixos overlays here
overlays = [inputs.neovim-nightly-overlay.overlays.default inputs.emacs-overlay.overlays.package];
overlays = [inputs.emacs-overlay.overlays.package];
};

nix = {
Expand Down Expand Up @@ -43,4 +43,14 @@ in {
# trusted-substituters = ["https://hyprland.cachix.org"];
};
};

# increase open file settings for nix
security.pam.loginLimits = [
{
domain = "*";
type = "soft";
item = "nofile";
value = "8192";
}
];
}
21 changes: 21 additions & 0 deletions nixos/polkit.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{pkgs, ...}: {
config = {
security.polkit.enable = true;

environment.systemPackages = with pkgs; [polkit-kde-agent];

user.services.polkit-kde-authentication-agent-1 = {
description = "polkit-kde-authentication-agent-1";
wantedBy = ["graphical-session.target"];
wants = ["graphical-session.target"];
after = ["graphical-session.target"];
serviceConfig = {
Type = "simple";
ExecStart = "${pkgs.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1";
Restart = "on-failure";
RestartSec = 1;
TimeoutStopSec = 10;
};
};
};
}
3 changes: 2 additions & 1 deletion nixvim/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@

# TODO: use nightly for now
extraSpecialArgs = {
nvim-package = inputs'.neovim-nightly-overlay.packages.neovim;
# nvim-package = inputs'.neovim-nightly-overlay.packages.neovim;
nvim-package = pkgs.neovim;
flake-inputs = inputs';
};
};
Expand Down
2 changes: 1 addition & 1 deletion nixvim/ui.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
telescope.enable = true;
nvim-autopairs.enable = true;
};
extraPlugins = with pkgs.vimPlugins; [suda-vim];
extraPlugins = with pkgs.vimPlugins; [vim-suda];
options = {
number = true;
relativenumber = true;
Expand Down
15 changes: 0 additions & 15 deletions systems/asuna/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ in {
Defaults lecture = never
'';
};
polkit.enable = true;
};

# TODO: refactor into own module
Expand Down Expand Up @@ -235,7 +234,6 @@ in {
gcc
clang
python3
polkit-kde-agent
cloudflare-warp
aria2
helvum
Expand All @@ -256,19 +254,6 @@ in {
];

systemd = {
user.services.polkit-kde-authentication-agent-1 = {
description = "polkit-kde-authentication-agent-1";
wantedBy = ["graphical-session.target"];
wants = ["graphical-session.target"];
after = ["graphical-session.target"];
serviceConfig = {
Type = "simple";
ExecStart = "${pkgs.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1";
Restart = "on-failure";
RestartSec = 1;
TimeoutStopSec = 10;
};
};
};

virtualisation = {
Expand Down
10 changes: 5 additions & 5 deletions systems/asuna/hardware.nix
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@
options = ["user" "exec" "rw" "uid=1000" "gid=1000"];
};

"/mnt/windowsd" = {
device = "/dev/disk/by-uuid/DA1AAC921AAC6CE7";
fsType = "ntfs3";
options = ["user" "exec" "rw" "uid=1000" "gid=1000"];
};
# "/mnt/windowsd" = {
# device = "/dev/disk/by-uuid/DA1AAC921AAC6CE7";
# fsType = "ntfs3";
# options = ["user" "exec" "rw" "uid=1000" "gid=1000"];
# };

"/mnt/storage2/jellyfin" = {
device = "/dev/disk/by-uuid/39ea80c4-e748-47eb-835c-64025de53e26";
Expand Down
165 changes: 0 additions & 165 deletions systems/kurumi.nix

This file was deleted.

Loading

0 comments on commit 1706f30

Please sign in to comment.