diff --git a/flake.nix b/flake.nix index f569dc0..c471cb8 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,7 @@ in { # ficache-nixos - system hostname - nixosConfigurations.ficache-nixos = nixpkgs.lib.nixosSystem { + nixosConfigurations.dixxe-nixos = nixpkgs.lib.nixosSystem { specialArgs = { nixpkgs.config.allowUnfree = true; inherit inputs system; @@ -39,7 +39,7 @@ ]; }; - homeConfigurations.ficache = home-manager.lib.homeManagerConfiguration { + homeConfigurations.dixxe = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.${system}; modules = [ ./home-manager/home.nix diff --git a/home-manager/home.nix b/home-manager/home.nix index 97c53ed..0b8a64a 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -8,8 +8,8 @@ home = { - username = "ficache"; - homeDirectory = "/home/ficache"; + username = "dixxe"; + homeDirectory = "/home/dixxe"; stateVersion = "24.05"; diff --git a/home-manager/modules/desktop-managers/gnomeModule.nix b/home-manager/modules/desktop-managers/gnomeModule.nix index 07e1bca..09fbeaf 100644 --- a/home-manager/modules/desktop-managers/gnomeModule.nix +++ b/home-manager/modules/desktop-managers/gnomeModule.nix @@ -1,15 +1,20 @@ {pkgs, ...}: { + home.packages = with pkgs.gnomeExtensions; [ + appindicator + dash-to-dock + media-controls + ]; + dconf = { enable = true; settings."org/gnome/shell" = { disable-user-extensions = false; enabled-extensions = with pkgs.gnomeExtensions; [ appindicator.extensionUuid - vitals.extensionUuid dash-to-dock.extensionUuid media-controls.extensionUuid ]; }; }; -} \ No newline at end of file +} diff --git a/home-manager/modules/vscodium.nix b/home-manager/modules/vscodium.nix index 24e4342..4432941 100644 --- a/home-manager/modules/vscodium.nix +++ b/home-manager/modules/vscodium.nix @@ -9,11 +9,9 @@ jnoortheen.nix-ide golang.go waderyan.gitblame - llvm-vs-code-extensions.vscode-clangd - ms-vscode.cmake-tools - vadimcn.vscode-lldb donjayamanne.githistory samuelcolvin.jinjahtml + ziglang.vscode-zig ]; userSettings = { diff --git a/home-manager/package-groups/video-processing.nix b/home-manager/package-groups/video-processing.nix index 9571a23..f3b9748 100644 --- a/home-manager/package-groups/video-processing.nix +++ b/home-manager/package-groups/video-processing.nix @@ -13,8 +13,7 @@ home.packages = with pkgs; [ jellyfin-ffmpeg - libsForQt5.kdenlive gpu-screen-recorder-gtk - + audacity ]; } diff --git a/home-manager/your-packages.nix b/home-manager/your-packages.nix index 2ea5185..a1cb5bf 100644 --- a/home-manager/your-packages.nix +++ b/home-manager/your-packages.nix @@ -4,23 +4,22 @@ home.packages = with pkgs; [ logseq joplin-desktop - alacritty vlc gnome-tweaks # Social stuff telegram-desktop vesktop + element-desktop librewolf qbittorrent libreoffice - + gimp + # Minecraft stuff prismlauncher - #Development stuff - krita ]; nixpkgs.config.permittedInsecurePackages = [ diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix index 595fdf2..65b86f3 100644 --- a/nixos/hardware-configuration.nix +++ b/nixos/hardware-configuration.nix @@ -9,23 +9,29 @@ ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; + boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ]; + boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/NIXOS_LUKS"; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/9d35945a-2c1e-463d-b47a-545093d19de1"; + { device = "/dev/disk/by-label/NIXOS_ROOT"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/0894-A975"; + { device = "/dev/disk/by-label/NIXOS_BOOT"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; + fileSystems."/home" = + { device = "/dev/disk/by-label/NIXOS_HOME"; + fsType = "ext4"; + }; + swapDevices = - [ { device = "/dev/disk/by-uuid/2a100390-c20d-4d74-804c-db52551b9d76"; } + [ { device = "/dev/disk/by-label/NIXOS_SWAP"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -36,5 +42,6 @@ # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.enableAllFirmware = true; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/nixos/modules/desktop-enviroments/gnome.nix b/nixos/modules/desktop-enviroments/gnome.nix index 9f7ad02..97080e7 100644 --- a/nixos/modules/desktop-enviroments/gnome.nix +++ b/nixos/modules/desktop-enviroments/gnome.nix @@ -16,7 +16,8 @@ }; # Extensions are managed in gnomeModule.nix - + # + environment.systemPackages = with pkgs; [ gnomeExtensions.appindicator ]; services.gnome.gnome-settings-daemon.enable = true; environment.gnome.excludePackages = (with pkgs; [ @@ -53,4 +54,4 @@ }); }) ]; -} \ No newline at end of file +} diff --git a/nixos/modules/minimal/networking.nix b/nixos/modules/minimal/networking.nix index 77347cd..6943caa 100644 --- a/nixos/modules/minimal/networking.nix +++ b/nixos/modules/minimal/networking.nix @@ -1,5 +1,5 @@ { - networking.hostName = "ficache-nixos"; # Define your hostname. + networking.hostName = "dixxe-nixos"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.\ networking.networkmanager.enable = true; -} \ No newline at end of file +} diff --git a/nixos/modules/minimal/users.nix b/nixos/modules/minimal/users.nix index db7b460..0eb1763 100644 --- a/nixos/modules/minimal/users.nix +++ b/nixos/modules/minimal/users.nix @@ -1,8 +1,8 @@ { # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.ficache = { + users.users.dixxe = { isNormalUser = true; - description = "ficache"; + description = "dixxe"; extraGroups = [ "networkmanager" "wheel" "tpws" ]; }; } diff --git a/nixos/modules/virtualbox.nix b/nixos/modules/virtualbox.nix index 2fb1877..6ff2a96 100644 --- a/nixos/modules/virtualbox.nix +++ b/nixos/modules/virtualbox.nix @@ -1,9 +1,9 @@ { programs.virt-manager.enable = true; - users.groups.libvirtd.members = ["ficache"]; + users.groups.libvirtd.members = ["dixxe"]; virtualisation.libvirtd.enable = true; virtualisation.spiceUSBRedirection.enable = true; -} \ No newline at end of file +} diff --git a/nixos/modules/zapret.nix b/nixos/modules/zapret.nix index 80b5d7f..309cb0e 100644 --- a/nixos/modules/zapret.nix +++ b/nixos/modules/zapret.nix @@ -3,7 +3,7 @@ services = { zapret = { enable = true; - udpPorts = [ "50000:65535" "27015:27050" ]; + udpPorts = [ "50000:65535" "27000:27100" ]; udpSupport = true; params = [ "--dpi-desync-autottl=3" diff --git a/nixos/user_modules.nix b/nixos/user_modules.nix index 80aa1b5..c36359c 100644 --- a/nixos/user_modules.nix +++ b/nixos/user_modules.nix @@ -3,7 +3,7 @@ ./modules/gaming-tweaks.nix ./modules/pipewire.nix ./modules/auto-cpufreq.nix - ./modules/zapret.nix + #./modules/zapret.nix #./modules/virtualbox.nix #./modules/postgresql.nix #./modules/nix-ld.nix