lytedev/nix
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

maybe working

Browse source
This commit is contained in:
Daniel Flanagan 2024-01-09 16:46:31 -06:00
parent 48932dc77e
commit 9a5ffa2f0b
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
9 changed files with 248 additions and 224 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -285,11 +285,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1704194953, "lastModified": 1704538339,
"narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
modules/nixos/avahi.nix
View file

@ -4,6 +4,8 @@
enable = true; enable = true;
reflector = true; reflector = true;
openFirewall = true; openFirewall = true;
nssmdns4 = true; # nssmdns4 = true;
# nssmdns6 = true;
nssmdns = true;
}; };
} }

15
modules/nixos/common.nix
View file

@ -18,7 +18,7 @@
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
] ]
++ (with outputs.nixosModules; [ ++ (with outputs.nixosModules; [
avahi # avahi
daniel daniel
]); ]);
@ -34,8 +34,7 @@
MANPAGER = "less"; MANPAGER = "less";
}; };
systemPackages = with pkgs; systemPackages = with pkgs; [
[
# age # age
# bat # bat
# bc # bc
@ -80,14 +79,10 @@
wget wget
# xh # xh
zellij zellij
inputs.home-manager.packages.${system}.home-manager
inputs.helix.packages.${system}.helix
# zstd # zstd
] ];
++ (with inputs.home-manager.packages.${system}; [
home-manager
])
++ (with inputs.helix.packages.${system}; [
helix
]);
}; };
users.groups.daniel = {}; users.groups.daniel = {};

1
modules/nixos/default.nix
View file

@ -17,6 +17,7 @@ with builtins;
"user-installed-applications" "user-installed-applications"
"wifi" "wifi"
"gnome" "gnome"
"kde"
"kde-connect" "kde-connect"
"printing" "printing"
"avahi" "avahi"

253
modules/nixos/desktop-usage.nix
View file

