Compare commits
2 commits
8b9eae079e
...
9f7cf822ed
| Author | SHA1 | Date | |
|---|---|---|---|
| 9f7cf822ed | |||
| b8264643e6 |
12 changed files with 2 additions and 329 deletions
|
|
@ -228,10 +228,6 @@
|
|||
./roles/server
|
||||
];
|
||||
};
|
||||
iMac.modules = [
|
||||
./roles/desktop
|
||||
./roles/gnome
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,84 +0,0 @@
|
|||
# Edit this configuration file to define what should be installed on
|
||||
# your system. Help is available in the configuration.nix(5) man page, on
|
||||
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
networking.hostName = "iMac"; # Define your hostname.
|
||||
|
||||
# Set your time zone.
|
||||
time.timeZone = "Europe/Madrid";
|
||||
|
||||
# Configure network proxy if necessary
|
||||
# networking.proxy.default = "http://user:password@proxy:port/";
|
||||
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
||||
|
||||
# Select internationalisation properties.
|
||||
# i18n.defaultLocale = "en_US.UTF-8";
|
||||
# console = {
|
||||
# font = "Lat2-Terminus16";
|
||||
# keyMap = "us";
|
||||
# useXkbConfig = true; # use xkb.options in tty.
|
||||
# };
|
||||
|
||||
# Enable the X11 windowing system.
|
||||
services.xserver.enable = true;
|
||||
|
||||
# Configure keymap in X11
|
||||
services.xserver.xkb.layout = "es";
|
||||
# services.xserver.xkb.options = "eurosign:e,caps:escape";
|
||||
|
||||
# Enable CUPS to print documents.
|
||||
# services.printing.enable = true;
|
||||
|
||||
# Enable sound.
|
||||
hardware.pulseaudio.enable = false;
|
||||
# OR
|
||||
# services.pipewire = {
|
||||
# enable = true;
|
||||
# pulse.enable = true;
|
||||
# };
|
||||
|
||||
# Enable touchpad support (enabled default in most desktopManager).
|
||||
# services.libinput.enable = true;
|
||||
|
||||
# List packages installed in system profile. To search, run:
|
||||
# $ nix search wget
|
||||
# environment.systemPackages = with pkgs; [
|
||||
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
|
||||
# wget
|
||||
# ];
|
||||
|
||||
# Some programs need SUID wrappers, can be configured further or are
|
||||
# started in user sessions.
|
||||
# programs.mtr.enable = true;
|
||||
# programs.gnupg.agent = {
|
||||
# enable = true;
|
||||
# enableSSHSupport = true;
|
||||
# };
|
||||
|
||||
# List services that you want to enable:
|
||||
|
||||
# Enable the OpenSSH daemon.
|
||||
# services.openssh.enable = true;
|
||||
|
||||
# Open ports in the firewall.
|
||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
|
||||
# Copy the NixOS configuration file and link it from the resulting system
|
||||
# (/run/current-system/configuration.nix). This is useful in case you
|
||||
# accidentally delete configuration.nix.
|
||||
# system.copySystemConfiguration = true;
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{...}: {
|
||||
imports = [
|
||||
./configuration.nix
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
}
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.initrd.systemd.enable = true;
|
||||
boot.kernelModules = ["kvm-intel" "wl"];
|
||||
boot.kernelParams = [
|
||||
"acpi_backlight=video"
|
||||
"nouveau.config=NvClkMode=15"
|
||||
];
|
||||
boot.extraModulePackages = [config.boot.kernelPackages.broadcom_sta];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/6062dfe3-6e70-4f30-aa45-e81933f116fb";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=@" "compress=zstd"];
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."SSD".device = "/dev/disk/by-uuid/482cd1b5-2a22-42f3-a497-4b4d7006d2e3";
|
||||
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-uuid/6062dfe3-6e70-4f30-aa45-e81933f116fb";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=@nix" "compress=zstd"];
|
||||
};
|
||||
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/disk/by-uuid/6062dfe3-6e70-4f30-aa45-e81933f116fb";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=@home" "compress=zstd"];
|
||||
};
|
||||
|
||||
fileSystems."/persist" = {
|
||||
device = "/dev/disk/by-uuid/6062dfe3-6e70-4f30-aa45-e81933f116fb";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=@persist" "compress=zstd"];
|
||||
neededForBoot = true;
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/0D30-3CEE";
|
||||
fsType = "vfat";
|
||||
options = ["fmask=0022" "dmask=0022"];
|
||||
};
|
||||
|
||||
swapDevices = [];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp4s0f0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
@ -47,17 +47,12 @@ in {
|
|||
name = "Win Max 2";
|
||||
id = "X2NILRM-ADRBQ23-AFREAZA-62GVFDF-UVMPR4L-KGHMUNY-BJ2C3CQ-RBT43QS";
|
||||
};
|
||||
"imac" = {
|
||||
name = "iMac";
|
||||
id = "KRHGSJF-64UXAE2-CNSDV6L-QAUV2HU-JTSIEIC-KSHLCBU-IFIQGDX-K5UCSQR";
|
||||
compression = "always";
|
||||
};
|
||||
};
|
||||
folders = {
|
||||
"passwords" = {
|
||||
label = "KeePassXC Passwords";
|
||||
id = "rdyaq-ex659";
|
||||
devices = ["phone" "pc" "steamdeck" "server" "surface" "winmax2" "imac"];
|
||||
devices = ["phone" "pc" "steamdeck" "server" "surface" "winmax2"];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
{...}: {
|
||||
imports = [
|
||||
./programs
|
||||
./gnome.nix
|
||||
];
|
||||
}
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
flakeSelf,
|
||||
...
|
||||
}: {
|
||||
services = {
|
||||
xserver = {
|
||||
displayManager.gdm.enable = true;
|
||||
desktopManager.gnome.enable = true;
|
||||
};
|
||||
gnome.gnome-browser-connector.enable = true;
|
||||
};
|
||||
|
||||
qt = {
|
||||
enable = true;
|
||||
platformTheme = "gnome";
|
||||
style = "adwaita-dark";
|
||||
};
|
||||
|
||||
# Manage this with home-manager
|
||||
services.gnome.gnome-keyring.enable = lib.mkForce false;
|
||||
|
||||
home-manager.sharedModules = [
|
||||
{
|
||||
services.gnome-keyring.enable = true;
|
||||
}
|
||||
];
|
||||
|
||||
# Extensions
|
||||
environment.systemPackages = with pkgs.gnomeExtensions; [
|
||||
appindicator
|
||||
dash-to-dock
|
||||
panel-workspace-scroll
|
||||
];
|
||||
|
||||
home-manager.users.toast = {
|
||||
gtk = {
|
||||
enable = true;
|
||||
theme = {
|
||||
name = "adw-gtk3-dark";
|
||||
package = pkgs.adw-gtk3;
|
||||
};
|
||||
cursorTheme = {
|
||||
name = "Kasane Teto";
|
||||
package = flakeSelf.outputs.packages.x86_64-linux.kasane-teto-cursor;
|
||||
};
|
||||
};
|
||||
services.gnome-keyring.components = ["pkcs11" "secrets"];
|
||||
|
||||
dconf.settings = {
|
||||
"org/gnome/shell" = {
|
||||
enabled-extensions = [
|
||||
"appindicatorsupport@rgcjonas.gmail.com"
|
||||
"dash-to-dock@micxgx.gmail.com"
|
||||
"panel-workspace-scroll@polymeilex.github.io"
|
||||
];
|
||||
favorite-apps = ["firefox.desktop" "com.raggesilver.BlackBox.desktop" "org.gnome.Nautilus.desktop" "android-studio.desktop"];
|
||||
};
|
||||
"org/gnome/desktop/interface" = {
|
||||
color-scheme = "prefer-dark";
|
||||
};
|
||||
"org/gnome/desktop/wm/preferences" = {
|
||||
resize-with-right-button = true;
|
||||
};
|
||||
"org/gnome/mutter" = {
|
||||
dynamic-workspaces = true;
|
||||
edge-tiling = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
programs.gnome-terminal.enable = false;
|
||||
environment = with pkgs; {
|
||||
gnome.excludePackages = [gnome-console];
|
||||
systemPackages = [
|
||||
blackbox-terminal
|
||||
nautilus-open-in-blackbox
|
||||
];
|
||||
};
|
||||
|
||||
home-manager.users.toast = {
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.file.".local/share/blackbox/schemes".source =
|
||||
(pkgs.fetchgit {
|
||||
url = "https://github.com/catppuccin/tilix.git";
|
||||
hash = "sha256-jWnxEtoqqqitHsaDErQNNYjv8DBcrJD0XeIKNopbO3c=";
|
||||
})
|
||||
+ /themes;
|
||||
dconf.settings = with lib.hm.gvariant; {
|
||||
"com/raggesilver/BlackBox" = {
|
||||
# Dark mode
|
||||
style-preference = mkUint32 2;
|
||||
theme-dark = "Catppuccin Mocha";
|
||||
# Default working directory is home folder
|
||||
working-directory-mode = mkUint32 1;
|
||||
custom-font = "JetBrainsMono Nerd Font Mono 12";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
imports = [
|
||||
./blackbox.nix
|
||||
./firefox.nix
|
||||
./nautilus.nix
|
||||
];
|
||||
environment.systemPackages = with pkgs; [
|
||||
gnome-tweaks
|
||||
dconf-editor
|
||||
];
|
||||
}
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
{pkgs, ...}: let
|
||||
firefox-gnome-theme = pkgs.fetchFromGitHub {
|
||||
owner = "rafaelmardojai";
|
||||
repo = "firefox-gnome-theme";
|
||||
rev = "v129";
|
||||
hash = "sha256-MOE9NeU2i6Ws1GhGmppMnjOHkNLl2MQMJmGhaMzdoJM=";
|
||||
};
|
||||
profile-location = ".mozilla/firefox/jdnxpg97.temp";
|
||||
in {
|
||||
home-manager.users.toast = {
|
||||
programs.firefox = {
|
||||
enableGnomeExtensions = true;
|
||||
};
|
||||
home.file."${profile-location}/chrome".source = firefox-gnome-theme;
|
||||
};
|
||||
programs.firefox = {
|
||||
autoConfig = ''
|
||||
lockPref("toolkit.legacyUserProfileCustomizations.stylesheets",true);
|
||||
lockPref("svg.context-properties.content.enabled",true);
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
nautilus-python
|
||||
];
|
||||
|
||||
home-manager.users.toast = {
|
||||
dconf.settings = {
|
||||
"org/gnome/preferences" = {
|
||||
date-time-format = "detailed";
|
||||
show-create-link = true;
|
||||
show-delete-permanently = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
"school-things" = {
|
||||
label = "School things";
|
||||
id = "btsth-vdu9c";
|
||||
devices = ["server" "pc" "winmax2" "imac"];
|
||||
devices = ["server" "pc" "winmax2"];
|
||||
path = "${config.services.syncthing.dataDir}/school-things";
|
||||
};
|
||||
"project-eden-saves" = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue