Superredstone/nixos
1
0
Fork 0
mirror of https://github.com/Superredstone/nixos.git synced 2026-03-08 04:38:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor with nixfmt

Browse Source
This commit is contained in:
Patrick Canal
2026-02-06 08:36:47 +01:00
parent fe643f065b
commit 82e4ea3c73
41 changed files with 1259 additions and 1112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
flake.nix
View File

@@ -18,7 +18,15 @@
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
}; };
outputs = { nixpkgs, home-manager, nixvim, millennium, nur, ... }@inputs: outputs =
{
nixpkgs,
home-manager,
nixvim,
millennium,
nur,
...
}@inputs:
let let
overlays = [ overlays = [
millennium.overlays.default millennium.overlays.default
@@ -34,7 +42,8 @@
nur nur
inputs inputs
nixpkgs nixpkgs
home-manager; home-manager
;
}; };
in in
{ {

16
home/default.nix
View File

@@ -1,4 +1,9 @@
{ currentSystemUser, currentSystemDe, pkgs, ... }: {
currentSystemUser,
currentSystemDe,
pkgs,
...
}:
{ {
imports = [ imports = [
./fish.nix ./fish.nix
@@ -8,9 +13,14 @@
./mangohud.nix ./mangohud.nix
./tmux.nix ./tmux.nix
./zoxide.nix ./zoxide.nix
] ++ (if currentSystemDe == "hyprland" then [ ]
++ (
if currentSystemDe == "hyprland" then
[
./hyprland ./hyprland
] else [] ]
else
[ ]
); );
home = { home = {

21
home/hyprland/hyprland.nix
View File

@@ -37,16 +37,19 @@
",XF86AudioRaiseVolume, exec, pamixer -i 2" ",XF86AudioRaiseVolume, exec, pamixer -i 2"
"$mod, delete, exit" "$mod, delete, exit"
] ++ ( ]
builtins.concatLists (builtins.genList (i: ++ (builtins.concatLists (
let ws = i + 1; builtins.genList (
in [ i:
let
ws = i + 1;
in
[
"$mod, code:1${toString i}, workspace, ${toString ws}" "$mod, code:1${toString i}, workspace, ${toString ws}"
"$mod SHIFT, code:1${toString i}, movetoworkspace, ${toString ws}" "$mod SHIFT, code:1${toString i}, movetoworkspace, ${toString ws}"
] ]
) ) 9
9) ));
);
bindm = [ bindm = [
"$mod, mouse:272, movewindow" "$mod, mouse:272, movewindow"
"$mod, mouse:273, resizewindow" "$mod, mouse:273, resizewindow"
@@ -76,8 +79,8 @@
services.hyprpaper = { services.hyprpaper = {
enable = true; enable = true;
settings = { settings = {
preload = ["/home/${currentSystemUser}/Pictures/wallpaper.jpg"]; preload = [ "/home/${currentSystemUser}/Pictures/wallpaper.jpg" ];
wallpaper = [",/home/${currentSystemUser}/Pictures/wallpaper.jpg"]; wallpaper = [ ",/home/${currentSystemUser}/Pictures/wallpaper.jpg" ];
}; };
}; };
} }

260
home/hyprland/waybar.nix
View File

@@ -46,7 +46,11 @@
phone = ""; phone = "";
portable = ""; portable = "";
car = ""; car = "";
default = ["🕨" "🕩" "🕪"]; default = [
"🕨"
"🕩"
"🕪"
];
}; };
on-click = "pavucontrol"; on-click = "pavucontrol";
}; };
@@ -111,263 +115,263 @@
}; };
style = '' style = ''
@define-color rosewater #f5e0dc; @define-color rosewater #f5e0dc;
@define-color flamingo #f2cdcd; @define-color flamingo #f2cdcd;
@define-color pink #f5c2e7; @define-color pink #f5c2e7;
@define-color mauve #cba6f7; @define-color mauve #cba6f7;
@define-color red #f38ba8; @define-color red #f38ba8;
@define-color maroon #eba0ac; @define-color maroon #eba0ac;
@define-color peach #fab387; @define-color peach #fab387;
@define-color yellow #f9e2af; @define-color yellow #f9e2af;
@define-color green #a6e3a1; @define-color green #a6e3a1;
@define-color teal #94e2d5; @define-color teal #94e2d5;
@define-color sky #89dceb; @define-color sky #89dceb;
@define-color sapphire #74c7ec; @define-color sapphire #74c7ec;
@define-color blue #89b4fa; @define-color blue #89b4fa;
@define-color lavender #b4befe; @define-color lavender #b4befe;
@define-color text #cdd6f4; @define-color text #cdd6f4;
@define-color subtext1 #bac2de; @define-color subtext1 #bac2de;
@define-color subtext0 #a6adc8; @define-color subtext0 #a6adc8;
@define-color overlay2 #9399b2; @define-color overlay2 #9399b2;
@define-color overlay1 #7f849c; @define-color overlay1 #7f849c;
@define-color overlay0 #6c7086; @define-color overlay0 #6c7086;
@define-color surface2 #585b70; @define-color surface2 #585b70;
@define-color surface1 #45475a; @define-color surface1 #45475a;
@define-color surface0 #313244; @define-color surface0 #313244;
@define-color base #1e1e2e; @define-color base #1e1e2e;
@define-color mantle #181825; @define-color mantle #181825;
@define-color crust #11111b; @define-color crust #11111b;
* { * {
border: none; border: none;
border-radius: 1px; border-radius: 1px;
font-family: JetBrainsMono Nerd Font; font-family: JetBrainsMono Nerd Font;
font-size: 13px; font-size: 13px;
min-height: 0; min-height: 0;
} }
window#waybar { window#waybar {
background-color: @mantle; background-color: @mantle;
color: @text; color: @text;
} }
window#waybar.hidden { window#waybar.hidden {
opacity: 0.2; opacity: 0.2;
} }
tooltip { tooltip {
background-color: @base; background-color: @base;
border: 1px solid @surface1; border: 1px solid @surface1;
} }
tooltip label { tooltip label {
color: @text; color: @text;
} }
button { button {
box-shadow: inset 0 -3px transparent; box-shadow: inset 0 -3px transparent;
border: none; border: none;
border-radius: 1px; border-radius: 1px;
} }
button:hover { button:hover {
background: inherit; background: inherit;
box-shadow: inset 0 -3px @text; box-shadow: inset 0 -3px @text;
} }
#workspaces button { #workspaces button {
padding: 0 0; padding: 0 0;
background-color: @mantle; background-color: @mantle;
color: @text; color: @text;
} }
#workspaces button:hover { #workspaces button:hover {
box-shadow: inherit; box-shadow: inherit;
text-shadow: inherit; text-shadow: inherit;
background-image: linear-gradient(0deg, @surface1, @mantle); background-image: linear-gradient(0deg, @surface1, @mantle);
} }
#workspaces button.focused { #workspaces button.focused {
background-image: linear-gradient(0deg, @mauve, @surface1); background-image: linear-gradient(0deg, @mauve, @surface1);
box-shadow: inset 0 -3px @text; box-shadow: inset 0 -3px @text;
} }
#workspaces button.urgent { #workspaces button.urgent {
background-image: linear-gradient(0deg, @red, @mantle); background-image: linear-gradient(0deg, @red, @mantle);
} }
#taskbar button.active { #taskbar button.active {
background-image: linear-gradient(0deg, @surface1, @mantle); background-image: linear-gradient(0deg, @surface1, @mantle);
} }
#mode { #mode {
background-color: @base; background-color: @base;
box-shadow: inset 0 -2px @text; box-shadow: inset 0 -2px @text;
} }
#mpris, #mpris,
#custom-weather, #custom-weather,
#clock, #clock,
#language, #language,
#pulseaudio, #pulseaudio,
#bluetooth, #bluetooth,
#network, #network,
#memory, #memory,
#cpu, #cpu,
#temperature, #temperature,
#disk, #disk,
#custom-kernel, #custom-kernel,
#idle_inhibitor, #idle_inhibitor,
#scratchpad, #scratchpad,
#mode, #mode,
#power-profiles-daemon, #power-profiles-daemon,
#backlight, #backlight,
#battery, #battery,
#tray { #tray {
padding: 0 10px; padding: 0 10px;
margin: 5px 1px; margin: 5px 1px;
color: @text; color: @text;
} }
#window, #window,
#workspaces { #workspaces {
margin: 0 4px; margin: 0 4px;
} }
#power-profiles-daemon { #power-profiles-daemon {
background-color: @red; background-color: @red;
color: @base; color: @base;
} }
#custom-weather { #custom-weather {
background-color: @teal; background-color: @teal;
color: @mantle; color: @mantle;
margin-right: 5px; margin-right: 5px;
} }
#custom-kernel { #custom-kernel {
background-color: @rosewater; background-color: @rosewater;
color: @mantle; color: @mantle;
} }
#clock { #clock {
background-color: @green; background-color: @green;
color: @mantle; color: @mantle;
} }
@keyframes blink { @keyframes blink {
to { to {
background-color: @mantle; background-color: @mantle;
color: @text; color: @text;
} }
} }
label:focus { label:focus {
background-color: @mantle; background-color: @mantle;
} }
#cpu { #cpu {
background-color: @mauve; background-color: @mauve;
color: @mantle; color: @mantle;
min-width: 45px; min-width: 45px;
} }
#memory { #memory {
background-color: @red; background-color: @red;
color: @mantle; color: @mantle;
} }
#disk { #disk {
background-color: @flamingo; background-color: @flamingo;
color: @mantle; color: @mantle;
} }
#battery { #battery {
background-color: @mauve; background-color: @mauve;
color: @base; color: @base;
} }
#backlight { #backlight {
background-color: @sky; background-color: @sky;
color: @base; color: @base;
} }
#network { #network {
background-color: @peach; background-color: @peach;
color: @mantle; color: @mantle;
} }
#network.disconnected { #network.disconnected {
background-color: red; background-color: red;
color: @mantle; color: @mantle;
} }
#bluetooth { #bluetooth {
background-color: @maroon; background-color: @maroon;
color: @mantle; color: @mantle;
min-width: 40px; min-width: 40px;
} }
#pulseaudio { #pulseaudio {
background-color: @yellow; background-color: @yellow;
color: @mantle; color: @mantle;
} }
#pulseaudio.muted { #pulseaudio.muted {
background-color: red; background-color: red;
color: @mantle; color: @mantle;
} }
#temperature { #temperature {
background-color: @pink; background-color: @pink;
color: @mantle; color: @mantle;
min-width: 37px; min-width: 37px;
} }
#temperature.critical { #temperature.critical {
background-color: red; background-color: red;
color: @mantle; color: @mantle;
min-width: 37px; min-width: 37px;
} }
#mpris { #mpris {
background-color: @base; background-color: @base;
color: @text; color: @text;
} }
#tray { #tray {
background-color: @overlay0; background-color: @overlay0;
color: @text; color: @text;
} }
#tray > .passive { #tray > .passive {
-gtk-icon-effect: dim; -gtk-icon-effect: dim;
} }
#tray > .needs-attention { #tray > .needs-attention {
-gtk-icon-effect: highlight; -gtk-icon-effect: highlight;
background-color: @mantle; background-color: @mantle;
} }
#idle_inhibitor { #idle_inhibitor {
background-color: @base; background-color: @base;
color: @text; color: @text;
font-family: Inter; font-family: Inter;
} }
#idle_inhibitor.activated { #idle_inhibitor.activated {
background-color: @text; background-color: @text;
color: @base; color: @base;
} }
#scratchpad { #scratchpad {
background-color: @base; background-color: @base;
color: @text; color: @text;
} }
#scratchpad.empty { #scratchpad.empty {
background-color: transparent; background-color: transparent;
} }
''; '';
}; };
} }

