From ba0aac78071754768923167a84b09c081e4166c0 Mon Sep 17 00:00:00 2001 From: chest Date: Fri, 18 Jul 2025 16:25:27 +0300 Subject: [PATCH] New install --- flake.nix | 4 ++-- host/Eclipse/configuration.nix | 1 + host/Eclipse/hardware-configuration.nix | 22 +++++++++++----------- modules/host/printing.nix | 16 +++++++++++----- modules/user/neofetch.nix | 2 +- user/chest/modules/hyprland.nix | 2 +- 6 files changed, 27 insertions(+), 20 deletions(-) diff --git a/flake.nix b/flake.nix index 8848a28..4675a9a 100644 --- a/flake.nix +++ b/flake.nix @@ -4,14 +4,14 @@ nixConfig = { extra-substituters = [ "https://nix-community.cachix.org" - "https://cache.garnix.io" + # "https://cache.garnix.io" "https://hyprland.cachix.org" "https://ezkea.cachix.org" "https://risdeveau.cachix.org" ]; extra-trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" + # "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI=" "risdeveau.cachix.org-1:TsoFSVeLl7iKtUYGX7qsvKPjf2vbNLfLC5v3SAdU8r0=" diff --git a/host/Eclipse/configuration.nix b/host/Eclipse/configuration.nix index 803593f..d2ca628 100644 --- a/host/Eclipse/configuration.nix +++ b/host/Eclipse/configuration.nix @@ -28,4 +28,5 @@ in { nixpkgs.config.allowBroken = true; programs.gamemode.enable = true; + services.printing.enable = true; } diff --git a/host/Eclipse/hardware-configuration.nix b/host/Eclipse/hardware-configuration.nix index 383bb4b..bd5a850 100644 --- a/host/Eclipse/hardware-configuration.nix +++ b/host/Eclipse/hardware-configuration.nix @@ -13,27 +13,27 @@ boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/34e32809-6876-4361-95d8-70a479ea8e19"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-label/NixOS"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/2B65-0D2E"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-partlabel/EFI\\x20system\\x20partition"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" "nofail" ]; + }; fileSystems."/mnt/D" = { device = "/dev/disk/by-uuid/E030A4DF30A4BDC2"; fsType = "ntfs"; - options = ["umask=0022" "gid=100" "uid=1002"]; + options = ["umask=0022" "gid=100" "uid=1000" "nofail" ]; }; fileSystems."/mnt/F" = { device = "/dev/disk/by-uuid/1C6278FC2848E1EF"; fsType = "ntfs"; - options = ["umask=0022" "gid=100" "uid=1002"]; + options = ["umask=0022" "gid=100" "uid=1000" "nofail" ]; }; swapDevices = [ ]; diff --git a/modules/host/printing.nix b/modules/host/printing.nix index 1039185..410c6fe 100644 --- a/modules/host/printing.nix +++ b/modules/host/printing.nix @@ -1,9 +1,15 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: lib.mkIf config.services.printing.enable { - services.avahi = { - enable = true; - nssmdns4 = true; - openFirewall = true; + services = { + printing.drivers = with pkgs; [ + brlaser + ]; + + avahi = { + enable = true; + nssmdns4 = true; + openFirewall = true; + }; }; } diff --git a/modules/user/neofetch.nix b/modules/user/neofetch.nix index c7d3361..a337f91 100644 --- a/modules/user/neofetch.nix +++ b/modules/user/neofetch.nix @@ -2,7 +2,7 @@ icon = pkgs.fetchurl { url = "https://preview.redd.it/a2nga4jvjy291.png?width=640&crop=smart&auto=webp&s=7d1458b41101c960bc13c28a6b92c5a6ddc20210"; name = "nixos-chan.png"; - sha256 = "sha256-9pleL+PiiylT8/aWw0iGve1iY3h0XohSQ7MVILzabHY="; + sha256 = "sha256-dAms/+CgYrao2b8omXEdS/HnjGUa++ol5jjpvej39Og="; }; in { home.packages = [ pkgs.neofetch ]; diff --git a/user/chest/modules/hyprland.nix b/user/chest/modules/hyprland.nix index 03549f6..ec87bc8 100644 --- a/user/chest/modules/hyprland.nix +++ b/user/chest/modules/hyprland.nix @@ -15,7 +15,7 @@ in { settings = { monitor = ",preferred,auto,1"; - exec-once =["${lib.getExe pkgs.linux-wallpaperengine} ~/.local/share/wpe/wallpaper --assets-dir ~/.local/share/wpe/assets --screen-root DP-1 --noautomute"]; + exec-once =["${lib.getExe pkgs.linux-wallpaperengine} ~/.local/share/wpe/wallpaper --assets-dir ~/.local/share/wpe/assets --screen-root DP-3 --noautomute"]; general = { gaps_in = 5; gaps_out = 5;