Format using nixfmt

This commit is contained in:
Torjus Håkestad 2024-07-17 22:22:04 +02:00
parent a85c6f2f4b
commit 90ccaa07bd
54 changed files with 671 additions and 409 deletions

View File

@ -21,13 +21,14 @@
}; };
outputs = outputs =
{ self {
, nixpkgs self,
, nixpkgs-stable nixpkgs,
, sops-nix nixpkgs-stable,
, ghettoptt sops-nix,
, huecli ghettoptt,
, ... huecli,
...
}@inputs: }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
@ -44,54 +45,69 @@
"x86_64-darwin" "x86_64-darwin"
"aarch64-darwin" "aarch64-darwin"
]; ];
forAllSystems = f: nixpkgs.lib.genAttrs allSystems (system: f { forAllSystems =
pkgs = import nixpkgs { inherit system; }; f: nixpkgs.lib.genAttrs allSystems (system: f { pkgs = import nixpkgs { inherit system; }; });
});
in in
{ {
nixosConfigurations = { nixosConfigurations = {
prismo = nixpkgs.lib.nixosSystem { prismo = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
specialArgs = { inherit inputs self user; }; specialArgs = {
inherit inputs self user;
};
modules = [ ./hosts/prismo ]; modules = [ ./hosts/prismo ];
}; };
magicman = nixpkgs.lib.nixosSystem { magicman = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
specialArgs = { inherit inputs self user; }; specialArgs = {
inherit inputs self user;
};
modules = [ modules = [
({ config, pkgs, ... }: { (
nixpkgs.overlays = [ { config, pkgs, ... }:
overlay-stable {
ghettoptt.overlays.default nixpkgs.overlays = [
huecli.overlays.default overlay-stable
]; ghettoptt.overlays.default
}) huecli.overlays.default
];
}
)
./hosts/magicman ./hosts/magicman
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
]; ];
}; };
gunter = nixpkgs.lib.nixosSystem { gunter = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
specialArgs = { inherit inputs self user sops-nix; }; specialArgs = {
inherit
inputs
self
user
sops-nix
;
};
modules = [ modules = [
({ config, pkgs, ... }: { (
nixpkgs.overlays = [ { config, pkgs, ... }:
overlay-stable {
ghettoptt.overlays.default nixpkgs.overlays = [
huecli.overlays.default overlay-stable
]; ghettoptt.overlays.default
}) huecli.overlays.default
];
}
)
./hosts/gunter ./hosts/gunter
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
]; ];
}; };
}; };
devShells = forAllSystems ({ pkgs }: { devShells = forAllSystems (
default = pkgs.mkShell { { pkgs }:
packages = with pkgs; [ {
pre-commit default = pkgs.mkShell { packages = with pkgs; [ pre-commit ]; };
]; }
}; );
});
}; };
} }

View File

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

View File

@ -1,38 +1,48 @@
{ pkgs, inputs, user, ... }: { {
pkgs,
inputs,
user,
...
}:
{
imports = [ inputs.home-manager.nixosModules.home-manager ]; imports = [ inputs.home-manager.nixosModules.home-manager ];
home-manager = { home-manager = {
useUserPackages = true; useUserPackages = true;
useGlobalPkgs = true; useGlobalPkgs = true;
extraSpecialArgs = { inherit pkgs inputs user; }; extraSpecialArgs = {
users.${user} = { pkgs, ... }: { inherit pkgs inputs user;
imports = [
inputs.sops-nix.homeManagerModules.sops
./sops
./editor/neovim
./programs/firefox
./programs/tmux
./programs/dunst
./programs/kitty
./programs/rofi
./programs/obs-studio
./programs/vscode
./scripts
./zsh
./packages
./hyprland/gunter.nix
./ssh
./services/backup-home.nix
./services/ghettoptt.nix
];
firefox.enable = true;
tmux.enable = true;
hyprland.enable = true;
home = {
username = "${user}";
homeDirectory = "/home/${user}";
stateVersion = "23.11";
};
programs.home-manager.enable = true;
}; };
users.${user} =
{ pkgs, ... }:
{
imports = [
inputs.sops-nix.homeManagerModules.sops
./sops
./editor/neovim
./programs/firefox
./programs/tmux
./programs/dunst
./programs/kitty
./programs/rofi
./programs/obs-studio
./programs/vscode
./scripts
./zsh
./packages
./hyprland/gunter.nix
./ssh
./services/backup-home.nix
./services/ghettoptt.nix
];
firefox.enable = true;
tmux.enable = true;
hyprland.enable = true;
home = {
username = "${user}";
homeDirectory = "/home/${user}";
stateVersion = "23.11";
};
programs.home-manager.enable = true;
};
}; };
} }