3
home/kitty.nix
View File

@@ -12,7 +12,6 @@
size = 16; size = 16;
}; };
themeFile = "Catppuccin-Mocha"; themeFile = "Catppuccin-Mocha";
extraConfig = '' extraConfig = " ";
'';
}; };
} }

2
home/zoxide.nix
View File

@@ -2,7 +2,7 @@
{ {
programs.zoxide = { programs.zoxide = {
enable = true; enable = true;
enableFishIntegration= true; enableFishIntegration = true;
options = [ options = [
"--cmd cd" "--cmd cd"
]; ];

6
lib/mksystem.nix
View File

@@ -16,7 +16,7 @@ name:
gamingSystem ? false, gamingSystem ? false,
workSystem ? false, workSystem ? false,
desktopEnvironment ? "", desktopEnvironment ? "",
additionalModules ? [], additionalModules ? [ ],
}: }:
let let
nixConfig = ../modules/nix-config/default.nix; nixConfig = ../modules/nix-config/default.nix;
@@ -61,6 +61,6 @@ nixpkgs.lib.nixosSystem {
]; ];
} }
machineConfig machineConfig
] ++ additionalModules; ]
++ additionalModules;
} }

1
lib/resolve-inputs.nix
View File

@@ -13,4 +13,3 @@ in
home-manager = home-manager.nixosModules; home-manager = home-manager.nixosModules;
inherit (import nixpkgs { inherit system; }) lib; inherit (import nixpkgs { inherit system; }) lib;
} }

33
machines/bomba/hardware.nix
View File

@@ -1,27 +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, modulesPath, ... }: {
config,
lib,
modulesPath,
...
}:
{ {
imports = imports = [
[ (modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"nvme"
"usb_storage"
"usbhid"
"sd_mod"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ]; boot.kernelModules = [ ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/a1939342-f36b-4902-b659-71b468b5e64b"; device = "/dev/disk/by-uuid/a1939342-f36b-4902-b659-71b468b5e64b";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/6132-EE01"; device = "/dev/disk/by-uuid/6132-EE01";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = [
"fmask=0077"
"dmask=0077"
];
}; };
swapDevices = [ ]; swapDevices = [ ];

3
machines/katana/boot.nix
View File

@@ -5,7 +5,8 @@
loader.efi.canTouchEfiVariables = true; loader.efi.canTouchEfiVariables = true;
loader.systemd-boot.configurationLimit = 10; loader.systemd-boot.configurationLimit = 10;
initrd = { initrd = {
luks.devices."luks-563ebcd9-614b-460f-af9a-5cf1d9c8bef5".device = "/dev/disk/by-uuid/563ebcd9-614b-460f-af9a-5cf1d9c8bef5"; luks.devices."luks-563ebcd9-614b-460f-af9a-5cf1d9c8bef5".device =
"/dev/disk/by-uuid/563ebcd9-614b-460f-af9a-5cf1d9c8bef5";
verbose = false; verbose = false;
systemd.enable = true; systemd.enable = true;
}; };

40
machines/katana/hardware.nix
View File

@@ -1,33 +1,49 @@
# 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, modulesPath, ... }: {
config,
lib,
modulesPath,
...
}:
{ {
imports = imports = [
[ (modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [
"vmd"
"xhci_pci"
"nvme"
"usbhid"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/mapper/luks-1a5ef40f-3c13-4efb-ae65-da42d4bf30ef"; device = "/dev/mapper/luks-1a5ef40f-3c13-4efb-ae65-da42d4bf30ef";
fsType = "ext4"; fsType = "ext4";
}; };
boot.initrd.luks.devices."luks-1a5ef40f-3c13-4efb-ae65-da42d4bf30ef".device = "/dev/disk/by-uuid/1a5ef40f-3c13-4efb-ae65-da42d4bf30ef"; boot.initrd.luks.devices."luks-1a5ef40f-3c13-4efb-ae65-da42d4bf30ef".device =
"/dev/disk/by-uuid/1a5ef40f-3c13-4efb-ae65-da42d4bf30ef";
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/1A33-9EC1"; device = "/dev/disk/by-uuid/1A33-9EC1";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = [
"fmask=0077"
"dmask=0077"
];
}; };
swapDevices = swapDevices = [
[ { device = "/dev/mapper/luks-563ebcd9-614b-460f-af9a-5cf1d9c8bef5"; } { device = "/dev/mapper/luks-563ebcd9-614b-460f-af9a-5cf1d9c8bef5"; }
]; ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

2
machines/katana/services.nix
View File

@@ -5,6 +5,6 @@
printing.enable = true; printing.enable = true;
# Required for piper to work # Required for piper to work
ratbagd.enable = true; ratbagd.enable = true;
xserver.videoDrivers = ["nvidia"]; xserver.videoDrivers = [ "nvidia" ];
}; };
} }

37
machines/workstation/hardware.nix
View File

@@ -1,29 +1,46 @@
# 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, modulesPath, ... }: {
config,
lib,
modulesPath,
...
}:
{ {
imports = imports = [
[ (modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ]; boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"nvme"
"usbhid"
"usb_storage"
"sd_mod"
"rtsx_usb_sdmmc"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/b8f99588-490c-47a4-ad8b-dfbe27ced16c"; device = "/dev/disk/by-uuid/b8f99588-490c-47a4-ad8b-dfbe27ced16c";
fsType = "ext4"; fsType = "ext4";
}; };
boot.initrd.luks.devices."luks-a4dcf57a-8925-41a8-bac6-1cfd08a90f0b".device = "/dev/disk/by-uuid/a4dcf57a-8925-41a8-bac6-1cfd08a90f0b"; boot.initrd.luks.devices."luks-a4dcf57a-8925-41a8-bac6-1cfd08a90f0b".device =
"/dev/disk/by-uuid/a4dcf57a-8925-41a8-bac6-1cfd08a90f0b";
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/C0E2-037E"; device = "/dev/disk/by-uuid/C0E2-037E";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = [
"fmask=0077"
"dmask=0077"
];
}; };
swapDevices = [ ]; swapDevices = [ ];

5
machines/workstation/networking.nix
View File

