Skip to content

Commit 4afed3f

Browse files
FlafyDevFlafyDev
committed
add glint
1 parent f9c547a commit 4afed3f

File tree

6 files changed

+241
-76
lines changed

6 files changed

+241
-76
lines changed

‎flake.in.nix

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ in
2424
mera.system = "x86_64-linux";
2525
mane.system = "x86_64-linux";
2626
bara.system = "aarch64-linux";
27+
glint.system = "x86_64-linux";
2728
# bara.inputOverrides = inputs: {
2829
# nixpkgs = inputs.nixpkgs-temp;
2930
# };

‎hosts/glint/default.nix

+104
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
{ config, pkgs, ssh, ... }:
2+
3+
{
4+
# SSH
5+
#
6+
# gnome
7+
# printer
8+
# user
9+
# cli / gui utils
10+
11+
imports = [
12+
./hardware
13+
];
14+
15+
os.nixpkgs.config.allowUnfree = true;
16+
17+
programs.ssh = {
18+
enable = true;
19+
20+
server = {
21+
enable = true;
22+
users.${config.users.main}.keyFiles = [
23+
ssh.ope.ope_to_glint.public
24+
];
25+
};
26+
};
27+
28+
users.main = "flafy";
29+
users.host = "glint";
30+
31+
utils.enable = true;
32+
33+
# flatpak
34+
os.services.flatpak.enable = true;
35+
hm.home.packages = with pkgs; [
36+
flatpak
37+
gnome-software
38+
];
39+
40+
fonts.enable = true;
41+
printers.enable = true;
42+
43+
themes.themeName = "amoled";
44+
assets.enable = true;
45+
46+
# bitwarden.enable = true;
47+
48+
secrets.enable = true;
49+
50+
gtk.enable = true;
51+
52+
programs = {
53+
firefox.enable = true;
54+
gnome.enable = true;
55+
mpv.enable = true;
56+
vscode.enable = true;
57+
neovim.enable = true;
58+
cli-utils.enable = false;
59+
transmission.enable = true;
60+
direnv.enable = true;
61+
fish.enable = true;
62+
foot.enable = true;
63+
alacritty.enable = true;
64+
git.enable = true;
65+
nix = {
66+
enable = true;
67+
patch = true;
68+
};
69+
discord.enable = true;
70+
gui-utils.enable = true;
71+
};
72+
73+
os.programs.corectrl.enable = true;
74+
75+
os.security = {
76+
rtkit.enable = true;
77+
pam.loginLimits = [
78+
{
79+
domain = "*";
80+
type = "soft";
81+
item = "nofile"; # max FD count
82+
value = "unlimited";
83+
}
84+
];
85+
};
86+
87+
# Audio
88+
os.services.pulseaudio.enable = false;
89+
os.services.pipewire = {
90+
enable = true;
91+
alsa.enable = true;
92+
alsa.support32Bit = true;
93+
jack.enable = true;
94+
pulse.enable = true;
95+
wireplumber.enable = true;
96+
};
97+
98+
# Time and langauge
99+
os.time.timeZone = "Asia/Jerusalem";
100+
os.i18n.defaultLocale = "en_IL";
101+
102+
os.system.stateVersion = "24.11";
103+
hm.home.stateVersion = "24.11";
104+
}

‎hosts/glint/hardware/default.nix

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
pkgs,
3+
osConfig,
4+
lib,
5+
inputs,
6+
config,
7+
...
8+
}: {
9+
osModules = [
10+
./hardware-configuration.nix
11+
];
12+
13+
os.boot.loader = {
14+
systemd-boot.enable = true;
15+
efi.canTouchEfiVariables = true;
16+
};
17+
}