@ -6,7 +6,7 @@
... ...
}: { }: {
imports = [ imports = [
./sway.nix # ./sway.nix
# ./hyprland.nix # ./hyprland.nix
# ./plasma.nix # ./plasma.nix
# ./gnome.nix # ./gnome.nix
@ -17,134 +17,131 @@
nixpkgs.overlays = [outputs.overlays.modifications]; nixpkgs.overlays = [outputs.overlays.modifications];
# fonts.packages if unstable? # fonts.packages if unstable?
fonts.packages = with pkgs; fonts.packages = with pkgs; [
[
(nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];}) (nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
] iosevka
++ (with inputs.nixpkgs.legacyPackages.${system}; [ ];
(iosevka.override { # fonts.packages =
set = "lyteterm"; # with pkgs; [
privateBuildPlan = '' # (nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
[buildPlans.iosevka-lyteterm] # ]
family = "IosevkaLyteTerm" # ++ (with inputs.nixpkgs.legacyPackages.${system}; [
spacing = "fontconfig-mono" # (iosevka.override {
serifs = "sans" # set = "lyteterm";
export-glyph-names = true # privateBuildPlan = ''
# [buildPlans.iosevka-lyteterm]
[buildPlans.iosevka-lyteterm.ligations] # family = "IosevkaLyteTerm"
inherits = "dlig" # spacing = "fontconfig-mono"
disables = [ "exeqeqeq", "exeqeq", "exeqeq-dl", "exeq", "ineq", "connected-underscore", "connected-tilde-as-wave" ] # serifs = "sans"
# export-glyph-names = true
[buildPlans.iosevka-lyteterm.weights.regular] # [buildPlans.iosevka-lyteterm.ligations]
shape = 400 # inherits = "dlig"
menu = 400 # disables = [ "exeqeqeq", "exeqeq", "exeqeq-dl", "exeq", "ineq", "connected-underscore", "connected-tilde-as-wave" ]
css = 400 # [buildPlans.iosevka-lyteterm.weights.regular]
# shape = 400
[buildPlans.iosevka-lyteterm.weights.book] # menu = 400
shape = 450 # css = 400
menu = 450 # [buildPlans.iosevka-lyteterm.weights.book]
css = 450 # shape = 450
# menu = 450
[buildPlans.iosevka-lyteterm.weights.bold] # css = 450
shape = 700 # [buildPlans.iosevka-lyteterm.weights.bold]
menu = 700 # shape = 700
css = 700 # menu = 700
# css = 700
[buildPlans.iosevka-lyteterm.weights.black] # [buildPlans.iosevka-lyteterm.weights.black]
shape = 900 # shape = 900
menu = 900 # menu = 900
css = 900 # css = 900
# # [[buildPlans.iosevka-lyteterm.compatibility-ligatures]]
# [[buildPlans.iosevka-lyteterm.compatibility-ligatures]] # # unicode = 57600 # 0xE100
# unicode = 57600 # 0xE100 # # featureTag = 'calt'
# featureTag = 'calt' # # kequence = '<*>'
# kequence = '<*>' # [buildPlans.iosevka-lyteterm.variants]
# inherits = "ss01"
[buildPlans.iosevka-lyteterm.variants] # [buildPlans.iosevka-lyteterm.variants.design]
inherits = "ss01" # capital-a = 'curly-serifless'
# capital-b = 'standard-interrupted-serifless'
[buildPlans.iosevka-lyteterm.variants.design] # capital-c = 'unilateral-inward-serifed'
capital-a = 'curly-serifless' # capital-d = 'standard-serifless'
capital-b = 'standard-interrupted-serifless' # capital-g = 'toothless-rounded-inward-serifed-hooked'
capital-c = 'unilateral-inward-serifed' # capital-i = 'serifed'
capital-d = 'standard-serifless' # capital-j = 'serifed'
capital-g = 'toothless-rounded-inward-serifed-hooked' # capital-k = 'curly-serifless'
capital-i = 'serifed' # capital-l = 'motion-serifed'
capital-j = 'serifed' # capital-m = 'hanging-serifless'
capital-k = 'curly-serifless' # capital-n = 'asymmetric-serifless'
capital-l = 'motion-serifed' # capital-p = 'open-serifless'
capital-m = 'hanging-serifless' # capital-q = 'crossing'
capital-n = 'asymmetric-serifless' # capital-r = 'standing-open-serifless'
capital-p = 'open-serifless' # capital-s = 'unilateral-inward-serifed'
capital-q = 'crossing' # capital-t = 'motion-serifed'
capital-r = 'standing-open-serifless' # capital-u = 'toothless-corner-serifless'
capital-s = 'unilateral-inward-serifed' # capital-v = 'curly-serifless'
capital-t = 'motion-serifed' # capital-w = 'curly-serifless'
capital-u = 'toothless-corner-serifless' # capital-x = 'curly-serifless'
capital-v = 'curly-serifless' # capital-y = 'curly-base-serifed'
capital-w = 'curly-serifless' # capital-z = 'curly-top-serifed-with-crossbar'
capital-x = 'curly-serifless' # a = 'double-storey-toothless-corner'
capital-y = 'curly-base-serifed' # b = 'toothless-corner-serifless'
capital-z = 'curly-top-serifed-with-crossbar' # c = 'unilateral-inward-serifed'
a = 'double-storey-toothless-corner' # d = 'toothless-corner-serifless'
b = 'toothless-corner-serifless' # e = 'flat-crossbar'
c = 'unilateral-inward-serifed' # f = 'tailed'
d = 'toothless-corner-serifless' # g = 'double-storey-open'
e = 'flat-crossbar' # # g = 'single-storey-earless-corner-flat-hook'
f = 'tailed' # h = 'straight-serifless'
g = 'double-storey-open' # i = 'tailed-serifed'
# g = 'single-storey-earless-corner-flat-hook' # j = 'serifed'
h = 'straight-serifless' # k = 'curly-serifless'
i = 'tailed-serifed' # l = 'tailed-serifed'
j = 'serifed' # m = 'earless-corner-double-arch-serifless'
k = 'curly-serifless' # n = 'earless-corner-straight-serifless'
l = 'tailed-serifed' # p = 'earless-corner-serifless'
m = 'earless-corner-double-arch-serifless' # q = 'earless-corner-diagonal-tailed-serifless'
n = 'earless-corner-straight-serifless' # r = 'earless-corner-serifless'
p = 'earless-corner-serifless' # s = 'unilateral-inward-serifed'
q = 'earless-corner-diagonal-tailed-serifless' # t = 'bent-hook-asymmetric'
r = 'earless-corner-serifless' # u = 'toothless-corner-serifless'
s = 'unilateral-inward-serifed' # v = 'curly-serifless'
t = 'bent-hook-asymmetric' # w = 'curly-serifless'
u = 'toothless-corner-serifless' # x = 'curly-serifless'
v = 'curly-serifless' # y = 'curly-turn-serifless'
w = 'curly-serifless' # z = 'curly-top-serifed-with-crossbar'
x = 'curly-serifless' # # cyrl-capital-ze = 'unilateral-inward-serifed'
y = 'curly-turn-serifless' # zero = 'reverse-slashed-split'
z = 'curly-top-serifed-with-crossbar' # one = 'base'
# cyrl-capital-ze = 'unilateral-inward-serifed' # two = 'curly-neck'
zero = 'reverse-slashed-split' # three = 'two-arcs'
one = 'base' # four = 'semi-open-non-crossing'
two = 'curly-neck' # # five = 'vertical-upper-left-bar'
three = 'two-arcs' # five = 'upright-flat'
four = 'semi-open-non-crossing' # six = 'straight-bar'
# five = 'vertical-upper-left-bar' # seven = 'curly-serifed-crossbar'
five = 'upright-flat' # eight = 'two-circles'
six = 'straight-bar' # nine = 'straight-bar'
seven = 'curly-serifed-crossbar' # tilde = 'low'
eight = 'two-circles' # asterisk = 'penta-low'
nine = 'straight-bar' # underscore = 'above-baseline'
tilde = 'low' # pilcrow = 'low'
asterisk = 'penta-low' # caret = 'low'
underscore = 'above-baseline' # paren = 'flat-arc'
pilcrow = 'low' # brace = 'curly-flat-boundary'
caret = 'low' # number-sign = 'upright-open'
paren = 'flat-arc' # ampersand = 'upper-open'
brace = 'curly-flat-boundary' # at = 'compact'
number-sign = 'upright-open' # dollar = 'interrupted'
ampersand = 'upper-open' # cent = 'open'
at = 'compact' # percent = 'rings-segmented-slash'
dollar = 'interrupted' # bar = 'force-upright'
cent = 'open' # ascii-single-quote = 'raised-comma'
percent = 'rings-segmented-slash' # ascii-grave = 'straight'
bar = 'force-upright' # question = 'smooth'
ascii-single-quote = 'raised-comma' # punctuation-dot = 'round'
ascii-grave = 'straight' # '';
question = 'smooth' # })
punctuation-dot = 'round' # ]);
''; # ;
})
]);
hardware = { hardware = {
opengl = { opengl = {

40
modules/nixos/gnome.nix
View file

@ -1,13 +1,15 @@
{pkgs, ...}: { {
pkgs,
lib,
...
}: {
imports = [./pipewire.nix]; imports = [./pipewire.nix];
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.displayManager.gdm = { services.xserver.displayManager.gdm = {
enable = true; enable = lib.mkDefault false;
}; };
hardware.pulseaudio.enable = false;
services.xserver.desktopManager.gnome = { services.xserver.desktopManager.gnome = {
enable = true; enable = true;
}; };
@ -28,6 +30,8 @@
enable = true; enable = true;
}; };
services.udev.packages = with pkgs; [gnome.gnome-settings-daemon];
environment = { environment = {
variables = { variables = {
GTK_THEME = "Catppuccin-Mocha-Compact-Sapphire-Dark"; GTK_THEME = "Catppuccin-Mocha-Compact-Sapphire-Dark";
@ -37,36 +41,12 @@
}; };
systemPackages = with pkgs; [ systemPackages = with pkgs; [
brightnessctl gnomeExtensions.appindicator
feh
# gimp
grim
# inkscape
# krita
libinput libinput
libinput-gestures libinput-gestures
libnotify libnotify
# lutris
# nil
# nixpkgs-fmt
noto-fonts noto-fonts
pamixer pavucontrol
# pavucontrol
playerctl
# pulseaudio
pulsemixer
# rclone
# restic
slurp
# steam
swaybg
swayidle
swaylock
# vlc
# vulkan-tools
waybar
# weechat
# wine
wl-clipboard wl-clipboard
zathura zathura
]; ];

36
modules/nixos/kde.nix Normal file
View file

@ -0,0 +1,36 @@
{
pkgs,
lib,
...
}: {
imports = [./pipewire.nix];
services.xserver.enable = true;
services.xserver.displayManager.sddm.enable = lib.mkDefault false;
services.xserver.desktopManager.plasma5.enable = true;
qt = {
enable = true;
platformTheme = "gnome";
style = "adwaita-dark";
};
services.gnome.gnome-keyring.enable = true;
security.pam.services.sddm.enableGnomeKeyring = true;
programs.ssh.askPassword = "${pkgs.plasma5Packages.ksshaskpass}/bin/ksshaskpass";
services.xserver.displayManager.defaultSession = "plasmawayland";
programs.dconf.enable = true;
# xdg.portal = {
# enable = true;
# wlr.enable = false;
# extraPortals = with pkgs; [
# xdg-desktop-portal-kde
# ];
# };
# hardware.pulseaudio.enable = false;
}

2
modules/nixos/pipewire.nix
View file

@ -18,6 +18,8 @@
}; };
}; };
hardware.pulseaudio.enable = false; # maybe?
security = { security = {
# I forget why I need these... # I forget why I need these...
polkit.enable = true; polkit.enable = true;

21
nixos/thablet.nix
View file

@ -4,6 +4,7 @@
outputs, outputs,
lib, lib,
config, config,
pkgs,
modulesPath, modulesPath,
... ...
}: { }: {
@ -17,12 +18,22 @@
] ]
++ (with outputs.nixosModules; [ ++ (with outputs.nixosModules; [
desktop-usage desktop-usage
gnome sway
# gnome
kde
wifi wifi
flanfam flanfam
flanfamkiosk flanfamkiosk
]); ]);
services.xserver.displayManager.gdm = {
enable = false;
};
services.xserver.displayManager.sddm.enable = false;
services.xserver.displayManager.lightdm.enable = true;
services.touchegg.enable = true;
home-manager.users.daniel = { home-manager.users.daniel = {
imports = with outputs.homeManagerModules; [ imports = with outputs.homeManagerModules; [
sway sway
@ -55,13 +66,13 @@
services.fprintd = { services.fprintd = {
# TODO: am I missing a driver? see arch wiki for this h/w # TODO: am I missing a driver? see arch wiki for this h/w
enable = true; enable = true;
# tod.enable = true; tod.enable = true;
# tod.driver = pkgs.libfprint-2-tod1-goodix; tod.driver = pkgs.libfprint-2-tod1-goodix;
}; };
environment.systemPackages = # environment.systemPackages =
#with pkgs; #with pkgs;
[]; # [];
programs.steam.enable = true; programs.steam.enable = true;
programs.steam.remotePlay.openFirewall = true; programs.steam.remotePlay.openFirewall = true;