@@ -4,6 +4,9 @@
networkmanager.enable = true; networkmanager.enable = true;
firewall.allowedUDPPorts = [ 8000 ]; firewall.allowedUDPPorts = [ 8000 ];
firewall.allowedTCPPorts = [ 8000 ]; firewall.allowedTCPPorts = [ 8000 ];
nameservers = [ "1.1.1.1" "1.0.0.1" ]; nameservers = [
"1.1.1.1"
"1.0.0.1"
];
}; };
} }

13
modules/nix-config/de.nix
View File

@@ -1,4 +1,9 @@
{ pkgs, lib, currentSystemDe, ... }: {
pkgs,
lib,
currentSystemDe,
...
}:
{ {
services = { services = {
xserver.enable = true; xserver.enable = true;
@@ -49,6 +54,10 @@
programs.kdeconnect = lib.mkIf (currentSystemDe != "none") { programs.kdeconnect = lib.mkIf (currentSystemDe != "none") {
enable = true; enable = true;
package = if (currentSystemDe == "gnome") then pkgs.gnomeExtensions.gsconnect else pkgs.kdePackages.kdeconnect-kde; package =
if (currentSystemDe == "gnome") then
pkgs.gnomeExtensions.gsconnect
else
pkgs.kdePackages.kdeconnect-kde;
}; };
} }

22
modules/nix-config/default.nix
View File

@@ -1,14 +1,25 @@
{ pkgs, currentSystemUser, currentSystemDe, ... }: {
pkgs,
currentSystemUser,
currentSystemDe,
...
}:
{ {
imports = [ imports = [
./keyboard.nix ./keyboard.nix
./security.nix ./security.nix
./services.nix ./services.nix
] ++ (if (currentSystemDe != "none") then [ ]
++ (
if (currentSystemDe != "none") then
[
./de.nix ./de.nix
./fonts.nix ./fonts.nix
./sound.nix ./sound.nix
] else []); ]
else
[ ]
);
time.timeZone = "Europe/Rome"; time.timeZone = "Europe/Rome";
@@ -42,7 +53,10 @@
shell = pkgs.fish; shell = pkgs.fish;
}; };
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [
"nix-command"
"flakes"
];
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides = pkgs: {
nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/main.tar.gz") { nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/main.tar.gz") {
inherit pkgs; inherit pkgs;

67
modules/packages.nix
View File

@@ -1,4 +1,10 @@
{ pkgs, gamingSystem, workSystem, currentSystemDe, ... }@ inputs: {
pkgs,
gamingSystem,
workSystem,
currentSystemDe,
...
}@inputs:
{ {
imports = [ imports = [
./programs ./programs
@@ -6,7 +12,9 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
environment.systemPackages = with pkgs; [ environment.systemPackages =
with pkgs;
[
# CLI utils # CLI utils
appimage-run appimage-run
bat bat
@@ -53,7 +61,10 @@
vim # The only and one great editor vim # The only and one great editor
inputs.nixvim.packages.${stdenv.hostPlatform.system}.default # The only and one great editor improved even further inputs.nixvim.packages.${stdenv.hostPlatform.system}.default # The only and one great editor improved even further
] ++ (if currentSystemDe != "none" then [ ]
++ (
if currentSystemDe != "none" then
[
# Video card # Video card
vulkan-tools vulkan-tools
@@ -70,8 +81,13 @@
spotube spotube
telegram-desktop telegram-desktop
thunderbird thunderbird
] else []) ]
++ (if gamingSystem then [ else
[ ]
)
++ (
if gamingSystem then
[
cura-appimage cura-appimage
discord discord
heroic heroic
@@ -81,29 +97,52 @@
prismlauncher prismlauncher
protonplus protonplus
satisfactorymodmanager satisfactorymodmanager
] else []) ]
++ (if workSystem then [ else
[ ]
)
++ (
if workSystem then
[
android-studio android-studio
ansible ansible
virt-manager virt-manager
] else []) ]
++ (if currentSystemDe == "plasma" then [ else
[ ]
)
++ (
if currentSystemDe == "plasma" then
[
kdePackages.wallpaper-engine-plugin kdePackages.wallpaper-engine-plugin
] else []) ]
++ (if currentSystemDe == "hyprland" then [ else
[ ]
)
++ (
if currentSystemDe == "hyprland" then
[
# Hyprland # Hyprland
brightnessctl brightnessctl
hyprpaper hyprpaper
pamixer pamixer
pavucontrol pavucontrol
kdePackages.dolphin kdePackages.dolphin
] else []) ]
++ (if currentSystemDe == "gnome" then [ else
[ ]
)
++ (
if currentSystemDe == "gnome" then
[
gnome-tweaks gnome-tweaks
gnomeExtensions.appindicator gnomeExtensions.appindicator
gnomeExtensions.caffeine gnomeExtensions.caffeine
gnomeExtensions.dash-to-dock gnomeExtensions.dash-to-dock
gnomeExtensions.wallpaper-slideshow gnomeExtensions.wallpaper-slideshow
] else []); ]
else
[ ]
);
} }

15
modules/programs/default.nix
View File

@@ -1,4 +1,9 @@
{ pkgs, gamingSystem, currentSystemDe, ... }: {
pkgs,
gamingSystem,
currentSystemDe,
...
}:
{ {
imports = [ imports = [
./nordvpn.nix ./nordvpn.nix
@@ -9,11 +14,15 @@
enable = true; enable = true;
capSysNice = true; capSysNice = true;
}; };
steam = if gamingSystem then { steam =
if gamingSystem then
{
enable = true; enable = true;
# package = pkgs.steam-millennium; # package = pkgs.steam-millennium;
remotePlay.openFirewall = true; remotePlay.openFirewall = true;
} else {}; }
else
{ };
gnupg.agent = { gnupg.agent = {
enable = true; enable = true;
pinentryPackage = pkgs.pinentry-tty; pinentryPackage = pkgs.pinentry-tty;

2
modules/programs/nordvpn.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... } @ inputs: { pkgs, ... }@inputs:
{ {
imports = [ imports = [
inputs.nur.modules.nixos.default inputs.nur.modules.nixos.default