Compare commits
10 commits
14dfeec55f
...
7724f8cc5f
Author | SHA1 | Date | |
---|---|---|---|
![]() |
7724f8cc5f | ||
![]() |
59f507bc06 | ||
![]() |
2da8170c98 | ||
![]() |
698983167b | ||
![]() |
39d8a66fcf | ||
![]() |
a1028c3b30 | ||
![]() |
ef30776f5b | ||
![]() |
e347018186 | ||
![]() |
8c8b65bc9f | ||
![]() |
84026223d0 |
20 changed files with 77 additions and 96 deletions
24
flake.lock
generated
24
flake.lock
generated
|
@ -7,11 +7,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1745557122,
|
"lastModified": 1746171682,
|
||||||
"narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=",
|
"narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1",
|
"rev": "50eee705bbdbac942074a8c120e8194185633675",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -74,11 +74,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1745955289,
|
"lastModified": 1746621361,
|
||||||
"narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=",
|
"narHash": "sha256-T9vOxEqI1j1RYugV0b9dgy0AreiZ9yBDKZJYyclF0og=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b",
|
"rev": "2ea3ad8a1f26a76f8a8e23fc4f7757c46ef30ee5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -90,11 +90,11 @@
|
||||||
},
|
},
|
||||||
"nixos-unstable": {
|
"nixos-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1745930157,
|
"lastModified": 1746461020,
|
||||||
"narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
|
"narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
|
"rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -106,11 +106,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1745921652,
|
"lastModified": 1746557022,
|
||||||
"narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=",
|
"narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3",
|
"rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -1,17 +1,16 @@
|
||||||
inArgs: hostname: hostOptions:
|
inArgs: hostname: hostOptions: let
|
||||||
let
|
|
||||||
nixosSystem =
|
nixosSystem =
|
||||||
if (hostOptions ? unstable && hostOptions.unstable)
|
if (hostOptions ? unstable && hostOptions.unstable)
|
||||||
then inArgs.nixos-unstable.lib.nixosSystem
|
then inArgs.nixos-unstable.lib.nixosSystem
|
||||||
else inArgs.nixpkgs.lib.nixosSystem;
|
else inArgs.nixpkgs.lib.nixosSystem;
|
||||||
in
|
in
|
||||||
nixosSystem {
|
nixosSystem {
|
||||||
specialArgs = {inherit inArgs;};
|
specialArgs = {inherit inArgs;};
|
||||||
modules = [
|
modules = [
|
||||||
{networking.hostName = hostname;}
|
./hosts/${hostname}
|
||||||
(./hosts/${hostname})
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
networking.hostName = hostname;
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
nixos-unstable,
|
nixos-unstable,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
|
|
||||||
#nixpkgs.overlays = [ overlays.unstable-packages ];
|
#nixpkgs.overlays = [ overlays.unstable-packages ];
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
# You can add overlays here
|
# You can add overlays here
|
||||||
|
@ -25,11 +24,8 @@
|
||||||
# });
|
# });
|
||||||
# })
|
# })
|
||||||
];
|
];
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
# steam and other stuff seems to depend on perl
|
# steam and other stuff seems to depend on perl
|
||||||
#"${modulesPath}/profiles/perlless.nix"
|
#"${modulesPath}/profiles/perlless.nix"
|
||||||
|
|
|
@ -4,13 +4,10 @@
|
||||||
modulesPath,
|
modulesPath,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
|
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
|
||||||
../../system_profiles/defaults.nix
|
../../system_profiles/defaults.nix
|
||||||
../../system_profiles/mini-container.nix
|
../../system_profiles/mini-container.nix
|
||||||
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
{
|
{lib, ...}: {
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
{
|
{lib, ...}: {
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
{
|
{
|
||||||
networking.firewall = {
|
networking.firewall = {
|
||||||
enable = false;
|
enable = false;
|
||||||
|
|
||||||
# Open ports in the firewall.
|
# Open ports in the firewall.
|
||||||
allowedTCPPorts = [8080 10001 10002];
|
allowedTCPPorts = [8080 10001 10002];
|
||||||
allowedUDPPorts = [8080 10001 10002];
|
allowedUDPPorts = [8080 10001 10002];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
{pkgs, ...}: {
|
{pkgs, ...}: {
|
||||||
# Enable common container config files in /etc/containers
|
# Enable common container config files in /etc/containers
|
||||||
virtualisation.containers.enable = true;
|
|
||||||
virtualisation = {
|
virtualisation = {
|
||||||
|
containers.enable = true;
|
||||||
|
|
||||||
podman = {
|
podman = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
|
@ -15,8 +16,6 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.sessionVariables = {
|
|
||||||
};
|
|
||||||
# Useful other development tools
|
# Useful other development tools
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
dive # look into docker image layers
|
dive # look into docker image layers
|
||||||
|
|
|
@ -10,4 +10,5 @@
|
||||||
formatted = builtins.concatStringsSep "\n" sortedUnique;
|
formatted = builtins.concatStringsSep "\n" sortedUnique;
|
||||||
in
|
in
|
||||||
formatted;
|
formatted;
|
||||||
|
# TODO: in the far future: add a little alias that greps throgh that file
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
{pkgs, ...}: let
|
{pkgs, ...}: let
|
||||||
default_command = "Hyprland";
|
default_command = "Hyprland";
|
||||||
in {
|
in {
|
||||||
# Enable touchpad support (enabled default in most desktopManager).
|
|
||||||
# services.xserver.libinput.enable = true;
|
|
||||||
services.greetd = {
|
services.greetd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
vt = 7;
|
vt = 7;
|
||||||
|
|
|
@ -6,17 +6,10 @@
|
||||||
askPassword = "${pkgs.lxqt.lxqt-openssh-askpass}/bin/lxqt-openssh-askpass";
|
askPassword = "${pkgs.lxqt.lxqt-openssh-askpass}/bin/lxqt-openssh-askpass";
|
||||||
};
|
};
|
||||||
|
|
||||||
# This is using a rec (recursive) expression to set and access XDG_BIN_HOME within the expression
|
|
||||||
# For more on rec expressions see https://nix.dev/tutorials/first-steps/nix-language#recursive-attribute-set-rec
|
|
||||||
environment.sessionVariables = {
|
environment.sessionVariables = {
|
||||||
SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/ssh-agent";
|
SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/ssh-agent";
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
#ssh-askpass-fullscreen
|
|
||||||
lxqt.lxqt-openssh-askpass
|
|
||||||
];
|
|
||||||
|
|
||||||
# Some programs need SUID wrappers, can be configured further or are
|
# Some programs need SUID wrappers, can be configured further or are
|
||||||
# started in user sessions.
|
# started in user sessions.
|
||||||
# programs.mtr.enable = true;
|
# programs.mtr.enable = true;
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
{pkgs, ...}: {
|
{pkgs, ...}: {
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = [pkgs.brave];
|
||||||
brave
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,60 +2,68 @@
|
||||||
services.flatpak = {
|
services.flatpak = {
|
||||||
packages = [
|
packages = [
|
||||||
{
|
{
|
||||||
|
# flatpak permisssion gui
|
||||||
origin = "flathub";
|
origin = "flathub";
|
||||||
appId = "com.github.tchx84.Flatseal";
|
appId = "com.github.tchx84.Flatseal";
|
||||||
} # flatpak permisssion gui
|
}
|
||||||
{
|
|
||||||
origin = "flathub";
|
|
||||||
appId = "com.mojang.Minecraft";
|
|
||||||
} # Lego for adults
|
|
||||||
{
|
|
||||||
origin = "flathub";
|
|
||||||
appId = "de.schmidhuberj.DieBahn";
|
|
||||||
} # Public transport connection viewer
|
|
||||||
{
|
|
||||||
origin = "flathub";
|
|
||||||
appId = "com.github.hugolabe.Wike";
|
|
||||||
} # Wikpedia, but in nice
|
|
||||||
{
|
{
|
||||||
|
# Local chat AI
|
||||||
origin = "flathub";
|
origin = "flathub";
|
||||||
appId = "io.gpt4all.gpt4all";
|
appId = "io.gpt4all.gpt4all";
|
||||||
} # Local chat AI
|
}
|
||||||
{
|
{
|
||||||
|
# note taking and brain organising
|
||||||
origin = "flathub";
|
origin = "flathub";
|
||||||
appId = "md.obsidian.Obsidian";
|
appId = "md.obsidian.Obsidian";
|
||||||
} # note taking and brain organising
|
}
|
||||||
{
|
{
|
||||||
|
# remote dekstop
|
||||||
origin = "flathub";
|
origin = "flathub";
|
||||||
appId = "com.parsecgaming.parsec";
|
appId = "com.parsecgaming.parsec";
|
||||||
} # remote dekstop
|
}
|
||||||
|
{
|
||||||
|
# electron media player (youtube and co)
|
||||||
|
origin = "flathub";
|
||||||
|
appId = "org.js.nuclear.Nuclear";
|
||||||
|
}
|
||||||
|
|
||||||
# messenger
|
# messenger
|
||||||
{
|
{
|
||||||
|
# good e2ee, but centralized
|
||||||
origin = "flathub";
|
origin = "flathub";
|
||||||
appId = "org.signal.Signal";
|
appId = "org.signal.Signal";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
# bad/no e2ee, but centralized :3
|
||||||
origin = "flathub";
|
origin = "flathub";
|
||||||
appId = "org.telegram.desktop";
|
appId = "org.telegram.desktop";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
# discord, no privacy
|
||||||
origin = "flathub";
|
origin = "flathub";
|
||||||
appId = "dev.vencord.Vesktop";
|
appId = "dev.vencord.Vesktop";
|
||||||
} # More usable discord for linux
|
}
|
||||||
{
|
{
|
||||||
|
# soundboard for chat apps
|
||||||
origin = "flathub";
|
origin = "flathub";
|
||||||
appId = "io.github.Soundux";
|
appId = "io.github.Soundux";
|
||||||
} # soundboard
|
}
|
||||||
|
|
||||||
# games
|
# games
|
||||||
{
|
{
|
||||||
|
# shooter
|
||||||
origin = "flathub";
|
origin = "flathub";
|
||||||
appId = "com.etlegacy.ETLegacy";
|
appId = "com.etlegacy.ETLegacy";
|
||||||
} # shooter
|
}
|
||||||
{
|
{
|
||||||
|
# Lego for adults
|
||||||
origin = "flathub";
|
origin = "flathub";
|
||||||
appId = "org.js.nuclear.Nuclear";
|
appId = "com.mojang.Minecraft";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
# Lego for real adults
|
||||||
|
origin = "flathub";
|
||||||
|
appId = "net.minetest.Minetest";
|
||||||
}
|
}
|
||||||
|
|
||||||
#"com.obsproject.Studio" #this is another way to write it
|
#"com.obsproject.Studio" #this is another way to write it
|
||||||
|
|
|
@ -13,7 +13,11 @@
|
||||||
fira-code-symbols
|
fira-code-symbols
|
||||||
#droid-sans-mono
|
#droid-sans-mono
|
||||||
(nerdfonts.override {
|
(nerdfonts.override {
|
||||||
fonts = ["FiraCode" "DroidSansMono" "JetBrainsMono"];
|
fonts = [
|
||||||
|
"FiraCode"
|
||||||
|
"DroidSansMono"
|
||||||
|
"JetBrainsMono"
|
||||||
|
];
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,7 +15,11 @@
|
||||||
lm_sensors
|
lm_sensors
|
||||||
|
|
||||||
unstable.neovim
|
unstable.neovim
|
||||||
|
|
||||||
git
|
git
|
||||||
|
gitui
|
||||||
|
lazygit
|
||||||
|
|
||||||
gnumake
|
gnumake
|
||||||
gcc
|
gcc
|
||||||
nodePackages.npm
|
nodePackages.npm
|
||||||
|
|
|
@ -3,9 +3,6 @@
|
||||||
fish = {
|
fish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
useBabelfish = true;
|
useBabelfish = true;
|
||||||
shellInit = ''
|
|
||||||
starship init fish | source
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
nix-index.enableFishIntegration = true;
|
nix-index.enableFishIntegration = true;
|
||||||
direnv.enableFishIntegration = true;
|
direnv.enableFishIntegration = true;
|
||||||
|
|
|
@ -10,7 +10,6 @@ inArgs: let
|
||||||
# This is a function that generates an attribute by calling a function you
|
# This is a function that generates an attribute by calling a function you
|
||||||
# pass to it, with each system as an argument
|
# pass to it, with each system as an argument
|
||||||
forAllSystems = inArgs.nixpkgs.lib.genAttrs systems;
|
forAllSystems = inArgs.nixpkgs.lib.genAttrs systems;
|
||||||
|
|
||||||
in {
|
in {
|
||||||
# NixOS configuration entrypoint
|
# NixOS configuration entrypoint
|
||||||
# Available through 'nixos-rebuild --flake .#your-hostname'
|
# Available through 'nixos-rebuild --flake .#your-hostname'
|
||||||
|
@ -18,10 +17,12 @@ in {
|
||||||
crocoite = {stateVersion = "24.05";};
|
crocoite = {stateVersion = "24.05";};
|
||||||
|
|
||||||
jitsi = {stateVersion = "24.11";};
|
jitsi = {stateVersion = "24.11";};
|
||||||
game-luanti = {stateVersion = "25.05"; unstable = true;};
|
game-luanti = {
|
||||||
|
stateVersion = "25.05";
|
||||||
|
unstable = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
# Your custom packages
|
# Your custom packages
|
||||||
# Accessible through 'nix build', 'nix shell', etc
|
# Accessible through 'nix build', 'nix shell', etc
|
||||||
#packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
|
#packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
|
||||||
|
|
|
@ -9,9 +9,9 @@
|
||||||
nixpkgs.config.allowUnfree = lib.mkDefault true;
|
nixpkgs.config.allowUnfree = lib.mkDefault true;
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
# https://lix.systems/ Lix is a modern, delicious implementation of the Nix package manager,
|
# https://lix.systems/ Lix is a modern, delicious implementation of the Nix package manager,
|
||||||
# focused on correctness, usability, and growth –
|
# focused on correctness, usability, and growth –
|
||||||
# and committed to doing right by its community.
|
# and committed to doing right by its community.
|
||||||
package = lib.mkDefault pkgs.lix;
|
package = lib.mkDefault pkgs.lix;
|
||||||
|
|
||||||
channel.enable = lib.mkDefault false;
|
channel.enable = lib.mkDefault false;
|
||||||
|
|
|
@ -1,13 +1,6 @@
|
||||||
{
|
{lib, ...}: {
|
||||||
lib,
|
boot.isContainer = lib.mkDefault true;
|
||||||
...
|
boot.kernel.enable = lib.mkDefault false;
|
||||||
}: {
|
|
||||||
imports = [
|
|
||||||
./mini.nix
|
|
||||||
|
|
||||||
{
|
imports = [./mini.nix];
|
||||||
boot.isContainer = lib.mkDefault true;
|
|
||||||
boot.kernel.enable = lib.mkDefault false;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue