lol
This commit is contained in:
parent
a8cd34cbb4
commit
8ec4baae6d
30
flake.lock
30
flake.lock
|
@ -6,11 +6,11 @@
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725841979,
|
"lastModified": 1727303518,
|
||||||
"narHash": "sha256-SXYqzpHPuXFR6w/cUKo3VN8XRn6XA2mGbdRXs9oLk6k=",
|
"narHash": "sha256-lO5JMynTxNZxg/+E4/Y9reeLGIz/M8cEue+Re4cP6qo=",
|
||||||
"owner": "Aylur",
|
"owner": "Aylur",
|
||||||
"repo": "ags",
|
"repo": "ags",
|
||||||
"rev": "aaef50bb2c80ef4b4a359329d72669a95e7c4796",
|
"rev": "cd543afec4d9ed708990e5ba52184716809bf248",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -94,11 +94,11 @@
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "pkgs/firefox-addons",
|
"dir": "pkgs/firefox-addons",
|
||||||
"lastModified": 1727247223,
|
"lastModified": 1727347763,
|
||||||
"narHash": "sha256-Q0K2S5lZpZTLjw7NWXE0b15pxIVh/jBtZeKnXbZoBds=",
|
"narHash": "sha256-UPqm89SvmXiDR9dEQlhtGY0QYerxdAJNWidiWsXTq6s=",
|
||||||
"owner": "rycee",
|
"owner": "rycee",
|
||||||
"repo": "nur-expressions",
|
"repo": "nur-expressions",
|
||||||
"rev": "139fed712a9e285e3500a047a35753502cf678da",
|
"rev": "b943fa9c8f55528ec579ae112aac95d4c061e160",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -200,11 +200,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727246346,
|
"lastModified": 1727346017,
|
||||||
"narHash": "sha256-TcUaKtya339Asu+g6KTJ8h7KiKcKXKp2V+At+7tksyY=",
|
"narHash": "sha256-z7OCFXXxIseJhEHiCkkUOkYxD9jtLU8Kf5Q9WC0SjJ8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "1e22ef1518fb175d762006f9cae7f6312b8caedb",
|
"rev": "c124568e1054a62c20fbe036155cc99237633327",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -357,11 +357,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726937504,
|
"lastModified": 1727122398,
|
||||||
"narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
|
"narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9357f4f23713673f310988025d9dc261c20e70c6",
|
"rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -468,11 +468,11 @@
|
||||||
"tinted-tmux": "tinted-tmux"
|
"tinted-tmux": "tinted-tmux"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727218376,
|
"lastModified": 1727362643,
|
||||||
"narHash": "sha256-vRYd45uOqzXDaSt8M50hLcsBqIWbEMsflfHk/a1nYA8=",
|
"narHash": "sha256-Ceiq/aYjRlRBU677lBaemn8ZU2Jpr08Iso6UlBc9nFc=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "cf8b6e2d4e8aca8ef14b839a906ab5eb98b08561",
|
"rev": "e3eb7fdf8d129ff3676dfbc84ee1262322ca6fb4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
22
flake.nix
22
flake.nix
|
@ -21,24 +21,32 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, nix-on-droid, ags, stylix, home-manager, ... } @ inputs: let
|
outputs = {
|
||||||
systemConfig = { modules }:
|
self,
|
||||||
|
nixpkgs,
|
||||||
|
nix-on-droid,
|
||||||
|
ags,
|
||||||
|
stylix,
|
||||||
|
home-manager,
|
||||||
|
...
|
||||||
|
} @ inputs: let
|
||||||
|
systemConfig = {modules}:
|
||||||
nixpkgs.lib.nixosSystem {
|
nixpkgs.lib.nixosSystem {
|
||||||
specialArgs = { inherit inputs; };
|
specialArgs = {inherit inputs;};
|
||||||
modules = modules ++ [stylix.nixosModules.stylix home-manager.nixosModules.default];
|
modules = modules ++ [stylix.nixosModules.stylix home-manager.nixosModules.default];
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration {
|
nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration {
|
||||||
pkgs = import nixpkgs { system = "aarch64-linux"; };
|
pkgs = import nixpkgs {system = "aarch64-linux";};
|
||||||
modules = [ ./hosts/phone];
|
modules = [./hosts/phone];
|
||||||
};
|
};
|
||||||
|
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
desktop = systemConfig {
|
desktop = systemConfig {
|
||||||
modules = [ ./hosts/desktop ];
|
modules = [./hosts/desktop];
|
||||||
};
|
};
|
||||||
laptop = systemConfig {
|
laptop = systemConfig {
|
||||||
modules = [ ./hosts/laptop ];
|
modules = [./hosts/laptop];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
# Simply install just the packages
|
# Simply install just the packages
|
||||||
environment.packages = with pkgs; [
|
environment.packages = with pkgs; [
|
||||||
# User-facing stuff that you really really want to have
|
# User-facing stuff that you really really want to have
|
||||||
|
@ -52,7 +55,6 @@
|
||||||
# Set your time zone
|
# Set your time zone
|
||||||
time.timeZone = "Europe/Berlin";
|
time.timeZone = "Europe/Berlin";
|
||||||
|
|
||||||
|
|
||||||
home-manager.config = {
|
home-manager.config = {
|
||||||
home.stateVersion = "24.05";
|
home.stateVersion = "24.05";
|
||||||
|
|
||||||
|
@ -72,4 +74,3 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,7 @@
|
||||||
{ inputs, ... }:
|
{inputs, ...}: {
|
||||||
|
|
||||||
{
|
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
./zsh
|
./zsh
|
||||||
./git
|
./git
|
||||||
./helix
|
./helix
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ ...}: {
|
{...}: {
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
userEmail = "mail@joygnu.org";
|
userEmail = "mail@joygnu.org";
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
{ ... }:
|
{...}: {
|
||||||
{
|
|
||||||
programs.helix = {
|
programs.helix = {
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultEditor = true;
|
defaultEditor = true;
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
{ pkgs, ... } :
|
{pkgs, ...}: {
|
||||||
|
|
||||||
{
|
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableCompletion = true;
|
enableCompletion = true;
|
||||||
|
@ -22,9 +20,8 @@
|
||||||
oh-my-zsh = {
|
oh-my-zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
plugins = [
|
plugins = [
|
||||||
# "history-substring-search"
|
# "history-substring-search"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,11 +8,12 @@
|
||||||
// {
|
// {
|
||||||
noriskclient = pkgs.appimageTools.wrapType1 {
|
noriskclient = pkgs.appimageTools.wrapType1 {
|
||||||
name = "noriskclient";
|
name = "noriskclient";
|
||||||
version = "0.5.6";
|
version = "0.5.10";
|
||||||
|
|
||||||
src = pkgs.fetchurl {
|
src = pkgs.fetchurl {
|
||||||
url = "https://github.com/NoRiskClient/noriskclient-launcher/releases/download/v0.5.6/NoRiskClient-Linux.AppImage";
|
url = "https://github.com/NoRiskClient/noriskclient-launcher/releases/download/v0.5.10/NoRiskClient-Linux.AppImage";
|
||||||
hash = "sha256-viZUbm7cwueFB2Hp+uJ/QICXzO+oDTU6ODaOXwyCIb4=";
|
hash = "sha256-y5kXP3kEW0UsV04JBeJCvSOuJf3/zo5s7ZigOpxbwkk=";
|
||||||
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue