almost flakes and start of arion setup, also actually remove files for my laptop install

This commit is contained in:
Sky Hearn 2024-03-03 21:59:41 -08:00
parent 5001614445
commit a6ccd25396
8 changed files with 67 additions and 43 deletions

9
.gitmodules vendored
View File

@ -1,9 +0,0 @@
[submodule "slstatus"]
path = slstatus
url = git://git.suckless.org/slstatus
[submodule "dwm"]
path = dwm
url = git://git.suckless.org/dwm
[submodule "st"]
path = st
url = https://git.suckless.org/st

View File

@ -19,7 +19,8 @@
# use network manager and set hostname # use network manager and set hostname
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
networking.hostName = "rackserver"; networking.hostName = "rackserver";
# wireguard server setup # wireguard server setup
@ -82,6 +83,20 @@
}; };
}; };
# arion setup
virtualisation.podman.enable = true;
virtualisation.podman.dockerSocket.enable = true;
virtualisation.podman.defaultNetwork.dnsname.enable = true;
{ pkgs, ... }: {
environment.systemPackages = [
pkgs.arion
# Do install the docker CLI to talk to podman.
# Not needed when virtualisation.docker.enable = true;
pkgs.docker-client
];
# List services that you want to enable: # List services that you want to enable:
# Enable the OpenSSH daemon. # Enable the OpenSSH daemon.

1
dwm

@ -1 +0,0 @@
Subproject commit 5d30ee7db5800ccbc7d99ef718d133cb9fddc420

29
flake.nix Normal file
View File

@ -0,0 +1,29 @@
{
description = "NixOS configuration";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = inputs@{ nixpkgs, home-manager, ... }: {
nixosConfigurations = {
hostname = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./configuration.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.jdoe = import ./home.nix;
# Optionally, use home-manager.extraSpecialArgs to pass
# arguments to home.nix
}
];
};
};
};
}

View File

@ -1,28 +0,0 @@
{ lib
, stdenv
, fetchzip
, readline
}:
stdenv.mkDerivation rec {
name = "rolldice";
version = "1.16-1";
src = fetchzip {
url = "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/rolldice/1.16-1build1/rolldice_1.16.orig.tar.gz";
sha256 = "sha256-gyBwPzO0UO6LvGvaWk5bn1uFUPtedC3Y1/uN3FdyJSQ=";
};
buildInputs = [
readline
];
buildPhase = ''
make
'';
installPhase = ''
mkdir -p $out/bin
mv rolldice $out/bin
'';
}

@ -1 +0,0 @@
Subproject commit f227db9662f3c4f96fdfd0d025e3ed4060ded0a2

1
st

@ -1 +0,0 @@
Subproject commit 7544d3c13dfae83ed19697265daa2ef46882f089

View File

@ -9,6 +9,7 @@
users.users.sky.isNormalUser = true; users.users.sky.isNormalUser = true;
users.users.ku.isNormalUser = true; users.users.ku.isNormalUser = true;
users.users.nub.isNormalUser = true; users.users.nub.isNormalUser = true;
users.users.docker.isNormalUser = true;
users.groups.wheel.members=["sky"]; users.groups.wheel.members=["sky"];
@ -39,12 +40,31 @@
home.stateVersion = "23.11"; home.stateVersion = "23.11";
}; };
home-manager.users.wg = { pkgs, ... }: { home-manager.users.jas = { pkgs, ... }: {
home.packages = [ ]; home.packages = [ nano ];
programs.bash.enable = true; programs.bash.enable = true;
# The state version is required and should stay at the version you # The state version is required and should stay at the version you
# originally installed. # originally installed.
home.stateVersion = "23.11"; home.stateVersion = "23.11";
}; };
users.extraUsers.podman.extraGroups = [ "podman" ];
home-manager.users.podman = { pkgs, ... }: {
home.packages = [ ];
programs.bash.enable = true;
home.file = {
"arion-pkgs.nix" = {
source = ; # TODO: figure out how to make this work with flakes
};
"arion-compose.nix" = {
source = ; # TODO: figure out how to make this work with flakes
};
};
# The state version is required and should stay at the version you
# originally installed.
home.stateVersion = "23.11";
};
} }