Public/nixos-config
2
0
Fork 0
Code Pull requests Activity

Desktop layout

Browse source
This commit is contained in:
John Locke 2024-03-10 00:44:38 -08:00
parent 079b6f0acc
commit 34d2345732
7 changed files with 89 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
desktop/common.nix
View file

@ -5,9 +5,13 @@
vim
firefox
bat
btop
byobu
curl
dig
eza
git
htop
fd
flameshot
fishPlugins.done
@ -24,6 +28,9 @@
tmux
vlc
wget
whois
zoom-us
];
programs.mtr.enable = true;
}

29
desktop/compat.nix Normal file
View file

@ -0,0 +1,29 @@
{
pkgs,
...
} @ args: {
# AppImage support
boot.binfmt.registrations.appimage = {
wrapInterpreterInShell = false;
interpreter = "${pkgs.appimage-run}/bin/appimage-run";
recognitionType = "magic";
offset = 0;
mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'';
magicOrExtension = ''\x7fELF....AI\x02'';
};
# Flatpak
services.flatpak.enable = true;
# Legacy
programs.nix-ld.enable = true;
programs.nix-ld.libraries = with pkgs; [
# Add any missing dynamic libraries for unpackaged programs
# here, NOT in environment.systemPackages
];
}

32
desktop/default.nix
View file

@ -6,24 +6,38 @@
imports = [
./common.nix
./compat.nix
./i18n.nix
];
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
# Enable networking
networking.networkmanager.enable = true;
hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true;
# AppImage support
boot.binfmt.registrations.appimage = {
wrapInterpreterInShell = false;
interpreter = "${pkgs.appimage-run}/bin/appimage-run";
recognitionType = "magic";
offset = 0;
mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'';
magicOrExtension = ''\x7fELF....AI\x02'';
};
# Enable the X11 windowing system.
services.xserver.enable = true;
# Enable the KDE Plasma Desktop Environment.
services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma6.enable = true;
services.xserver.desktopManager.gnome.enable = true;
# Set your time zone.
time.timeZone = "America/Los_Angeles";
# Shells
programs.zsh.enable = true;
programs.fish.enable = true;
programs.ssh.startAgent = true;
programs.ssh.askPassword = pkgs.lib.mkForce "${pkgs.ksshaskpass.out}/bin/ksshaskpass";
# Enable CUPS to print documents.
services.printing.enable = true;

2
desktop/dev.nix
View file

@ -1,6 +1,8 @@
{pkgs, ...}: {
environment.systemPackages = with pkgs; [
awscli2
bitwarden-cli
ddev
mkcert
php81

24
desktop/i18n.nix Normal file
View file

@ -0,0 +1,24 @@
{pkgs, ...}: {
# Configure keymap in X11
services.xserver.xkb = {
layout = "us";
variant = "";
};
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_US.UTF-8";
LC_IDENTIFICATION = "en_US.UTF-8";
LC_MEASUREMENT = "en_US.UTF-8";
LC_MONETARY = "en_US.UTF-8";
LC_NAME = "en_US.UTF-8";
LC_NUMERIC = "en_US.UTF-8";
LC_PAPER = "en_US.UTF-8";
LC_TELEPHONE = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8";
};
}

2
flake.nix
View file

@ -11,7 +11,7 @@
nixosConfigurations.valhalla = nixpkgs.lib.nixosSystem {
# NOTE: Change this to aarch64-linux if you are on ARM
system = "x86_64-linux";
modules = [ ./configuration.nix ];
modules = [ ./hosts/desktop/valhalla/configuration.nix ];
};
};
}

141
hosts/desktop/valhalla/configuration.nix
View file

@ -8,36 +8,14 @@
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
../../../desktop
../../../desktop/dev.nix
../../../desktop/office.nix
];
hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true;
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.binfmt.registrations.appimage = {
wrapInterpreterInShell = false;
interpreter = "${pkgs.appimage-run}/bin/appimage-run";
recognitionType = "magic";
offset = 0;
mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'';
magicOrExtension = ''\x7fELF....AI\x02'';
};
networking.hostName = "valhalla"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Enable networking
networking.networkmanager.enable = true;
# Set your time zone.
time.timeZone = "America/Los_Angeles";
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
@ -68,117 +46,15 @@
variant = "";
};
# Enable CUPS to print documents.
services.printing.enable = true;
services.salt.minion.enable = true;
services.salt.minion.configuration = {
master = "salt.freelock.lan";
location = [ "freelock" ];
};
# Enable sound with pipewire.
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# If you want to use JACK applications, uncomment this
#jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now)
#media-session.enable = true;
};
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
# Define a user account. Don't forget to set a password with ‘passwd’.
users.users.john = {
isNormalUser = true;
description = "John";
extraGroups = [ "networkmanager" "wheel" "docker" ];
shell = pkgs.fish;
};
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
nixpkgs.config.permittedInsecurePackages = [
"electron-25.9.0"
];
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
home-manager
vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
firefox
bat
byobu
curl
ddev
kate
git
fd
flameshot
fishPlugins.done
fishPlugins.fzf-fish
fishPlugins.forgit
fzf
gimp-with-plugins
google-chrome
libreoffice-qt
lua
microsoft-edge
mkcert
nextcloud-client
php81
polypane
obs-studio
obsidian
ripgrep
starship
terminator
thunderbird
tmux
vault
vlc
wget
zoom-us
];
programs.zsh.enable = true;
programs.fish.enable = true;
programs.ssh.startAgent = true;
programs.ssh.askPassword = pkgs.lib.mkForce "${pkgs.ksshaskpass.out}/bin/ksshaskpass";
# 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;
# };
programs.nix-ld.enable = true;
programs.nix-ld.libraries = with pkgs; [
# Add any missing dynamic libraries for unpackaged programs
# here, NOT in environment.systemPackages
];
# 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;
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
@ -188,7 +64,6 @@
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.11"; # Did you read the comment?
services.flatpak.enable = true;
# Automatic Garbage Collection
nix.gc = {
automatic = true;
@ -200,21 +75,11 @@
enable = true;
};
# DDev setup
# Install & enable docker.
virtualisation.docker.enable = true;
fileSystems."/var/lib/docker" = {
device = "/home/docker";
options = [ "bind" ];
};
# Allow Xdebug to use port 9003.
networking.firewall.allowedTCPPorts = [ 9000 9003 ];
# Make it possible for ddev to modify the /etc/hosts file.
# Otherwise you'll have to manually change the
# hosts configuration after creating a new ddev project.
environment.etc.hosts.mode = "0644";
}