torjus/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Run nixfmt

Browse Source
This commit is contained in:
Torjus Håkestad 2024-02-27 22:20:00 +01:00
parent 4d82957b22
commit 5eb076d8d4
17 changed files with 126 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flake.nix
View File

@ -17,9 +17,7 @@
nixosConfigurations.prismo = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit inputs self user; };
modules = [
./hosts/prismo
];
modules = [ ./hosts/prismo ];
};
};
}

4
home/default.nix
View File

@ -1,8 +1,8 @@
{ inputs, self, user, ...}: {
{ inputs, self, user, ... }: {
imports = [ inputs.home-manager.nixosModules.home-manager ];
home-manager = {
useUserPackages = true;
useGlobalPkgs= true;
useGlobalPkgs = true;
extraSpecialArgs = { inherit inputs user; };
users.${user} = {
imports = [

2
home/editor/neovim/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, ...}: {
{ pkgs, ... }: {
programs = {
neovim = {
enable = true;

7
home/hyprland/default.nix
View File

@ -1,6 +1 @@
{
imports = [
./hyprland.nix
./waybar.nix
];
}
{ imports = [ ./hyprland.nix ./waybar.nix ]; }

18
home/hyprland/hyprland.nix
View File

@ -1,11 +1,7 @@
{ inputs, pkgs, lib, ...}: {
{ inputs, pkgs, lib, ... }: {
options.hyprland.enable = lib.mkEnableOption "Hyprland";
config = {
home.packages = with pkgs; [
swww
wl-clipboard
cliphist
];
home.packages = with pkgs; [ swww wl-clipboard cliphist ];
wayland.windowManager.hyprland = {
enable = true;
@ -80,16 +76,14 @@
"$mainMod,l,movewindow,r"
"$mainMod,k,movewindow,u"
"$mainMod,j,movewindow,d"
] ++ (builtins.concatLists (builtins.genList(x:
] ++ (builtins.concatLists (builtins.genList (x:
let
ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10));
in [
"$mainMod, ${ws}, workspace, ${toString( x + 1)}"
"ALT, ${ws}, workspace, ${toString( x + 1)}"
"$mainMod, ${ws}, workspace, ${toString (x + 1)}"
"ALT, ${ws}, workspace, ${toString (x + 1)}"
]) 10));
exec-once = [
"waybar &"
];
exec-once = [ "waybar &" ];
};
};
};

3
home/hyprland/waybar.nix
View File

@ -130,8 +130,7 @@
settings = [{
"layer" = "top";
"position" = "top";
modules-left =
[ "custom/launcher" "hyprland/workspaces" ];
modules-left = [ "custom/launcher" "hyprland/workspaces" ];
modules-center = [ "clock" ];
modules-right =
[ "pulseaudio" "pulseaudio#microphone" "memory" "cpu" "tray" ];

2
home/packages/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, ...}: {
{ pkgs, ... }: {
home.packages = with pkgs; [
# Generic tools
age

9
home/programs/firefox/default.nix
View File

@ -1,9 +1,6 @@
{ pkgs, config, lib, inputs, user, ...}: {
{ pkgs, config, lib, inputs, user, ... }: {
options.firefox.enable = lib.mkEnableOption "Firefox";
config = lib.mkIf config.firefox.enable {
programs.firefox = {
enable = true;
};
};
config =
lib.mkIf config.firefox.enable { programs.firefox = { enable = true; }; };
}

2
home/programs/tmux/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, lib, config, ...}:
{ pkgs, lib, config, ... }:
with lib;
let cfg = config.tmux.enable;
in {

2
home/zsh/default.nix
View File

@ -1,4 +1,4 @@
{ user, pkgs, ...}: {
{ user, pkgs, ... }: {
home.packages = with pkgs; [ fd ];
programs.zsh = {
enable = true;

19
hosts/prismo/configuration.nix
View File

@ -1,20 +1,11 @@
{ config, lib, pkgs, ... }:
{
imports =
[
./hardware-configuration.nix
];
imports = [ ./hardware-configuration.nix ];
# Bootloader stuff
boot.loader.systemd-boot = {
enable = true;
};
boot.loader.efi = {
canTouchEfiVariables = true;
};
boot.loader.systemd-boot = { enable = true; };
boot.loader.efi = { canTouchEfiVariables = true; };
# Networking stuff
networking.hostName = "prismo"; # Define your hostname.
@ -37,9 +28,7 @@
XDG_DATA_HOME = "$HOME/.local/share";
XDG_STATE_HOME = "$HOME/.local/state";
XDG_BIN_HOME = "$HOME/.local/bin";
PATH = [
"${XDG_BIN_HOME}"
];
PATH = [ "${XDG_BIN_HOME}" ];
};
# Enable sudo

2
hosts/prismo/default.nix
View File

@ -1,4 +1,4 @@
{ inputs, self, pks, ...}: {
{ inputs, self, pks, ... }: {
imports = [
./configuration.nix
./hardware-configuration.nix

24
hosts/prismo/hardware-configuration.nix
View File

@ -4,30 +4,29 @@
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.availableKernelModules =
[ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/91a0dbc4-426f-4b7b-a49e-063d1d0e59fb";
fileSystems."/" = {
device = "/dev/disk/by-uuid/91a0dbc4-426f-4b7b-a49e-063d1d0e59fb";
fsType = "xfs";
};
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/f71b0ace-f38f-435f-a07a-007f9cfe4919";
boot.initrd.luks.devices."cryptroot".device =
"/dev/disk/by-uuid/f71b0ace-f38f-435f-a07a-007f9cfe4919";
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/AF2D-FAD0";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/AF2D-FAD0";
fsType = "vfat";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/67da36a8-69df-4541-88cd-cba7cbc40b4c"; }
];
[{ device = "/dev/disk/by-uuid/67da36a8-69df-4541-88cd-cba7cbc40b4c"; }];
# 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
@ -38,5 +37,6 @@
# networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.cpu.intel.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
}

9
system/default.nix
View File

@ -1,8 +1 @@
{
imports = [
./podman.nix
./fonts.nix
./users.nix
./services.nix
];
}
{ imports = [ ./podman.nix ./fonts.nix ./users.nix ./services.nix ]; }

3
system/fonts.nix
View File

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{ pkgs, ... }: {
environment.systemPackages = with pkgs; [ twemoji-color-font ];
fonts.packages = with pkgs; [
fira-code

2
system/podman.nix
View File

@ -1,4 +1,4 @@
{ pkgs, ...}:
{ pkgs, ... }:
{
virtualisation = {

2
system/users.nix
View File

@ -1,4 +1,4 @@
{ pkgs, ...}:
{ pkgs, ... }:
{
programs.zsh.enable = true;