‎hosts/glint/hardware/hardware-configuration.nix

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Do not modify this file! It was generated by ‘nixos-generate-config’
2+
# and may be overwritten by future invocations. Please make changes
3+
# to /etc/nixos/configuration.nix instead.
4+
{ config, lib, pkgs, modulesPath, ... }:
5+
6+
{
7+
imports =
8+
[ (modulesPath + "/installer/scan/not-detected.nix")
9+
];
10+
11+
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "usbhid" "sd_mod" ];
12+
boot.initrd.kernelModules = [ ];
13+
boot.kernelModules = [ "kvm-amd" ];
14+
boot.extraModulePackages = [ ];
15+
16+
fileSystems."/" =
17+
{ device = "/dev/disk/by-uuid/593877c6-746e-411d-a06a-8aa97947d1a5";
18+
fsType = "ext4";
19+
};
20+
21+
fileSystems."/boot" =
22+
{ device = "/dev/disk/by-uuid/A3B3-B933";
23+
fsType = "vfat";
24+
options = [ "fmask=0077" "dmask=0077" ];
25+
};
26+
27+
swapDevices =
28+
[ { device = "/dev/disk/by-uuid/d14776da-17bf-4b7d-a766-ea90b1ad943b"; }
29+
];
30+
31+
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
32+
# (the default) this is the recommended approach. When using systemd-networkd it's
33+
# still possible to use this option, but it's recommended to use it in conjunction
34+
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
35+
networking.useDHCP = lib.mkDefault true;
36+
# networking.interfaces.enp101s0f4u1c2.useDHCP = lib.mkDefault true;
37+
# networking.interfaces.wlp98s0.useDHCP = lib.mkDefault true;
38+
39+
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
40+
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
41+
}

‎modules/programs/gnome.nix

