Skip to content

Commit

Permalink
🔥 Removed old configs
Browse files Browse the repository at this point in the history
  • Loading branch information
Snuggle committed Aug 31, 2024
1 parent f685791 commit b27bc69
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 630 deletions.
434 changes: 0 additions & 434 deletions configuration.nix

This file was deleted.

7 changes: 3 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,17 @@
# Available through 'nixos-rebuild --flake .#your-hostname'
nixosConfigurations = {
# FIXME replace with your hostname
your-hostname = nixpkgs.lib.nixosSystem {
cherry = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs;};
# > Our main nixos configuration file <
modules = [./nixos/configuration.nix];
modules = [./hosts/cherry/configuration.nix];
};
};

# Standalone home-manager configuration entrypoint
# Available through 'home-manager --flake .#your-username@your-hostname'
homeConfigurations = {
# FIXME replace with your username@hostname
"your-username@your-hostname" = home-manager.lib.homeManagerConfiguration {
"snuggle@cherry" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
extraSpecialArgs = {inherit inputs outputs;};
# > Our main home-manager configuration file <
Expand Down
31 changes: 16 additions & 15 deletions hosts/cherry/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

# Import your generated (nixos-generate-config) hardware configuration
./hardware-configuration.nix
./linux/packages.nix
#./packages.nix
];

nixpkgs = {
Expand Down Expand Up @@ -62,7 +62,6 @@
};

virtualisation.libvirtd.enable = true;
nix.settings.auto-optimise-store = true;
virtualisation.docker.enable = true;
# Use the systemd-boot EFI boot loader.
boot = {
Expand Down Expand Up @@ -110,10 +109,10 @@
hardware.pulseaudio.enable = false;

# Inspired by: https://github.com/divnix/digga/blob/4ebf259d11930774b3a13b370b955a8765bfcae6/configuration.nix#L30
nixpkgs.overlays = let
overlays = map (name: import (./packages/overlays + "/${name}"))
(builtins.attrNames (builtins.readDir ./packages/overlays));
in overlays;
#nixpkgs.overlays = let
# overlays = map (name: import (./packages/overlays + "/${name}"))
# (builtins.attrNames (builtins.readDir ./packages/overlays));
# in overlays;


systemd = {
Expand All @@ -140,7 +139,7 @@
# wantedBy = [ "graphical.target" ];
# };

refind-theme = {
/* refind-theme = {
description = "Set rEFInd theme";
path = [ pkgs.git pkgs.stdenv pkgs.toybox pkgs.busybox ];
serviceConfig = {
Expand All @@ -155,10 +154,10 @@
ExecStartPost = "${pkgs.bash}/bin/bash -c '${pkgs.busybox}/bin/busybox cp -v ${config/rEFInd/theme.conf} /boot/EFI/refind/themes/theme.conf && ${pkgs.busybox}/bin/busybox cp -v ${config/rEFInd/refind.conf} /boot/EFI/refind/refind.conf'";
};
wantedBy = [ "default.target" ];
};
};
}; */
};

user.services = {
/* user.services = {
nextcloud-config-update = {
enable = true;
description = "Update Nextcloud Config";
Expand Down Expand Up @@ -190,7 +189,7 @@
wantedBy = [ "default.target" ];
};
};
}; */
};


Expand All @@ -217,9 +216,9 @@
allowedTCPPorts = [ 7777 ];
allowedUDPPorts = [ 50 ];
};
};

nixpkgs.config = {
allowUnfree = true;

permittedInsecurePackages = [
"electron-13.6.9"
Expand Down Expand Up @@ -296,6 +295,7 @@
accountServiceUsers="/var/lib/AccountsService/users/snuggle"
cp ${(builtins.fetchurl {
url = "https://github.com/snuggle.png";
sha256 = "1x4ajji4ip6bw9dkwf7bykkw00avzw7wg21cn0w4kwbcv71h052c";
})} "$accountServiceIcons"
if ! grep -Fxq "Icon=$accountServiceIcons" "$accountServiceUsers"; then
Expand Down Expand Up @@ -333,7 +333,7 @@
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;

fonts = import ./linux/fonts.nix pkgs;
#fonts = import ./fonts.nix pkgs;


environment.sessionVariables.TERMINAL = [ "kitty" ];
Expand All @@ -358,7 +358,7 @@
fish = {
enable = true;
promptInit = "starship init fish | source";
shellInit = builtins.readFile ./config/fish/colours.fish;
#shellInit = builtins.readFile ./config/fish/colours.fish;
shellAbbrs = {
cat = "bat";
ls = "exa --icons";
Expand Down Expand Up @@ -410,4 +410,5 @@

# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
system.stateVersion = "23.05";
}

}
File renamed without changes.
File renamed without changes.
85 changes: 0 additions & 85 deletions linux/discord.nix

This file was deleted.

37 changes: 0 additions & 37 deletions macos/fonts-darwin.nix

This file was deleted.

55 changes: 0 additions & 55 deletions macos/packages-darwin.nix

This file was deleted.

0 comments on commit b27bc69

Please sign in to comment.