View File

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
home.pointerCursor = { home.pointerCursor = {
gtk.enable = true; gtk.enable = true;
# x11.enable = true; # x11.enable = true;

View File

@ -1 +1,8 @@
{ imports = [ ./hyprland_gunter.nix ./waybar ./xdg.nix ./cursor.nix ]; } {
imports = [
./hyprland_gunter.nix
./waybar
./xdg.nix
./cursor.nix
];
}

View File

@ -1,8 +1,12 @@
{ config, osConfig, pkgs, ... }: { {
config,
osConfig,
pkgs,
...
}:
{
home.packages = with pkgs; [ home.packages = with pkgs; [ hypridle ];
hypridle
];
xdg.configFile = { xdg.configFile = {
"hypr/hypridle.conf" = { "hypr/hypridle.conf" = {
source = config.lib.file.mkOutOfStoreSymlink ./. + "/hypridle_${osConfig.system.name}.conf"; source = config.lib.file.mkOutOfStoreSymlink ./. + "/hypridle_${osConfig.system.name}.conf";

View File

@ -1,4 +1,11 @@
{ inputs, pkgs, lib, config, ... }: { {
inputs,
pkgs,
lib,
config,
...
}:
{
imports = [ imports = [
./hyprlock.nix ./hyprlock.nix
./hypridle.nix ./hypridle.nix
@ -121,9 +128,7 @@
"special:special, on-created-empty:kitty, rounding:true, decorate:false, border:false" "special:special, on-created-empty:kitty, rounding:true, decorate:false, border:false"
]; ];
bindm = [ bindm = [ "ALT,mouse:272,movewindow" ];
"ALT,mouse:272,movewindow"
];
bindr = [ bindr = [
# mumble ptt release # mumble ptt release

View File

@ -1,4 +1,11 @@
{ inputs, pkgs, lib, config, ... }: { {
inputs,
pkgs,
lib,
config,
...
}:
{
imports = [ imports = [
./hyprlock.nix ./hyprlock.nix
./hypridle.nix ./hypridle.nix
@ -30,17 +37,13 @@
"$shiftMainMod" = "SUPER_SHIFT"; "$shiftMainMod" = "SUPER_SHIFT";
"$term" = "kitty"; "$term" = "kitty";
monitor = [ monitor = [ "eDP-1,1920x1080@60,0x0,1" ];
"eDP-1,1920x1080@60,0x0,1"
];
input = { input = {
kb_layout = "no"; kb_layout = "no";
follow_mouse = 1; follow_mouse = 1;
}; };
env = [ env = [ "XDG_SESSION_TYPE,wayland" ];
"XDG_SESSION_TYPE,wayland"
];
decoration = { decoration = {
rounding = 10; rounding = 10;
@ -97,9 +100,7 @@
"special:special, on-created-empty:kitty, rounding:true, decorate:false, border:false" "special:special, on-created-empty:kitty, rounding:true, decorate:false, border:false"
]; ];
bindm = [ bindm = [ "ALT,mouse:272,movewindow" ];
"ALT,mouse:272,movewindow"
];
bindr = [ bindr = [
# mumble ptt release # mumble ptt release

View File

@ -1,4 +1,11 @@
{ inputs, pkgs, lib, config, ... }: { {
inputs,
pkgs,
lib,
config,
...
}:
{
options.hyprland.enable = lib.mkEnableOption "Hyprland"; options.hyprland.enable = lib.mkEnableOption "Hyprland";
config = { config = {
home.packages = with pkgs; [ home.packages = with pkgs; [
@ -26,17 +33,13 @@
"$shiftMainMod" = "SUPER_SHIFT"; "$shiftMainMod" = "SUPER_SHIFT";
"$term" = "kitty"; "$term" = "kitty";
monitor = [ ];
monitor = [
];
input = { input = {
kb_layout = "no"; kb_layout = "no";
follow_mouse = 1; follow_mouse = 1;
}; };
env = [ env = [ "XDG_SESSION_TYPE,wayland" ];
"XDG_SESSION_TYPE,wayland"
];
decoration = { decoration = {
rounding = 0; rounding = 0;
@ -92,9 +95,7 @@
"name:main 2, monitor:$mon_center, persistent:true, default:true" "name:main 2, monitor:$mon_center, persistent:true, default:true"
]; ];
bindm = [ bindm = [ "ALT,mouse:272,movewindow" ];
"ALT,mouse:272,movewindow"
];
bindr = [ bindr = [
# mumble ptt release # mumble ptt release

View File

@ -1,8 +1,12 @@
{ config, osConfig, pkgs, ... }: { {
config,
osConfig,
pkgs,
...
}:
{
home.packages = with pkgs; [ home.packages = with pkgs; [ hyprlock ];
hyprlock
];
xdg.configFile = { xdg.configFile = {
"hypr/hyprlock.conf" = { "hypr/hyprlock.conf" = {
source = config.lib.file.mkOutOfStoreSymlink ./. + "/hyprlock_${osConfig.system.name}.conf"; source = config.lib.file.mkOutOfStoreSymlink ./. + "/hyprlock_${osConfig.system.name}.conf";

View File

@ -1 +1,8 @@
{ imports = [ ./hyprland_magicman.nix ./waybar ./xdg.nix ./cursor.nix ]; } {
imports = [
./hyprland_magicman.nix
./waybar
./xdg.nix
./cursor.nix
];
}

View File

@ -1 +1,8 @@
{ imports = [ ./hyprland_prismo.nix ./waybar ./xdg.nix ./cursor.nix ]; } {
imports = [
./hyprland_prismo.nix
./waybar
./xdg.nix
./cursor.nix
];
}

View File

@ -1,4 +1,9 @@
{ pkgs, lib, osConfig, ... }: {
pkgs,
lib,
osConfig,
...
}:
let let
flakestat = pkgs.writeShellApplication { flakestat = pkgs.writeShellApplication {
name = "flakestat"; name = "flakestat";
@ -11,9 +16,7 @@ let
arrhist = pkgs.stdenv.mkDerivation { arrhist = pkgs.stdenv.mkDerivation {
name = "arrhist"; name = "arrhist";
propagatedBuildInputs = [ propagatedBuildInputs = [
(pkgs.python3.withPackages (pythonPackages: with pythonPackages; [ (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [ requests ]))
requests
]))
]; ];
src = ./arrhist.py; src = ./arrhist.py;
dontUnpack = true; dontUnpack = true;
@ -29,13 +32,14 @@ in
sops.secrets."radarr_api_key" = { }; sops.secrets."radarr_api_key" = { };
xdg.configFile."waybar/macchiato.css" = { xdg.configFile."waybar/macchiato.css" = {
source = pkgs.fetchFromGitHub source =
{ pkgs.fetchFromGitHub {
owner = "catppuccin"; owner = "catppuccin";
repo = "waybar"; repo = "waybar";
rev = "f74ab1eecf2dcaf22569b396eed53b2b2fbe8aff"; rev = "f74ab1eecf2dcaf22569b396eed53b2b2fbe8aff";
sha256 = "WLJMA2X20E5PCPg0ZPtSop0bfmu+pLImP9t8A8V4QK8="; sha256 = "WLJMA2X20E5PCPg0ZPtSop0bfmu+pLImP9t8A8V4QK8=";
} + "/themes/macchiato.css"; }
+ "/themes/macchiato.css";
}; };
programs.waybar = { programs.waybar = {
@ -165,17 +169,16 @@ in
"position" = "top"; "position" = "top";
modules-left = [ "custom/flakestat" ]; modules-left = [ "custom/flakestat" ];
modules-center = [ "hyprland/workspaces" ]; modules-center = [ "hyprland/workspaces" ];
modules-right = modules-right = [
[ (lib.mkIf (withArrhist) "custom/arrhist")
(lib.mkIf (withArrhist) "custom/arrhist") "pulseaudio"
"pulseaudio" "pulseaudio#microphone"
"pulseaudio#microphone" "memory"
"memory" "cpu"
"cpu" (lib.mkIf (withBattery) "battery")
(lib.mkIf (withBattery) "battery") "clock"
"clock" "tray"
"tray" ];
];
"hyprland/workspaces" = { "hyprland/workspaces" = {
"format" = "{name}"; "format" = "{name}";
"on-click" = "activate"; "on-click" = "activate";
@ -186,7 +189,13 @@ in
"scroll-step" = 5; "scroll-step" = 5;
"format" = "{icon} {volume}%"; "format" = "{icon} {volume}%";
"format-muted" = ""; "format-muted" = "";
"format-icons" = { "default" = [ "" "" "" ]; }; "format-icons" = {
"default" = [
""
""
""
];
};
"on-scroll-up" = "pamixer -i ${volInterval}"; "on-scroll-up" = "pamixer -i ${volInterval}";
"on-scroll-down" = "pamixer -d ${volInterval}"; "on-scroll-down" = "pamixer -d ${volInterval}";
"on-click" = "pamixer -t"; "on-click" = "pamixer -t";
@ -209,7 +218,9 @@ in
"memory" = { "memory" = {
"interval" = 3; "interval" = 3;
"format" = " {percentage}%"; "format" = " {percentage}%";
"states" = { "warning" = 85; }; "states" = {
"warning" = 85;
};
}; };
"cpu" = { "cpu" = {
"interval" = 3; "interval" = 3;
@ -240,7 +251,8 @@ in
"return-type" = "json"; "return-type" = "json";
"interval" = 600; "interval" = 600;
}; };
} // lib.optionalAttrs (withArrhist) { }
// lib.optionalAttrs (withArrhist) {
"custom/arrhist" = { "custom/arrhist" = {
"exec" = "${arrhist}/bin/arrhist"; "exec" = "${arrhist}/bin/arrhist";
"return-type" = "json"; "return-type" = "json";

View File

@ -1,4 +1,5 @@
{ config, ... }: { { config, ... }:
{
xdg.configFile = { xdg.configFile = {
"hypr/hyprpaper.conf" = { "hypr/hyprpaper.conf" = {
source = config.lib.file.mkOutOfStoreSymlink ./. + "/hyprpaper.conf"; source = config.lib.file.mkOutOfStoreSymlink ./. + "/hyprpaper.conf";

View File

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
mod = "Mod4"; mod = "Mod4";
in in

View File

@ -1,39 +1,49 @@
{ pkgs, inputs, user, ... }: { {
pkgs,
inputs,
user,
...
}:
{
imports = [ inputs.home-manager.nixosModules.home-manager ]; imports = [ inputs.home-manager.nixosModules.home-manager ];
home-manager = { home-manager = {
useUserPackages = true; useUserPackages = true;
useGlobalPkgs = true; useGlobalPkgs = true;
extraSpecialArgs = { inherit pkgs inputs user; }; extraSpecialArgs = {
users.${user} = { pkgs, ... }: { inherit pkgs inputs user;
imports = [
inputs.sops-nix.homeManagerModules.sops
./sops
./editor/neovim
./programs/firefox
./programs/tmux
./programs/dunst
./programs/kitty
./programs/rofi
./programs/obs-studio
./programs/vscode
./programs/pywal
./programs/zellij
./scripts
./scripts/batlvl.nix
./zsh
./packages
./hyprland/magicman.nix
./ssh
];
firefox.enable = true;
tmux.enable = true;
hyprland.enable = true;
home = {
username = "${user}";
homeDirectory = "/home/${user}";
stateVersion = "23.11";
};
programs.home-manager.enable = true;
}; };
users.${user} =
{ pkgs, ... }:
{
imports = [
inputs.sops-nix.homeManagerModules.sops
./sops
./editor/neovim
./programs/firefox
./programs/tmux
./programs/dunst
./programs/kitty
./programs/rofi
./programs/obs-studio
./programs/vscode
./programs/pywal
./programs/zellij
./scripts
./scripts/batlvl.nix
./zsh
./packages
./hyprland/magicman.nix
./ssh
];
firefox.enable = true;
tmux.enable = true;
hyprland.enable = true;
home = {
username = "${user}";
homeDirectory = "/home/${user}";
stateVersion = "23.11";
};
programs.home-manager.enable = true;
};
}; };
} }

View File

@ -79,10 +79,12 @@ in
typescript typescript
# Py stuff # Py stuff
(python312.withPackages (p: with p; [ (python312.withPackages (
requests p: with p; [
ipython requests
])) ipython
]
))
poetry poetry
ruff ruff
@ -97,16 +99,10 @@ in
# Stuff with overrides # Stuff with overrides
# Blender # Blender
(blender.override { (blender.override { cudaSupport = withCuda; })
cudaSupport = withCuda;
})
# Btop # Btop
(btop.override { (btop.override { cudaSupport = withCuda; })
cudaSupport = withCuda;
})
# PrismLauncher # PrismLauncher
(prismlauncher.override { (prismlauncher.override { withWaylandGLFW = true; })
withWaylandGLFW = true;
})
]; ];
} }

View File

@ -1,38 +1,48 @@
{ pkgs, inputs, user, ... }: { {
pkgs,
inputs,
user,
...
}:
{
imports = [ inputs.home-manager.nixosModules.home-manager ]; imports = [ inputs.home-manager.nixosModules.home-manager ];
home-manager = { home-manager = {
useUserPackages = true; useUserPackages = true;
useGlobalPkgs = true; useGlobalPkgs = true;
extraSpecialArgs = { inherit pkgs inputs user; }; extraSpecialArgs = {
users.${user} = { pkgs, ... }: { inherit pkgs inputs user;
imports = [
inputs.sops-nix.homeManagerModules.sops
./sops
./editor/neovim
./programs/firefox
./programs/tmux
./programs/dunst
./programs/kitty
./programs/rofi
./programs/obs-studio
./programs/vscode
./scripts
./zsh
./packages
./hyprland
./ssh
./services/backup-home.nix
./services/ghettoptt.nix
];
firefox.enable = true;
tmux.enable = true;
hyprland.enable = true;
home = {
username = "${user}";
homeDirectory = "/home/${user}";
stateVersion = "23.11";
};
programs.home-manager.enable = true;
}; };
users.${user} =
{ pkgs, ... }:
{
imports = [
inputs.sops-nix.homeManagerModules.sops
./sops
./editor/neovim
./programs/firefox
./programs/tmux
./programs/dunst
./programs/kitty
./programs/rofi
./programs/obs-studio
./programs/vscode
./scripts
./zsh
./packages
./hyprland
./ssh
./services/backup-home.nix
./services/ghettoptt.nix
];
firefox.enable = true;
tmux.enable = true;
hyprland.enable = true;
home = {
username = "${user}";
homeDirectory = "/home/${user}";
stateVersion = "23.11";
};
programs.home-manager.enable = true;
};
}; };
} }

View File

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
{ {
services.dunst = { services.dunst = {
@ -36,7 +41,7 @@
corner_radius = 10; corner_radius = 10;
# follow = "mouse"; # follow = "mouse";
font = "Source Sans Pro 10"; font = "Source Sans Pro 10";
format = "<b>%s</b>\\n%b"; #format = "<span foreground='#f3f4f5'><b>%s %p</b></span>\n%b" format = "<b>%s</b>\\n%b"; # format = "<span foreground='#f3f4f5'><b>%s %p</b></span>\n%b"
frame_color = "#232323"; frame_color = "#232323";
frame_width = 1; frame_width = 1;
offset = "15x15"; offset = "15x15";
@ -57,7 +62,9 @@
browser = "/usr/bin/env firefox -new-tab"; browser = "/usr/bin/env firefox -new-tab";
}; };
fullscreen_delay_everything = { fullscreen = "delay"; }; fullscreen_delay_everything = {
fullscreen = "delay";
};
urgency_critical = { urgency_critical = {
background = "#d64e4e"; background = "#d64e4e";

View File

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

View File

@ -1,24 +1,27 @@
{ config, pkgs, ... }: { { config, pkgs, ... }:
{
xdg.configFile."kitty/kitty.conf" = { xdg.configFile."kitty/kitty.conf" = {
source = config.lib.file.mkOutOfStoreSymlink ./. + "/kitty.conf"; source = config.lib.file.mkOutOfStoreSymlink ./. + "/kitty.conf";
target = "kitty/kitty.conf"; target = "kitty/kitty.conf";
}; };
xdg.configFile."kitty/themes/macchiato.conf" = { xdg.configFile."kitty/themes/macchiato.conf" = {
source = pkgs.fetchFromGitHub source =
{ pkgs.fetchFromGitHub {
owner = "catppuccin"; owner = "catppuccin";
repo = "kitty"; repo = "kitty";
rev = "d7d61716a83cd135344cbb353af9d197c5d7cec1"; rev = "d7d61716a83cd135344cbb353af9d197c5d7cec1";
sha256 = "mRFa+40fuJCUrR1o4zMi7AlgjRtFmii4fNsQyD8hIjM="; sha256 = "mRFa+40fuJCUrR1o4zMi7AlgjRtFmii4fNsQyD8hIjM=";
} + "/themes/macchiato.conf"; }
+ "/themes/macchiato.conf";
}; };
xdg.configFile."kitty/themes/latte.conf" = { xdg.configFile."kitty/themes/latte.conf" = {
source = pkgs.fetchFromGitHub source =
{ pkgs.fetchFromGitHub {
owner = "catppuccin"; owner = "catppuccin";
repo = "kitty"; repo = "kitty";
rev = "d7d61716a83cd135344cbb353af9d197c5d7cec1"; rev = "d7d61716a83cd135344cbb353af9d197c5d7cec1";
sha256 = "mRFa+40fuJCUrR1o4zMi7AlgjRtFmii4fNsQyD8hIjM="; sha256 = "mRFa+40fuJCUrR1o4zMi7AlgjRtFmii4fNsQyD8hIjM=";
} + "/themes/latte.conf"; }
+ "/themes/latte.conf";
}; };
} }

View File

@ -1,40 +1,46 @@
{ pkgs, lib, osConfig, ... }: {
pkgs,
lib,
osConfig,
...
}:
let let
withCuda = osConfig.system.name == "gunter"; withCuda = osConfig.system.name == "gunter";
onnxruntime-gpu = (pkgs.onnxruntime.override { onnxruntime-gpu = (pkgs.onnxruntime.override { cudaSupport = withCuda; }).overrideAttrs (old: {
cudaSupport = withCuda; # TODO: Remove when fixed in nixpkgs
}).overrideAttrs # https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/development/libraries/onnxruntime/default.nix#L154
(old: { buildInputs = old.buildInputs ++ [ pkgs.cudaPackages.nccl ];
# TODO: Remove when fixed in nixpkgs });
# https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/development/libraries/onnxruntime/default.nix#L154
buildInputs = old.buildInputs ++ [ pkgs.cudaPackages.nccl ];
});
obs-backgrounremoval-gpu = ((pkgs.obs-studio-plugins.obs-backgroundremoval.override { obs-backgrounremoval-gpu = (
onnxruntime = onnxruntime-gpu; (pkgs.obs-studio-plugins.obs-backgroundremoval.override { onnxruntime = onnxruntime-gpu; })
}).overrideAttrs (old: { .overrideAttrs
version = "1.1.14-beta"; (old: {
src = pkgs.fetchFromGitHub { version = "1.1.14-beta";
owner = "occ-ai"; src = pkgs.fetchFromGitHub {
repo = "obs-backgroundremoval"; owner = "occ-ai";
rev = "94be8c35fe077be93a6f5ef347a802295a36dddd"; repo = "obs-backgroundremoval";
hash = "sha256-qnxDNeTWQYiRMqT6jNp8GC8ef6aaAAY+OXAak54dVc8="; rev = "94be8c35fe077be93a6f5ef347a802295a36dddd";
}; hash = "sha256-qnxDNeTWQYiRMqT6jNp8GC8ef6aaAAY+OXAak54dVc8=";
cmakeFlags = };
if withCuda then cmakeFlags =
(lib.lists.remove "-DDISABLE_ONNXRUNTIME_GPU=ON" old.cmakeFlags) if withCuda then
else old.cmakeFlags; (lib.lists.remove "-DDISABLE_ONNXRUNTIME_GPU=ON" old.cmakeFlags)
})); else
old.cmakeFlags;
})
);
in in
{ {
programs.obs-studio = { programs.obs-studio = {
enable = true; enable = true;
plugins = with pkgs.obs-studio-plugins; [ plugins =
obs-pipewire-audio-capture with pkgs.obs-studio-plugins;
obs-shaderfilter [
] ++ lib.optionals withCuda [ obs-pipewire-audio-capture
obs-backgrounremoval-gpu obs-shaderfilter
]; ]
++ lib.optionals withCuda [ obs-backgrounremoval-gpu ];
}; };
} }

View File

@ -1,26 +1,28 @@
{ config, pkgs, ... }: { { config, pkgs, ... }:
{
programs.pywal.enable = true; programs.pywal.enable = true;
xdg.configFile = { xdg.configFile = {
"wal/templates/colors-hyprland.conf" = { "wal/templates/colors-hyprland.conf" = {
text = ''$foreground = 0xff{foreground.strip} text = ''
$background = 0xff{background.strip} $foreground = 0xff{foreground.strip}
$color0 = 0xff{color0.strip} $background = 0xff{background.strip}
$color1 = 0xff{color1.strip} $color0 = 0xff{color0.strip}
$color2 = 0xff{color2.strip} $color1 = 0xff{color1.strip}
$color3 = 0xff{color3.strip} $color2 = 0xff{color2.strip}
$color4 = 0xff{color4.strip} $color3 = 0xff{color3.strip}
$color5 = 0xff{color5.strip} $color4 = 0xff{color4.strip}
$color6 = 0xff{color6.strip} $color5 = 0xff{color5.strip}
$color7 = 0xff{color7.strip} $color6 = 0xff{color6.strip}
$color8 = 0xff{color8.strip} $color7 = 0xff{color7.strip}
$color9 = 0xff{color9.strip} $color8 = 0xff{color8.strip}
$color10 = 0xff{color10.strip} $color9 = 0xff{color9.strip}
$color11 = 0xff{color11.strip} $color10 = 0xff{color10.strip}
$color12 = 0xff{color12.strip} $color11 = 0xff{color11.strip}
$color13 = 0xff{color13.strip} $color12 = 0xff{color12.strip}
$color14 = 0xff{color14.strip} $color13 = 0xff{color13.strip}
$color15 = 0xff{color15.strip} $color14 = 0xff{color14.strip}
$color15 = 0xff{color15.strip}
''; '';
}; };
}; };

View File

@ -1,24 +1,27 @@
{ config, pkgs, ... }: { { config, pkgs, ... }:
{
xdg.configFile."rofi/config.rasi" = { xdg.configFile."rofi/config.rasi" = {
source = ./config.rasi; source = ./config.rasi;
}; };
xdg.configFile."rofi/macchiato.rasi" = { xdg.configFile."rofi/macchiato.rasi" = {
source = pkgs.fetchFromGitHub source =
{ pkgs.fetchFromGitHub {
owner = "catppuccin"; owner = "catppuccin";
repo = "rofi"; repo = "rofi";
rev = "5350da41a11814f950c3354f090b90d4674a95ce"; rev = "5350da41a11814f950c3354f090b90d4674a95ce";
sha256 = "DNorfyl3C4RBclF2KDgwvQQwixpTwSRu7fIvihPN8JY="; sha256 = "DNorfyl3C4RBclF2KDgwvQQwixpTwSRu7fIvihPN8JY=";
} + "/basic/.local/share/rofi/themes/catppuccin-macchiato.rasi"; }
+ "/basic/.local/share/rofi/themes/catppuccin-macchiato.rasi";
}; };
xdg.configFile."rofi/latte.rasi" = { xdg.configFile."rofi/latte.rasi" = {
source = pkgs.fetchFromGitHub source =
{ pkgs.fetchFromGitHub {
owner = "catppuccin"; owner = "catppuccin";
repo = "rofi"; repo = "rofi";
rev = "5350da41a11814f950c3354f090b90d4674a95ce"; rev = "5350da41a11814f950c3354f090b90d4674a95ce";
sha256 = "DNorfyl3C4RBclF2KDgwvQQwixpTwSRu7fIvihPN8JY="; sha256 = "DNorfyl3C4RBclF2KDgwvQQwixpTwSRu7fIvihPN8JY=";
} + "/basic/.local/share/rofi/themes/catppuccin-latte.rasi"; }
+ "/basic/.local/share/rofi/themes/catppuccin-latte.rasi";
}; };
} }

View File

@ -1,7 +1,14 @@
{ pkgs, lib, config, ... }: {
pkgs,
lib,
config,
...
}:
with lib; with lib;
let cfg = config.tmux.enable; let
in { cfg = config.tmux.enable;
in
{
options.tmux.enable = mkEnableOption "tmux"; options.tmux.enable = mkEnableOption "tmux";
config = mkIf cfg { config = mkIf cfg {
programs.tmux = { programs.tmux = {

View File

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

View File

@ -1,4 +1,5 @@
{ ... }: { { ... }:
{
programs.zellij = { programs.zellij = {
enable = true; enable = true;
# enableZshIntegration = true; # enableZshIntegration = true;

View File

@ -2,13 +2,10 @@
let let
batlvl = pkgs.writeShellApplication { batlvl = pkgs.writeShellApplication {
name = "batlvl"; name = "batlvl";
runtimeInputs = [ runtimeInputs = [ ];
];
text = builtins.readFile ./batlvl.sh; text = builtins.readFile ./batlvl.sh;
}; };
in in
{ {
home.packages = [ home.packages = [ batlvl ];
batlvl
];
} }

View File

@ -1,7 +1,6 @@
{ pkgs, config, ... }: { { pkgs, config, ... }:
imports = [ {
./lockhelper.nix imports = [ ./lockhelper.nix ];
];
home.file.".local/bin/hl-no-opacity" = { home.file.".local/bin/hl-no-opacity" = {
source = ./hl-no-opacity.sh; source = ./hl-no-opacity.sh;
executable = true; executable = true;

View File

@ -10,7 +10,5 @@ let
}; };
in in
{ {
home.packages = [ home.packages = [ lockhelper ];
lockhelper
];
} }

View File

@ -95,7 +95,10 @@ in
systemd.user.services.backup-home = { systemd.user.services.backup-home = {
Unit = { Unit = {
Description = "Backup home directory"; Description = "Backup home directory";
After = [ "network.target" "sops-nix.service" ]; After = [
"network.target"
"sops-nix.service"
];
}; };
Service = { Service = {
Type = "oneshot"; Type = "oneshot";
@ -112,7 +115,10 @@ in
Persistent = true; Persistent = true;
}; };
Install = { Install = {
WantedBy = [ "timers.target" "graphical-session.target" ]; WantedBy = [
"timers.target"
"graphical-session.target"
];
}; };
}; };
} }

View File

@ -1,4 +1,5 @@
{ user, ... }: { { user, ... }:
{
sops = { sops = {
age.keyFile = "/home/${user}/.config/sops/age/keys.txt"; age.keyFile = "/home/${user}/.config/sops/age/keys.txt";
defaultSopsFile = ../../secrets/torjus/secret.yaml; defaultSopsFile = ../../secrets/torjus/secret.yaml;

View File

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
programs.ssh = { programs.ssh = {
enable = true; enable = true;
controlMaster = "auto"; controlMaster = "auto";

View File

@ -1,4 +1,5 @@
{ user, pkgs, ... }: { { user, pkgs, ... }:
{
home.packages = with pkgs; [ fd ]; home.packages = with pkgs; [ fd ];
programs.direnv = { programs.direnv = {
enable = true; enable = true;
@ -38,8 +39,14 @@
zplug = { zplug = {
enable = true; enable = true;
plugins = [ plugins = [
({ name = "plugins/git"; tags = [ "from:oh-my-zsh" ]; }) ({
({ name = "modules/prompt"; tags = [ "from:prezto" ]; }) name = "plugins/git";
tags = [ "from:oh-my-zsh" ];
})
({
name = "modules/prompt";
tags = [ "from:prezto" ];
})
]; ];
}; };
}; };

View File

@ -1,4 +1,10 @@
{ config, lib, inputs, pkgs, ... }: {
config,
lib,
inputs,
pkgs,
...
}:
{ {
imports = [ imports = [
@ -35,7 +41,9 @@
enable = true; enable = true;
configurationLimit = 10; configurationLimit = 10;
}; };
loader.efi = { canTouchEfiVariables = true; }; loader.efi = {
canTouchEfiVariables = true;
};
supportedFilesystems = [ "nfs" ]; supportedFilesystems = [ "nfs" ];
}; };
@ -112,19 +120,26 @@
xdg.portal = { xdg.portal = {
enable = true; enable = true;
xdgOpenUsePortal = true; xdgOpenUsePortal = true;
extraPortals = (with pkgs; [ extraPortals = (
# unstable.xdg-desktop-portal-hyprland with pkgs;
xdg-desktop-portal-gtk [
]); # unstable.xdg-desktop-portal-hyprland
xdg-desktop-portal-gtk
]
);
}; };
# Enable flakes # Enable flakes
nix.settings = { nix.settings = {
experimental-features = [ "nix-command" "flakes" ]; experimental-features = [
trusted-users = [ "root" "torjus" ]; "nix-command"
substituters = [ "flakes"
"https://cuda-maintainers.cachix.org"
]; ];
trusted-users = [
"root"
"torjus"
];
substituters = [ "https://cuda-maintainers.cachix.org" ];
trusted-public-keys = [ trusted-public-keys = [
"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=" "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
]; ];

View File

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

View File

@ -1,37 +1,45 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: {
config,
lib,
pkgs,
modulesPath,
...
}:
{ {
imports = imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
[
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [
boot.initrd.kernelModules = [ ]; "nvme"
boot.kernelModules = [ "kvm-amd" "v4l2loopback" ]; "xhci_pci"
boot.extraModulePackages = with config.boot.kernelPackages; [ "ahci"
v4l2loopback "usbhid"
"usb_storage"
"sd_mod"
]; ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [
"kvm-amd"
"v4l2loopback"
];
boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/a7d4b697-fffa-4bcb-9dd7-cbbd6121a50c";
device = "/dev/disk/by-uuid/a7d4b697-fffa-4bcb-9dd7-cbbd6121a50c"; fsType = "xfs";
fsType = "xfs"; };
};
boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/be82b184-3cc7-483b-9069-f7797f51c853"; boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/be82b184-3cc7-483b-9069-f7797f51c853";
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/DC0C-AAB3";
device = "/dev/disk/by-uuid/DC0C-AAB3"; fsType = "vfat";
fsType = "vfat"; };
};
swapDevices = swapDevices = [ { device = "/dev/disk/by-uuid/2284e9c6-c168-4d4f-ba6a-d270f1ae245d"; } ];
[{ device = "/dev/disk/by-uuid/2284e9c6-c168-4d4f-ba6a-d270f1ae245d"; }];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # 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 # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@ -1,22 +1,25 @@
{ pkgs, ... }: { { pkgs, ... }:
environment.systemPackages = with pkgs; [ {
nfs-utils environment.systemPackages = with pkgs; [ nfs-utils ];
];
services.rpcbind.enable = true; services.rpcbind.enable = true;
systemd.mounts = [{ systemd.mounts = [
type = "nfs"; {
mountConfig = { type = "nfs";
Options = "rw,soft,noatime"; mountConfig = {
}; Options = "rw,soft,noatime";
what = "nas.home.2rjus.net:/mnt/hdd-pool/media"; };
where = "/mnt/nas/media"; what = "nas.home.2rjus.net:/mnt/hdd-pool/media";
}]; where = "/mnt/nas/media";
}
];
systemd.automounts = [{ systemd.automounts = [
wantedBy = [ "multi-user.target" ]; {
automountConfig = { wantedBy = [ "multi-user.target" ];
TimeoutIdleSec = "5min"; automountConfig = {
}; TimeoutIdleSec = "5min";
where = "/mnt/nas/media"; };
}]; where = "/mnt/nas/media";
}
];
} }

View File

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
services.ollama = { services.ollama = {
enable = true; enable = true;
acceleration = "cuda"; acceleration = "cuda";

View File

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
environment.shells = with pkgs; [ zsh ]; environment.shells = with pkgs; [ zsh ];
services.xserver.desktopManager.xfce.enable = true; services.xserver.desktopManager.xfce.enable = true;

View File

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

View File

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
{ {
imports = [ ./hardware-configuration.nix ]; imports = [ ./hardware-configuration.nix ];
@ -19,14 +24,14 @@
enable = true; enable = true;
configurationLimit = 3; configurationLimit = 3;
}; };
boot.loader.efi = { canTouchEfiVariables = true; }; boot.loader.efi = {
canTouchEfiVariables = true;
};
boot.initrd.systemd.enable = true; boot.initrd.systemd.enable = true;
boot.plymouth = { boot.plymouth = {
enable = true; enable = true;
themePackages = with pkgs; [ themePackages = with pkgs; [ catppuccin-plymouth ];
catppuccin-plymouth
];
theme = "catppuccin-macchiato"; theme = "catppuccin-macchiato";
extraConfig = '' extraConfig = ''
UseFirmwareBackground=false UseFirmwareBackground=false
@ -62,11 +67,15 @@
"bluez5.enable-sbc-xq" = true; "bluez5.enable-sbc-xq" = true;
"bluez5.enable-msbc" = true; "bluez5.enable-msbc" = true;
"bluez5.enable-hw-volume" = true; "bluez5.enable-hw-volume" = true;
"bluez5.roles" = [ "hsp_hs" "hsp_ag" "hfp_hf" "hfp_ag" ]; "bluez5.roles" = [
"hsp_hs"
"hsp_ag"
"hfp_hf"
"hfp_ag"
];
}; };
}; };
# Setup hyprland # Setup hyprland
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.displayManager = { services.xserver.displayManager = {
@ -102,17 +111,26 @@
xdg.portal = { xdg.portal = {
enable = true; enable = true;
xdgOpenUsePortal = true; xdgOpenUsePortal = true;
extraPortals = (with pkgs; [ extraPortals = (
# xdg-desktop-portal-hyprland with pkgs;
xdg-desktop-portal-gtk [
]); # xdg-desktop-portal-hyprland
xdg-desktop-portal-gtk
]
);
}; };
programs.steam.enable = true; programs.steam.enable = true;
# Enable flakes # Enable flakes
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [
nix.settings.trusted-users = [ "root" "torjus" ]; "nix-command"
"flakes"
];
nix.settings.trusted-users = [
"root"
"torjus"
];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
# Install system-wide packages # Install system-wide packages

View File

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

View File

@ -1,35 +1,42 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: {
config,
lib,
pkgs,
modulesPath,
...
}:
{ {
imports = imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
[
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ]; boot.initrd.availableKernelModules = [
"xhci_pci"
"thunderbolt"
"nvme"
"usb_storage"
"sd_mod"
"sdhci_pci"
];
boot.initrd.kernelModules = [ "i915" ]; boot.initrd.kernelModules = [ "i915" ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/31b20f4c-24bb-4fd1-9a3e-8ccc19fe3d64";
device = "/dev/disk/by-uuid/31b20f4c-24bb-4fd1-9a3e-8ccc19fe3d64"; fsType = "xfs";
fsType = "xfs"; };
};
boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/4bbadd2c-94dd-4d80-94bf-9332d24b57bd"; boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/4bbadd2c-94dd-4d80-94bf-9332d24b57bd";
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/7FF3-B061";
device = "/dev/disk/by-uuid/7FF3-B061"; fsType = "vfat";
fsType = "vfat"; };
};
swapDevices = swapDevices = [ { device = "/dev/disk/by-uuid/6f2c4906-ad88-4d7e-88ec-61cdda41ce28"; } ];
[{ device = "/dev/disk/by-uuid/6f2c4906-ad88-4d7e-88ec-61cdda41ce28"; }];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # 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 # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
{ {
imports = [ ./hardware-configuration.nix ]; imports = [ ./hardware-configuration.nix ];
@ -9,7 +14,6 @@
sops.age.generateKey = true; sops.age.generateKey = true;
sops.secrets."gotify_tokens/backup-home" = { }; sops.secrets."gotify_tokens/backup-home" = { };
# Bootloader stuff # Bootloader stuff
boot.kernelParams = [ boot.kernelParams = [
"quiet" "quiet"
@ -20,7 +24,9 @@
enable = true; enable = true;
configurationLimit = 10; configurationLimit = 10;
}; };
boot.loader.efi = { canTouchEfiVariables = true; }; boot.loader.efi = {
canTouchEfiVariables = true;
};
# Networking stuff # Networking stuff
networking.hostName = "prismo"; # Define your hostname. networking.hostName = "prismo"; # Define your hostname.
@ -65,14 +71,20 @@
xdg.portal = { xdg.portal = {
enable = true; enable = true;
xdgOpenUsePortal = true; xdgOpenUsePortal = true;
extraPortals = (with pkgs; [ extraPortals = (
xdg-desktop-portal-hyprland with pkgs;
xdg-desktop-portal-gtk [
]); xdg-desktop-portal-hyprland
xdg-desktop-portal-gtk
]
);
}; };
# Enable flakes # Enable flakes
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [
"nix-command"
"flakes"
];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
# Install system-wide packages # Install system-wide packages

View File

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

View File

@ -1,19 +1,29 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: {
config,
lib,
pkgs,
modulesPath,
...
}:
{ {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot = { boot = {
initrd = { initrd = {
availableKernelModules = availableKernelModules = [
[ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; "xhci_pci"
"ahci"
"usb_storage"
"sd_mod"
"rtsx_pci_sdmmc"
];
kernelModules = [ ]; kernelModules = [ ];
luks.devices."cryptroot".device = luks.devices."cryptroot".device = "/dev/disk/by-uuid/f71b0ace-f38f-435f-a07a-007f9cfe4919";
"/dev/disk/by-uuid/f71b0ace-f38f-435f-a07a-007f9cfe4919";
}; };
kernelModules = [ "kvm-intel" ]; kernelModules = [ "kvm-intel" ];
extraModulePackages = [ ]; extraModulePackages = [ ];
@ -29,8 +39,7 @@
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = 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 # 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 # (the default) this is the recommended approach. When using systemd-networkd it's
@ -41,6 +50,5 @@
# networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

View File

@ -1,4 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: {
lib,
buildGoModule,
fetchFromGitHub,
installShellFiles,
}:
buildGoModule rec { buildGoModule rec {
pname = "openpomodoro-cli"; pname = "openpomodoro-cli";
@ -13,7 +18,10 @@ buildGoModule rec {
vendorHash = "sha256-BR9d/PMQ1ZUYWSDO5ID2bkTN+A+VbaLTlz5t0vbkO60="; vendorHash = "sha256-BR9d/PMQ1ZUYWSDO5ID2bkTN+A+VbaLTlz5t0vbkO60=";
ldflags = [ "-s" "-w" ]; ldflags = [
"-s"
"-w"
];
GOWORK = "off"; GOWORK = "off";

View File

@ -1,10 +1,18 @@
{ pkgs, ... }: { { pkgs, ... }:
{
environment.systemPackages = with pkgs; [ twemoji-color-font ]; environment.systemPackages = with pkgs; [ twemoji-color-font ];
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
fira-code fira-code
fira-code-symbols fira-code-symbols
font-awesome font-awesome
(nerdfonts.override { fonts = [ "JetBrainsMono" "FiraCode" "DroidSansMono" "DejaVuSansMono" ]; }) (nerdfonts.override {
fonts = [
"JetBrainsMono"
"FiraCode"
"DroidSansMono"
"DejaVuSansMono"
];
})
noto-fonts noto-fonts
noto-fonts-cjk noto-fonts-cjk
noto-fonts-emoji noto-fonts-emoji

View File

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
services.fwupd = { services.fwupd = {
enable = true; enable = true;
}; };

View File

@ -29,5 +29,9 @@
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
}; };
networking.firewall.allowedTCPPorts = [ 9100 9558 8989 ]; networking.firewall.allowedTCPPorts = [
9100
9558
8989
];
} }

View File

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
# Enable sudo # Enable sudo
security.sudo = { security.sudo = {
enable = true; enable = true;

View File

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
services = { services = {
dbus.enable = true; dbus.enable = true;
pipewire = { pipewire = {

View File

@ -21,7 +21,6 @@
"libvirtd" "libvirtd"
]; ];
# Install some user packages # Install some user packages
packages = with pkgs; [ packages = with pkgs; [ ];
];
}; };
} }