nod
This commit is contained in:
@@ -32,7 +32,6 @@
|
|||||||
./system-modules/sops.nix
|
./system-modules/sops.nix
|
||||||
./system-modules/sound.nix
|
./system-modules/sound.nix
|
||||||
./system-modules/sshd.nix
|
./system-modules/sshd.nix
|
||||||
./system-modules/base-packages.nix
|
|
||||||
./system-modules/input.nix
|
./system-modules/input.nix
|
||||||
./system-modules/syncthing.nix
|
./system-modules/syncthing.nix
|
||||||
./system-modules/tuda.nix
|
./system-modules/tuda.nix
|
||||||
@@ -61,6 +60,8 @@
|
|||||||
./system-modules/calendar/dicos.nix
|
./system-modules/calendar/dicos.nix
|
||||||
] else [
|
] else [
|
||||||
]);
|
]);
|
||||||
|
environment.systemPackages = import ./system-modules/base-packages.nix pkgs;
|
||||||
|
|
||||||
systemd.extraConfig = "DefaultLimitNOFILE=2048";
|
systemd.extraConfig = "DefaultLimitNOFILE=2048";
|
||||||
system.stateVersion = hyper.pkgs-version;
|
system.stateVersion = hyper.pkgs-version;
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||||
|
|||||||
212
flake.lock
generated
212
flake.lock
generated
@@ -234,6 +234,48 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"home-manager-nod": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs24"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1726989464,
|
||||||
|
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"ref": "release-24.05",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"home-manager_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nix-on-droid",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1709445365,
|
||||||
|
"narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"rev": "4de84265d7ec7634a69ba75028696d74de9a44a7",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"hyprcursor": {
|
"hyprcursor": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"hyprlang": [
|
"hyprlang": [
|
||||||
@@ -570,6 +612,55 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nix-formatter-pack": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nix-on-droid",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"nmd": "nmd",
|
||||||
|
"nmt": "nmt"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1705252799,
|
||||||
|
"narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=",
|
||||||
|
"owner": "Gerschtli",
|
||||||
|
"repo": "nix-formatter-pack",
|
||||||
|
"rev": "2de39dedd79aab14c01b9e2934842051a160ffa5",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "Gerschtli",
|
||||||
|
"repo": "nix-formatter-pack",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nix-on-droid": {
|
||||||
|
"inputs": {
|
||||||
|
"home-manager": "home-manager_2",
|
||||||
|
"nix-formatter-pack": "nix-formatter-pack",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs24"
|
||||||
|
],
|
||||||
|
"nixpkgs-docs": "nixpkgs-docs",
|
||||||
|
"nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap",
|
||||||
|
"nmd": "nmd_2"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1720396533,
|
||||||
|
"narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nix-on-droid",
|
||||||
|
"rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"ref": "release-24.05",
|
||||||
|
"repo": "nix-on-droid",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixos-wsl": {
|
"nixos-wsl": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat_3",
|
"flake-compat": "flake-compat_3",
|
||||||
@@ -605,6 +696,38 @@
|
|||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-docs": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1705957679,
|
||||||
|
"narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "9a333eaa80901efe01df07eade2c16d183761fa3",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "release-23.05",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs-for-bootstrap": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1720244366,
|
||||||
|
"narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs-latest": {
|
"nixpkgs-latest": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756326156,
|
"lastModified": 1756326156,
|
||||||
@@ -652,6 +775,22 @@
|
|||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs24": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1735563628,
|
||||||
|
"narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-24.05",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756266583,
|
"lastModified": 1756266583,
|
||||||
@@ -731,6 +870,60 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nmd": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1666190571,
|
||||||
|
"narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=",
|
||||||
|
"owner": "rycee",
|
||||||
|
"repo": "nmd",
|
||||||
|
"rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169",
|
||||||
|
"type": "gitlab"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "rycee",
|
||||||
|
"repo": "nmd",
|
||||||
|
"type": "gitlab"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nmd_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nix-on-droid",
|
||||||
|
"nixpkgs-docs"
|
||||||
|
],
|
||||||
|
"scss-reset": "scss-reset"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1705050560,
|
||||||
|
"narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=",
|
||||||
|
"owner": "~rycee",
|
||||||
|
"repo": "nmd",
|
||||||
|
"rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3",
|
||||||
|
"type": "sourcehut"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "~rycee",
|
||||||
|
"repo": "nmd",
|
||||||
|
"type": "sourcehut"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nmt": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1648075362,
|
||||||
|
"narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
|
||||||
|
"owner": "rycee",
|
||||||
|
"repo": "nmt",
|
||||||
|
"rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
|
||||||
|
"type": "gitlab"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "rycee",
|
||||||
|
"repo": "nmt",
|
||||||
|
"type": "gitlab"
|
||||||
|
}
|
||||||
|
},
|
||||||
"pre-commit-hooks": {
|
"pre-commit-hooks": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
@@ -785,14 +978,17 @@
|
|||||||
"inputs": {
|
"inputs": {
|
||||||
"copyparty": "copyparty",
|
"copyparty": "copyparty",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
|
"home-manager-nod": "home-manager-nod",
|
||||||
"hyprland": "hyprland",
|
"hyprland": "hyprland",
|
||||||
"hyprland-plugins": "hyprland-plugins",
|
"hyprland-plugins": "hyprland-plugins",
|
||||||
"hyprspace": "hyprspace",
|
"hyprspace": "hyprspace",
|
||||||
"lanzaboote": "lanzaboote",
|
"lanzaboote": "lanzaboote",
|
||||||
|
"nix-on-droid": "nix-on-droid",
|
||||||
"nixos-wsl": "nixos-wsl",
|
"nixos-wsl": "nixos-wsl",
|
||||||
"nixpkgs": "nixpkgs_5",
|
"nixpkgs": "nixpkgs_5",
|
||||||
"nixpkgs-latest": "nixpkgs-latest",
|
"nixpkgs-latest": "nixpkgs-latest",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
|
"nixpkgs24": "nixpkgs24",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
"yazi": "yazi"
|
"yazi": "yazi"
|
||||||
}
|
}
|
||||||
@@ -839,6 +1035,22 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"scss-reset": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1631450058,
|
||||||
|
"narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=",
|
||||||
|
"owner": "andreymatin",
|
||||||
|
"repo": "scss-reset",
|
||||||
|
"rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "andreymatin",
|
||||||
|
"repo": "scss-reset",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"sops-nix": {
|
"sops-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|||||||
45
flake.nix
45
flake.nix
@@ -8,7 +8,11 @@
|
|||||||
|
|
||||||
home-manager = { url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; };
|
home-manager = { url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; };
|
||||||
|
|
||||||
nixos-wsl = { url = "github:nix-community/NixOS-WSL/main"; };
|
nix-on-droid = { url = "github:nix-community/nix-on-droid/release-24.05"; inputs.nixpkgs.follows = "nixpkgs24"; };
|
||||||
|
nixpkgs24 = { url = "github:NixOS/nixpkgs/nixos-24.05"; };
|
||||||
|
home-manager-nod = { url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs24"; };
|
||||||
|
|
||||||
|
nixos-wsl = { url = "github:nix-community/NixOS-WSL/main"; };
|
||||||
|
|
||||||
sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; };
|
sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; };
|
||||||
lanzaboote = { url = "github:nix-community/lanzaboote/v0.4.2"; };
|
lanzaboote = { url = "github:nix-community/lanzaboote/v0.4.2"; };
|
||||||
@@ -28,20 +32,19 @@
|
|||||||
config = { allowUnfreePredicate = pkg: builtins.elem (simple-pkgs.lib.getName pkg) (import ./flake-modules/allowed.nix).unfree; };
|
config = { allowUnfreePredicate = pkg: builtins.elem (simple-pkgs.lib.getName pkg) (import ./flake-modules/allowed.nix).unfree; };
|
||||||
|
|
||||||
hyper-base = rec {
|
hyper-base = rec {
|
||||||
inherit system;
|
system = "x86_64-linux";
|
||||||
user = "nx2";
|
user = "nx2";
|
||||||
domain = "nx2.site";
|
domain = "nx2.site";
|
||||||
home = "/home/${user}/";
|
home = "/home/${user}";
|
||||||
webroot = "/var/lib/hugo/nx2site/public";
|
webroot = "/var/lib/hugo/nx2site/public";
|
||||||
pkgs-version = "25.05";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
my-pkgs = host: import nixpkgs {
|
get-pkgs = { host, system?system, nixpkgs?inputs.nixpkgs, version?"25.05" }: import nixpkgs {
|
||||||
inherit system config;
|
inherit system config;
|
||||||
overlays = [(final: prev: {
|
overlays = [(final: prev: {
|
||||||
unstable = import nixpkgs-unstable { inherit system config; };
|
unstable = import nixpkgs-unstable { inherit system config; };
|
||||||
latest = import nixpkgs-latest { inherit system config; };
|
latest = import nixpkgs-latest { inherit system config; };
|
||||||
version = "25.05";
|
inherit version;
|
||||||
})] ++ (if host == "NxACE" then [
|
})] ++ (if host == "NxACE" then [
|
||||||
copyparty.overlays.default
|
copyparty.overlays.default
|
||||||
] else []);
|
] else []);
|
||||||
@@ -53,17 +56,18 @@
|
|||||||
in {
|
in {
|
||||||
nixosConfigurations = let
|
nixosConfigurations = let
|
||||||
make-nixos-system = host: nvidia-settings: nixpkgs.lib.nixosSystem {
|
make-nixos-system = host: nvidia-settings: nixpkgs.lib.nixosSystem {
|
||||||
pkgs = my-pkgs host;
|
pkgs = get-pkgs { inherit host; };
|
||||||
modules = [ ./configuration.nix ];
|
modules = [ ./configuration.nix ];
|
||||||
specialArgs = let
|
specialArgs = let
|
||||||
hyper = hyper-base // { inherit host; nvidia = (nvidia-base // nvidia-settings); };
|
hyper = hyper-base // { inherit host; nvidia = (nvidia-base // nvidia-settings); };
|
||||||
in { inherit inputs hyper rice secrets; };
|
in { inherit inputs hyper rice secrets; };
|
||||||
};
|
};
|
||||||
make-nixos-wsl-system = host: nixpkgs.lib.nixosSystem {
|
make-nixos-wsl-system = host: nixpkgs.lib.nixosSystem {
|
||||||
pkgs = my-pkgs host;
|
pkgs = get-pkgs { inherit host; };
|
||||||
modules = [ ./nixos-wsl.nix ];
|
modules = [ ./nixos-wsl.nix ];
|
||||||
specialArgs = let
|
specialArgs = let
|
||||||
hyper = hyper-base // { inherit host; };
|
hyper = hyper-base // { inherit host; };
|
||||||
|
rice = import ./flake-modules/rice.nix pkgs;
|
||||||
in { inherit inputs hyper rice; };
|
in { inherit inputs hyper rice; };
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
@@ -73,16 +77,35 @@
|
|||||||
NxWSL = make-nixos-wsl-system "NxWSL";
|
NxWSL = make-nixos-wsl-system "NxWSL";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nixOnDroidConfigurations = let
|
||||||
|
makeNODConfiguration = host: nix-on-droid.lib.nixOnDroidConfiguration rec {
|
||||||
|
pkgs = get-pkgs { host = "NxS23U"; system = "aarch64-linux"; version = "25.05"; } // (
|
||||||
|
get-pkgs { host = "NxS23U"; system = "aarch64-linux"; nixpkgs = nixpkgs24; version = "24.05"; }
|
||||||
|
);
|
||||||
|
modules = [ ./nix-on-droid.nix ];
|
||||||
|
home-manager-path = home-manager-nod.outPath;
|
||||||
|
extraSpecialArgs = let
|
||||||
|
hyper = hyper-base // {
|
||||||
|
inherit host;
|
||||||
|
system = "aarch64-linux";
|
||||||
|
user = "nix-on-droid";
|
||||||
|
home = "/data/data/com.termux.nix/files/home";
|
||||||
|
};
|
||||||
|
rice = import ./flake-modules/rice.nix pkgs;
|
||||||
|
in { inherit inputs hyper rice; };
|
||||||
|
};
|
||||||
|
in { NxS23U = makeNODConfiguration "NxS23U"; };
|
||||||
|
|
||||||
homeConfigurations = let
|
homeConfigurations = let
|
||||||
make-home-configuration = host: user: nvidia-settings: home-manager.lib.homeManagerConfiguration {
|
make-home-configuration = host: user: nvidia-settings: home-manager.lib.homeManagerConfiguration {
|
||||||
pkgs = my-pkgs host;
|
pkgs = get-pkgs { inherit host; };
|
||||||
modules = [ ./home.nix ];
|
modules = [ ./home.nix ];
|
||||||
extraSpecialArgs = let
|
extraSpecialArgs = let
|
||||||
hyper = hyper-base // { inherit host; nvidia = nvidia-base // nvidia-settings; };
|
hyper = hyper-base // { inherit host; nvidia = nvidia-base // nvidia-settings; };
|
||||||
in { inherit inputs hyper rice secrets; };
|
in { inherit inputs hyper rice secrets; };
|
||||||
};
|
};
|
||||||
make-shell-configuration = host: user: home-manager.lib.homeManagerConfiguration {
|
make-shell-configuration = host: user: home-manager.lib.homeManagerConfiguration {
|
||||||
pkgs = my-pkgs host;
|
pkgs = get-pkgs { inherit host; };
|
||||||
modules = [ ./shell-only.nix ];
|
modules = [ ./shell-only.nix ];
|
||||||
extraSpecialArgs = let
|
extraSpecialArgs = let
|
||||||
hyper = hyper-base // { inherit host; };
|
hyper = hyper-base // { inherit host; };
|
||||||
@@ -93,7 +116,7 @@
|
|||||||
"${hyper-base.user}@NxNORTH" = make-home-configuration "NxNORTH" hyper-base.user { enable = true; prime = false; };
|
"${hyper-base.user}@NxNORTH" = make-home-configuration "NxNORTH" hyper-base.user { enable = true; prime = false; };
|
||||||
"${hyper-base.user}@NxACE" = make-home-configuration "NxACE" hyper-base.user { enable = false; };
|
"${hyper-base.user}@NxACE" = make-home-configuration "NxACE" hyper-base.user { enable = false; };
|
||||||
|
|
||||||
"${hyper-base.user}@NxWSL" = make-shell-configuration "NxWSL" hyper-base.user;
|
"${hyper-base.user}@NxWSL" = make-shell-configuration { user = hyper.user; host = "NxWSL"; inherit pkgs; };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,10 @@
|
|||||||
{ ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
programs.bash = {
|
programs.bash = let
|
||||||
|
init = /* bash */ ''
|
||||||
|
source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
|
||||||
|
'';
|
||||||
|
in {
|
||||||
enable = true;
|
enable = true;
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
ll = "ls -l";
|
ll = "ls -l";
|
||||||
@@ -15,5 +19,10 @@
|
|||||||
"checkjobs"
|
"checkjobs"
|
||||||
];
|
];
|
||||||
enableCompletion = false;
|
enableCompletion = false;
|
||||||
|
|
||||||
|
} // pkgs.lib.mkIf (pkgs.version != "24.05") {
|
||||||
|
shellInit = init;
|
||||||
|
} // pkgs.lib.mkIf (pkgs.version != "25.05") {
|
||||||
|
profileExtra = init;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
{ pkgs, ... }@all: with all;
|
{ pkgs, ... }@all: with all;
|
||||||
{
|
{
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
fish
|
|
||||||
any-nix-shell
|
any-nix-shell
|
||||||
|
|
||||||
(writeShellScriptBin "nxfetch" ''
|
(writeShellScriptBin "nxfetch" ''
|
||||||
@@ -38,6 +37,7 @@
|
|||||||
|
|
||||||
programs.fish = {
|
programs.fish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = pkgs.fish;
|
||||||
shellAliases = let
|
shellAliases = let
|
||||||
base-eza = "eza --icons --git --smart-group --group-directories-first";
|
base-eza = "eza --icons --git --smart-group --group-directories-first";
|
||||||
in {
|
in {
|
||||||
@@ -112,7 +112,7 @@
|
|||||||
'';
|
'';
|
||||||
nx_backup = let
|
nx_backup = let
|
||||||
destination = if hyper.host == "NxNORTH" then "${hyper.home}/shared/" else "${hyper.home}/backups/";
|
destination = if hyper.host == "NxNORTH" then "${hyper.home}/shared/" else "${hyper.home}/backups/";
|
||||||
in pkgs.lib.mkIf (hyper.host != "NxACE") ''
|
in pkgs.lib.mkIf (hyper.host == "NxXPS" || hyper.host == "NxNORTH") ''
|
||||||
set RPATH (curl -s https://${hyper.domain}/latest-backup)
|
set RPATH (curl -s https://${hyper.domain}/latest-backup)
|
||||||
rsync -avz --info=progress2 -e "ssh -p ${builtins.toString secrets.ssh.port}" ${hyper.user}@ssh.${hyper.domain}:"$RPATH" ${destination}
|
rsync -avz --info=progress2 -e "ssh -p ${builtins.toString secrets.ssh.port}" ${hyper.user}@ssh.${hyper.domain}:"$RPATH" ${destination}
|
||||||
'';
|
'';
|
||||||
|
|||||||
@@ -19,14 +19,15 @@
|
|||||||
enableFishIntegration = true;
|
enableFishIntegration = true;
|
||||||
defaultCacheTtlSsh = min2sec 60;
|
defaultCacheTtlSsh = min2sec 60;
|
||||||
defaultCacheTtl = min2sec 30;
|
defaultCacheTtl = min2sec 30;
|
||||||
|
extraConfig = ''
|
||||||
|
allow-loopback-pinentry
|
||||||
|
'';
|
||||||
|
} // (if (pkgs.version != "24.05") then {
|
||||||
pinentry = {
|
pinentry = {
|
||||||
package = pkgs.pinentry;
|
package = pkgs.pinentry;
|
||||||
program = "pinentry";
|
program = "pinentry";
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
} else {});
|
||||||
allow-loopback-pinentry
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
home.file.".gnupg/gpg.conf".text = ''
|
home.file.".gnupg/gpg.conf".text = ''
|
||||||
personal-cipher-preferences AES256 AES192 AES
|
personal-cipher-preferences AES256 AES192 AES
|
||||||
|
|||||||
@@ -33,6 +33,7 @@
|
|||||||
systemctl-tui
|
systemctl-tui
|
||||||
tldr
|
tldr
|
||||||
w3m
|
w3m
|
||||||
|
which
|
||||||
yt-dlp
|
yt-dlp
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,8 +5,8 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
sops = {
|
sops = {
|
||||||
age.keyFile = lib.mkIf (hyper.host == "NxACE") "${hyper.home}.age_nx2_key_13.txt";
|
age.keyFile = lib.mkIf (hyper.host == "NxACE") "${hyper.home}/.age_nx2_key_13.txt";
|
||||||
gnupg.home = lib.mkIf (hyper.host != "NxACE") "${hyper.home}.gnupg";
|
gnupg.home = lib.mkIf (hyper.host != "NxACE") "${hyper.home}/.gnupg";
|
||||||
defaultSopsFile = ../sops-secrets.yaml;
|
defaultSopsFile = ../sops-secrets.yaml;
|
||||||
|
|
||||||
# %r is $XDG_RUNTIME_DIR
|
# %r is $XDG_RUNTIME_DIR
|
||||||
|
|||||||
@@ -1,21 +1,21 @@
|
|||||||
{ pkgs, ... }@all: with all;
|
{ pkgs, ... }@all: with all;
|
||||||
{
|
{
|
||||||
home = {
|
home = {
|
||||||
packages = with pkgs; [ sshfs ];
|
packages = with pkgs; [ openssh sshfs ];
|
||||||
file.".ssh/config".text = ''
|
file.".ssh/config".text = ''
|
||||||
HOST nxace
|
HOST nxace
|
||||||
HostName ssh.${hyper.domain}
|
HostName ssh.${hyper.domain}
|
||||||
User ${hyper.user}
|
User nx2
|
||||||
Port 50022
|
Port 50022
|
||||||
|
|
||||||
HOST nxacel
|
HOST nxacel
|
||||||
HostName 10.0.1.1
|
HostName 10.0.1.1
|
||||||
User ${hyper.user}
|
User nx2
|
||||||
Port 50022
|
Port 50022
|
||||||
|
|
||||||
HOST nxrpil
|
HOST nxrpil
|
||||||
HostName 10.0.1.31
|
HostName 10.0.1.31
|
||||||
User ${hyper.user}
|
User nx2
|
||||||
Port 22
|
Port 22
|
||||||
|
|
||||||
HOST nxgit
|
HOST nxgit
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
{ pkgs, ... }@all: with all; {
|
{ pkgs, ... }@all: with all; {
|
||||||
xdg = {
|
xdg = {
|
||||||
enable = true;
|
enable = true;
|
||||||
configHome = "${hyper.home}.config";
|
configHome = "${hyper.home}/.config";
|
||||||
cacheHome = "${hyper.home}.cache";
|
cacheHome = "${hyper.home}/.cache";
|
||||||
dataHome = "${hyper.home}.local/share";
|
dataHome = "${hyper.home}/.local/share";
|
||||||
stateHome = "${hyper.home}.local/state";
|
stateHome = "${hyper.home}/.local/state";
|
||||||
mimeApps = {
|
mimeApps = {
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultApplications = let
|
defaultApplications = let
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
{ pkgs, ... }@all: with all; let
|
{ pkgs, ... }@all: with all; let
|
||||||
tfc = pkgs.latest.xdg-desktop-portal-termfilechooser;
|
tfc = pkgs.latest.xdg-desktop-portal-termfilechooser;
|
||||||
|
x = (pkgs.version != "24.05");
|
||||||
in {
|
in {
|
||||||
home.packages = [
|
home.packages = [
|
||||||
pkgs.unar
|
pkgs.unar
|
||||||
@@ -11,29 +12,7 @@ in {
|
|||||||
# package = pkgs.yazi;
|
# package = pkgs.yazi;
|
||||||
package = inputs.yazi.packages.${hyper.system}.default;
|
package = inputs.yazi.packages.${hyper.system}.default;
|
||||||
enableFishIntegration = true;
|
enableFishIntegration = true;
|
||||||
shellWrapperName = "ya";
|
# initLua = /* lua */ '' ''; # down
|
||||||
initLua = /* lua */ ''
|
|
||||||
require("zoxide"):setup {
|
|
||||||
update_db = true,
|
|
||||||
}
|
|
||||||
Status:children_add(function()
|
|
||||||
local h = cx.active.current.hovered
|
|
||||||
if not h or ya.target_family() ~= "unix" then
|
|
||||||
return ""
|
|
||||||
end
|
|
||||||
|
|
||||||
return ui.Line {
|
|
||||||
ui.Span(ya.user_name(h.cha.uid) or tostring(h.cha.uid)):fg("magenta"),
|
|
||||||
":",
|
|
||||||
ui.Span(ya.group_name(h.cha.gid) or tostring(h.cha.gid)):fg("magenta"),
|
|
||||||
" ",
|
|
||||||
}
|
|
||||||
end, 500, Status.RIGHT)
|
|
||||||
'';
|
|
||||||
plugins = with pkgs; {
|
|
||||||
inherit glow git;
|
|
||||||
};
|
|
||||||
# initLua = /* lua */ '' '';
|
|
||||||
keymap = {
|
keymap = {
|
||||||
mgr.keymap = [
|
mgr.keymap = [
|
||||||
{ on = "<Esc>"; run = "escape"; desc = "Exit visual mode, clear selected, or cancel search"; }
|
{ on = "<Esc>"; run = "escape"; desc = "Exit visual mode, clear selected, or cancel search"; }
|
||||||
@@ -403,7 +382,31 @@ in {
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
} // (if x then {
|
||||||
|
shellWrapperName = "ya";
|
||||||
|
initLua = /* lua */ ''
|
||||||
|
require("zoxide"):setup {
|
||||||
|
update_db = true,
|
||||||
|
}
|
||||||
|
Status:children_add(function()
|
||||||
|
local h = cx.active.current.hovered
|
||||||
|
if not h or ya.target_family() ~= "unix" then
|
||||||
|
return ""
|
||||||
|
end
|
||||||
|
|
||||||
|
return ui.Line {
|
||||||
|
ui.Span(ya.user_name(h.cha.uid) or tostring(h.cha.uid)):fg("magenta"),
|
||||||
|
":",
|
||||||
|
ui.Span(ya.group_name(h.cha.gid) or tostring(h.cha.gid)):fg("magenta"),
|
||||||
|
" ",
|
||||||
|
}
|
||||||
|
end, 500, Status.RIGHT)
|
||||||
|
'';
|
||||||
|
plugins = with pkgs; {
|
||||||
|
inherit glow git;
|
||||||
|
};
|
||||||
|
} else {});
|
||||||
|
|
||||||
xdg = {
|
xdg = {
|
||||||
configFile."xdg-desktop-portal-termfilechooser/config" = {
|
configFile."xdg-desktop-portal-termfilechooser/config" = {
|
||||||
force = true;
|
force = true;
|
||||||
|
|||||||
@@ -1,24 +1,25 @@
|
|||||||
{ pkgs, ... }@all: with all;
|
{ pkgs, ... }@all:
|
||||||
{
|
{
|
||||||
# Simply install just the packages
|
|
||||||
environment.packages = with pkgs; [
|
|
||||||
helix
|
|
||||||
git
|
|
||||||
lazygit
|
|
||||||
yazi
|
|
||||||
];
|
|
||||||
|
|
||||||
# Backup etc files instead of failing to activate generation if a file already exists in /etc
|
environment = {
|
||||||
environment.etcBackupExtension = ".bak";
|
packages = import ./system-modules/base-packages.nix pkgs;
|
||||||
|
etcBackupExtension = ".bak";
|
||||||
# Read the changelog before changing this value
|
};
|
||||||
|
android-integration = {
|
||||||
|
termux-setup-storage.enable = true;
|
||||||
|
};
|
||||||
system.stateVersion = pkgs.version;
|
system.stateVersion = pkgs.version;
|
||||||
|
|
||||||
# Set up nix for flakes
|
|
||||||
nix.extraOptions = ''
|
nix.extraOptions = ''
|
||||||
experimental-features = nix-command flakes
|
experimental-features = nix-command flakes
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Set your time zone
|
# Set your time zone
|
||||||
time.timeZone = "Europe/Berlin";
|
time.timeZone = "Europe/Berlin";
|
||||||
|
|
||||||
|
home-manager = {
|
||||||
|
config = ./shell-only.nix;
|
||||||
|
useGlobalPkgs = true;
|
||||||
|
backupFileExtension = "backup";
|
||||||
|
extraSpecialArgs = { inherit (all) inputs hyper rice; };
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
./home-modules/nixd.nix
|
./home-modules/nixd.nix
|
||||||
./home-modules/nxgs.nix
|
./home-modules/nxgs.nix
|
||||||
./home-modules/pandoc.nix
|
./home-modules/pandoc.nix
|
||||||
./home-modules/programming/c.nix
|
# ./home-modules/programming/c.nix
|
||||||
./home-modules/programming/gleam.nix
|
./home-modules/programming/gleam.nix
|
||||||
./home-modules/programming/go.nix
|
./home-modules/programming/go.nix
|
||||||
./home-modules/programming/java.nix
|
./home-modules/programming/java.nix
|
||||||
@@ -29,8 +29,8 @@
|
|||||||
./home-modules/pkgs-list/shell.nix
|
./home-modules/pkgs-list/shell.nix
|
||||||
];
|
];
|
||||||
home.username = hyper.user;
|
home.username = hyper.user;
|
||||||
# home.homeDirectory = hyper.home; # for some reason you cant use hyper.home here
|
home.homeDirectory = hyper.home;
|
||||||
home.homeDirectory = "/home/${hyper.user}";
|
# home.homeDirectory = "/home/${hyper.user}";
|
||||||
home.stateVersion = pkgs.version;
|
home.stateVersion = pkgs.version;
|
||||||
xdg = {
|
xdg = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
@@ -1,19 +1,18 @@
|
|||||||
{ pkgs, ... }: {
|
pkgs: with pkgs; [
|
||||||
environment.systemPackages = with pkgs; ([
|
busybox
|
||||||
git
|
# coreutils-full
|
||||||
git-crypt
|
gitFull
|
||||||
lazygit # home-manager module is bugged
|
git-crypt
|
||||||
wget
|
|
||||||
curlHTTP3
|
|
||||||
zip
|
|
||||||
unzip
|
|
||||||
p7zip
|
|
||||||
unar
|
|
||||||
vim
|
|
||||||
htop
|
|
||||||
openssl
|
|
||||||
dmidecode
|
|
||||||
file
|
|
||||||
]);
|
|
||||||
|
|
||||||
}
|
wget
|
||||||
|
curlHTTP3
|
||||||
|
zip
|
||||||
|
unzip
|
||||||
|
p7zip
|
||||||
|
unar
|
||||||
|
vim
|
||||||
|
htop
|
||||||
|
openssl
|
||||||
|
dmidecode
|
||||||
|
file
|
||||||
|
]
|
||||||
|
|||||||
Reference in New Issue
Block a user