colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[NixOS] Remove graphical flake dependencies from bootstrap flake

Browse Source
This commit is contained in:
Ivan Malison 2023-06-29 01:11:43 -06:00
parent 4d182e2e74
commit f9182e1fb2
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
4 changed files with 5 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
nixos/bootstrap/flake.nix
View File

@ -9,54 +9,6 @@
inputs.nixpkgs.follows = "nixpkgs";
};
xmonad-contrib = {
url = github:IvanMalison/xmonad-contrib/withMyChanges;
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
git-ignore-nix.follows = "git-ignore-nix";
xmonad.follows = "xmonad";
};
};
xmonad = {
url = github:IvanMalison/xmonad/master;
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
git-ignore-nix.follows = "git-ignore-nix";
};
};
taffybar = {
url = github:taffybar/taffybar/master;
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
git-ignore-nix.follows = "git-ignore-nix";
xmonad.follows = "xmonad";
gtk-sni-tray.follows = "gtk-sni-tray";
gtk-strut.follows = "gtk-strut";
};
};
imalison-taffybar = {
url = path:../../dotfiles/config/taffybar;
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
xmonad.follows = "xmonad";
taffybar.follows = "taffybar";
};
};
notifications-tray-icon = {
url = github:IvanMalison/notifications-tray-icon;
inputs.flake-utils.follows = "flake-utils";
inputs.git-ignore-nix.follows = "git-ignore-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
nix = {
url = github:IvanMalison/nix;
inputs.nixpkgs.follows = "nixpkgs";
@ -73,41 +25,10 @@
url = github:hercules-ci/gitignore.nix;
inputs.nixpkgs.follows = "nixpkgs";
};
gtk-sni-tray = {
url = github:taffybar/gtk-sni-tray;
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
git-ignore-nix.follows = "git-ignore-nix";
status-notifier-item.follows = "status-notifier-item";
};
};
status-notifier-item = {
url = github:taffybar/status-notifier-item;
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
git-ignore-nix.follows = "git-ignore-nix";
};
};
gtk-strut = {
url = github:taffybar/gtk-strut;
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
git-ignore-nix.follows = "git-ignore-nix";
};
};
nixpkgs-regression = { url = github:NixOS/nixpkgs; };
};
outputs = inputs@{
self, nixpkgs, nixos-hardware, home-manager, taffybar, xmonad,
xmonad-contrib, notifications-tray-icon, nix, imalison-taffybar, ...
self, nixpkgs, nixos-hardware, home-manager, nix, ...
}:
let
mkConfig =

5
nixos/flake.nix
View File

@ -128,12 +128,13 @@
};
} // specialArgs;
});
machineFilenames = builtins.attrNames (builtins.readDir ./machines);
machinesFilepath = ./machines;
machineFilenames = builtins.attrNames (builtins.readDir machinesFilepath);
machineNameFromFilename = filename: builtins.head (builtins.split "\\." filename);
mkConfigurationParams = filename: {
name = machineNameFromFilename filename;
value = {
modules = [ (./machines + ("/" + filename)) ./base.nix ];
modules = [ (machinesFilepath + ("/" + filename)) ./base.nix ];
};
};
defaultConfigurationParams =

1
nixos/machines/biskcomp.nix
View File

@ -2,7 +2,6 @@
imports = [
../internet-computer.nix
../raspberry-pi.nix
../base.nix
];
services.xrdp.enable = true;

2
nixos/raspberry-pi.nix
View File

@ -10,7 +10,7 @@
hardware.enableRedistributableFirmware = true;
networking.useDHCP = false;
networking.useDHCP = true;
networking.interfaces.eth0.useDHCP = true;
networking.interfaces.wlan0.useDHCP = true;