+78-75
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,31 @@ in {
1313

1414
config = mkIf cfg.enable {
1515
os = {
16-
nixpkgs.overlays = [
17-
(_final: prev: {
18-
xdg-desktop-portal-gnome = prev.writeShellScriptBin "dummy-portal" '''';
19-
})
20-
];
16+
# xdg.portal.enable = true;
17+
# xdg.portal.extraPortals = with pkgs; [
18+
# xdg-desktop-portal-gtk
19+
# xdg-desktop-portal-gnome
20+
# ];
21+
2122
services = {
2223
xserver = {
2324
enable = true;
24-
dpi = 96;
2525
desktopManager.gnome.enable = true;
26-
displayManager.startx.enable = true;
27-
videoDrivers = [ "amdgpu" ];
28-
autorun = false;
26+
displayManager.gdm.enable = true;
27+
# videoDrivers = [ "amdgpu" ];
28+
# autorun = false;
2929

3030
excludePackages = with pkgs; [
3131
xterm
3232
];
33+
34+
xkb = {
35+
layout = "us";
36+
variant = "";
37+
};
3338
};
3439

35-
gnome.core-utilities.enable = false;
40+
# gnome.core-utilities.enable = false;
3641
# gnome.core-os-services.enable = lib.mkForce false;
3742
};
3843

@@ -42,10 +47,8 @@ in {
4247

4348
environment.systemPackages =
4449
(with pkgs; [
45-
# xorg.xinit
46-
])
47-
++ (with pkgs.gnome; [
4850
gnome-tweaks
51+
gnome-extension-manager
4952
]);
5053
};
5154
# os.environment.systemPackages = with pkgs; [
@@ -56,69 +59,69 @@ in {
5659
home.file.".xinitrc".text = ''
5760
dbus-run-session gnome-session
5861
'';
59-
dconf = {
60-
enable = true;
61-
settings = let
62-
inherit (lib.hm.gvariant) mkTuple mkUint32;
63-
in {
64-
"org/gnome/desktop/input-sources" = {
65-
per-window = false;
66-
sources = [(mkTuple ["xkb" "us"]) (mkTuple ["xkb" "il"])];
67-
xkb-options = ["terminate:ctrl_alt_bksp" "caps:escape"];
68-
};
69-
"org/gnome/shell" = {
70-
disable-user-extensions = false;
71-
enabled-extensions = [
72-
"[email protected]"
73-
"[email protected]"
74-
"blur-my-shell@aunetx"
75-
"[email protected]"
76-
"[email protected]"
77-
"[email protected]"
78-
"windowIsReady_Remover@[email protected]"
79-
"[email protected]"
80-
"[email protected]"
81-
];
82-
};
83-
"org/gnome/desktop/peripherals/mouse" = {
84-
accel-profile = "flat";
85-
speed = -0.78;
86-
};
87-
"org/gnome/desktop/peripherals/touchpad" = {
88-
two-finger-scrolling-enabled = true;
89-
};
90-
"org/gnome/desktop/background" = {
91-
picture-uri = "file:///run/current-system/sw/share/backgrounds/gnome/adwaita-l.jpg";
92-
picture-uri-dark = "file:///run/current-system/sw/share/backgrounds/gnome/adwaita-d.jpg";
93-
primary-color = "#3465a4";
94-
};
95-
"org/gnome/desktop/interface" = {
96-
# gtk-theme = "Adwaita-dark";
97-
color-scheme = "prefer-dark";
98-
};
99-
"apps/guake/general" = {
100-
gtk-prefer-dark-theme = true;
101-
};
102-
"apps/guake/style/background" = {
103-
transparency = 90;
104-
};
105-
"org/gnome/desktop/peripherals/keyboard" = {
106-
delay = mkUint32 226;
107-
};
108-
};
109-
};
62+
# dconf = {
63+
# enable = true;
64+
# settings = let
65+
# inherit (lib.hm.gvariant) mkTuple mkUint32;
66+
# in {
67+
# "org/gnome/desktop/input-sources" = {
68+
# per-window = false;
69+
# sources = [(mkTuple ["xkb" "us"]) (mkTuple ["xkb" "il"])];
70+
# xkb-options = ["terminate:ctrl_alt_bksp" "caps:escape"];
71+
# };
72+
# "org/gnome/shell" = {
73+
# disable-user-extensions = false;
74+
# enabled-extensions = [
75+
# "[email protected]"
76+
# "[email protected]"
77+
# "blur-my-shell@aunetx"
78+
# "[email protected]"
79+
# "[email protected]"
80+
# "[email protected]"
81+
# "windowIsReady_Remover@[email protected]"
82+
# "[email protected]"
83+
# "[email protected]"
84+
# ];
85+
# };
86+
# "org/gnome/desktop/peripherals/mouse" = {
87+
# accel-profile = "flat";
88+
# speed = -0.78;
89+
# };
90+
# "org/gnome/desktop/peripherals/touchpad" = {
91+
# two-finger-scrolling-enabled = true;
92+
# };
93+
# "org/gnome/desktop/background" = {
94+
# picture-uri = "file:///run/current-system/sw/share/backgrounds/gnome/adwaita-l.jpg";
95+
# picture-uri-dark = "file:///run/current-system/sw/share/backgrounds/gnome/adwaita-d.jpg";
96+
# primary-color = "#3465a4";
97+
# };
98+
# "org/gnome/desktop/interface" = {
99+
# # gtk-theme = "Adwaita-dark";
100+
# color-scheme = "prefer-dark";
101+
# };
102+
# "apps/guake/general" = {
103+
# gtk-prefer-dark-theme = true;
104+
# };
105+
# "apps/guake/style/background" = {
106+
# transparency = 90;
107+
# };
108+
# "org/gnome/desktop/peripherals/keyboard" = {
109+
# delay = mkUint32 226;
110+
# };
111+
# };
112+
# };
110113

111-
home.packages = with pkgs.gnomeExtensions; [
112-
gtk-title-bar
113-
app-icons-taskbar
114-
hide-activities-button
115-
blur-my-shell
116-
sound-output-device-chooser
117-
clipboard-indicator
118-
window-is-ready-remover
119-
mpris-indicator-button
120-
bluetooth-quick-connect
121-
];
114+
# home.packages = with pkgs.gnomeExtensions; [
115+
# gtk-title-bar
116+
# app-icons-taskbar
117+
# hide-activities-button
118+
# blur-my-shell
119+
# sound-output-device-chooser
120+
# clipboard-indicator
121+
# window-is-ready-remover
122+
# mpris-indicator-button
123+
# bluetooth-quick-connect
124+
# ];
122125
};
123126
};
124127
}

‎modules/programs/gui-utils.nix

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ in {
2828
};
2929
}
3030
(mkIf cfg.enable {
31-
unfree.allowed = ["unityhub"];
3231
hmModules = [inputs.guifetch.homeManagerModules.default];
3332
hm.xdg.configFile."flarrent/config.json".text = builtins.toJSON {
3433
color = theme.borderColor.active.toHexARGB;

0 commit comments

Comments
 (0)