From f45a9d3e5f0032c04832c4499921beb57a6fdf26 Mon Sep 17 00:00:00 2001 From: Dmitriy Kholkin Date: Wed, 24 Aug 2022 18:33:53 +0300 Subject: [PATCH] fix iso and some cleanup --- flake.lock | 72 --------------- flake.nix | 23 +---- machines/Flakes-ISO/default.nix | 90 ++++--------------- machines/NixOS-VM/default.nix | 29 ------ machines/NixOS-VM/hardware-configuration.nix | 60 ------------- machines/NixOS-VM/system | 1 - machines/Oracle-Cloud/default.nix | 33 ------- .../Oracle-Cloud/hardware-configuration.nix | 16 ---- machines/Oracle-Cloud/system | 1 - machines/Packard-Server/default.nix | 44 --------- .../Packard-Server/hardware-configuration.nix | 78 ---------------- machines/Packard-Server/system | 1 - machines/Wayland-VM/default.nix | 2 +- profiles/overlay.nix | 1 - 14 files changed, 18 insertions(+), 433 deletions(-) delete mode 100644 machines/NixOS-VM/default.nix delete mode 100644 machines/NixOS-VM/hardware-configuration.nix delete mode 100644 machines/NixOS-VM/system delete mode 100644 machines/Oracle-Cloud/default.nix delete mode 100644 machines/Oracle-Cloud/hardware-configuration.nix delete mode 100644 machines/Oracle-Cloud/system delete mode 100644 machines/Packard-Server/default.nix delete mode 100644 machines/Packard-Server/hardware-configuration.nix delete mode 100644 machines/Packard-Server/system diff --git a/flake.lock b/flake.lock index 49604ce..bcd12f9 100644 --- a/flake.lock +++ b/flake.lock @@ -34,22 +34,6 @@ "type": "github" } }, - "base16-horizon-scheme": { - "flake": false, - "locked": { - "lastModified": 1633810732, - "narHash": "sha256-zbywfVQ7fn+AlUZjqHxunTqbls6dj1td88/gV11cfMI=", - "owner": "michael-ball", - "repo": "base16-horizon-scheme", - "rev": "4eabc3a5f7fc823cf3ceecda99dbef4e54c52574", - "type": "github" - }, - "original": { - "owner": "michael-ball", - "repo": "base16-horizon-scheme", - "type": "github" - } - }, "base16-tokyonight-scheme": { "flake": false, "locked": { @@ -241,22 +225,6 @@ "type": "github" } }, - "hyprpaper": { - "flake": false, - "locked": { - "lastModified": 1659542870, - "narHash": "sha256-5bB0Wvl0PJDrHGOMM1jiKJOqoBExJfMbclAXiZbZmYo=", - "owner": "hyprwm", - "repo": "hyprpaper", - "rev": "571f495e88cf9a758698d937d65b9ba35d6eab13", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprpaper", - "type": "github" - } - }, "lib-aggregate": { "inputs": { "flake-utils": "flake-utils_2", @@ -308,26 +276,6 @@ "type": "github" } }, - "multimc-cracked": { - "flake": false, - "locked": { - "lastModified": 1627076140, - "narHash": "sha256-dLX1hxM+pfCZdNTeQT6cFhAkqXhBtEXiamOODOobzls=", - "ref": "develop", - "rev": "9069e9c9d0b7951c310fdcc8bdc70ebc422a7634", - "revCount": 2917, - "submodules": true, - "type": "git", - "url": "https://github.com/AfoninZ/MultiMC5-Cracked.git" - }, - "original": { - "ref": "develop", - "rev": "9069e9c9d0b7951c310fdcc8bdc70ebc422a7634", - "submodules": true, - "type": "git", - "url": "https://github.com/AfoninZ/MultiMC5-Cracked.git" - } - }, "naersk": { "inputs": { "nixpkgs": [ @@ -671,13 +619,10 @@ "inputs": { "arkenfox-userjs": "arkenfox-userjs", "base16": "base16", - "base16-horizon-scheme": "base16-horizon-scheme", "base16-tokyonight-scheme": "base16-tokyonight-scheme", "comma": "comma", "home-manager": "home-manager", "hyprland": "hyprland", - "hyprpaper": "hyprpaper", - "multimc-cracked": "multimc-cracked", "nix": "nix", "nix-alien": "nix-alien", "nixpkgs": "nixpkgs_3", @@ -693,7 +638,6 @@ "simple-nixos-mailserver": "simple-nixos-mailserver", "vscode-server-fixup": "vscode-server-fixup", "zsh-autosuggestions": "zsh-autosuggestions", - "zsh-cod": "zsh-cod", "zsh-nix-shell": "zsh-nix-shell", "zsh-you-should-use": "zsh-you-should-use" } @@ -836,22 +780,6 @@ "type": "github" } }, - "zsh-cod": { - "flake": false, - "locked": { - "lastModified": 1658825818, - "narHash": "sha256-0Pb8IjUpfRdFpPAn3JQlryFnLMb7wlmn8Jw8GI+Q6q0=", - "owner": "dim-an", - "repo": "cod", - "rev": "2a56d1ee216f48bbd5c2fb9846cc2192f21fa6ac", - "type": "github" - }, - "original": { - "owner": "dim-an", - "repo": "cod", - "type": "github" - } - }, "zsh-nix-shell": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index efce347..ead4afb 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,10 @@ description = "System configuration"; inputs = { - nixpkgs-custom.url = "github:nixos/nixpkgs/894bced14f7c66112d39233bcaeaaf708e077759"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-22.05"; + nixpkgs-custom.url = "github:nixos/nixpkgs/894bced14f7c66112d39233bcaeaaf708e077759"; nixpkgs-wayland = { url = "github:nix-community/nixpkgs-wayland"; inputs.nixpkgs.follows = "nixpkgs"; @@ -20,11 +20,6 @@ flake = false; }; base16.url = "github:alukardbf/base16-nix"; - # base16.url = "/home/alukard/projects/base16-nix"; - base16-horizon-scheme = { - url = "github:michael-ball/base16-horizon-scheme"; - flake = false; - }; base16-tokyonight-scheme = { url = "github:alukardbf/base16-tokyonight-scheme"; flake = false; @@ -37,18 +32,6 @@ url = "github:hyprwm/Hyprland"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprpaper = { - url = "github:hyprwm/hyprpaper"; - flake = false; - }; - multimc-cracked = { - url = "https://github.com/AfoninZ/MultiMC5-Cracked.git"; - ref = "develop"; - rev = "9069e9c9d0b7951c310fdcc8bdc70ebc422a7634"; - flake = false; - submodules = true; - type = "git"; - }; nix-alien = { url = "github:thiagokokada/nix-alien"; inputs.nixpkgs.follows = "nixpkgs"; @@ -82,10 +65,6 @@ url = "github:zsh-users/zsh-autosuggestions"; flake = false; }; - zsh-cod = { - url = "github:dim-an/cod"; - flake = false; - }; zsh-nix-shell = { url = "github:chisui/zsh-nix-shell"; flake = false; diff --git a/machines/Flakes-ISO/default.nix b/machines/Flakes-ISO/default.nix index de57f04..8fa96c3 100644 --- a/machines/Flakes-ISO/default.nix +++ b/machines/Flakes-ISO/default.nix @@ -1,80 +1,22 @@ { modulesPath, lib, inputs, pkgs, ... }: { imports = with inputs.self.nixosModules; with inputs.self.nixosProfiles; [ - "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" - "${modulesPath}/profiles/qemu-guest.nix" - inputs.self.nixosRoles.base - inputs.base16.hmModule - - xray - applications-setup - sound - themes - - firefox - kitty - mpv - packages - rofi - vscode - - copyq - cursor - direnv - fonts - gtk - kde - mako - nix-index - print-scan - proxy - hyprland - waybar - - - # applications-setupsetup - # cursor - # fonts - # gtk - # i3status-rust - # kde - # kitty - # mako - # mpv - # packages - # print-scan - # rofi - # sound - # sway - # themes - # vivaldi - # vscode - # kitty - # mako - # mpv - # packages - # print-scan - # rofi - # sound - # sway - # themes - # vivaldi - # vscode + "${modulesPath}/installer/cd-dvd/installation-cd-graphical-plasma5.nix" ]; - disabledModules = [ "installer/cd-dvd/channel.nix" ]; - networking.networkmanager.enable = lib.mkForce true; - networking.wireless.enable = lib.mkForce false; - services.getty.autologinUser = lib.mkForce "alukard"; - services.openssh.permitRootLogin = lib.mkForce "no"; - # sound.enable = lib.mkForce false; - deviceSpecific.devInfo.drive.type = "hdd"; - deviceSpecific.devInfo.gpu.vendor = "other"; - deviceSpecific.isHost = false; - deviceSpecific.isShared = false; - deviceSpecific.isGaming = false; - deviceSpecific.enableVirtualisation = false; - deviceSpecific.wireguard.enable = false; - deviceSpecific.isServer = false; + options.device = lib.mkOption { type = lib.types.str; }; - isoImage.volumeID = lib.mkForce "NIXOS_ISO"; + config = { + environment.systemPackages = [ pkgs.git ]; + nix = { + nixPath = lib.mkForce [ "self=/etc/self/compat" "nixpkgs=/etc/nixpkgs" ]; + registry.self.flake = inputs.self; + registry.nixpkgs.flake = inputs.nixpkgs; + extraOptions = '' + experimental-features = nix-command flakes + ''; + }; + environment.etc.nixpkgs.source = inputs.nixpkgs; + environment.etc.self.source = inputs.self; + }; + # isoImage.volumeID = lib.mkForce "NIXOS_ISO"; } \ No newline at end of file diff --git a/machines/NixOS-VM/default.nix b/machines/NixOS-VM/default.nix deleted file mode 100644 index a1e45b3..0000000 --- a/machines/NixOS-VM/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ inputs, ... }: { - imports = with inputs.self.nixosModules; [ - ./hardware-configuration.nix - inputs.self.nixosRoles.desktop - ]; - - deviceSpecific.devInfo = { - cpu = { - vendor = "amd"; - clock = 3700; - cores = 4; - }; - drive = { - type = "ssd"; - speed = 1000; - size = 30; - }; - gpu = { - vendor = "vm"; - }; - bigScreen = true; - ram = 4; - }; - deviceSpecific.isHost = false; - deviceSpecific.isShared = false; - deviceSpecific.isGaming = false; - deviceSpecific.enableVirtualisation = false; - deviceSpecific.wireguard.enable = false; -} diff --git a/machines/NixOS-VM/hardware-configuration.nix b/machines/NixOS-VM/hardware-configuration.nix deleted file mode 100644 index baddf82..0000000 --- a/machines/NixOS-VM/hardware-configuration.nix +++ /dev/null @@ -1,60 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = [ ]; - - boot.initrd.availableKernelModules = [ "ata_piix" "xhci_pci" "ahci" "nvme" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/95b3583e-41d8-4a34-9ff5-52a7546b9baa"; - fsType = "btrfs"; - options = [ "subvol=nixos" "compress-force=zstd" "noatime" "autodefrag" "ssd" ]; - }; - - fileSystems."/nix" = - { device = "/dev/disk/by-uuid/95b3583e-41d8-4a34-9ff5-52a7546b9baa"; - fsType = "btrfs"; - options = [ "subvol=nix" "compress-force=zstd" "noatime" "autodefrag" "ssd" ]; - }; - - fileSystems."/home" = - { device = "/dev/disk/by-uuid/95b3583e-41d8-4a34-9ff5-52a7546b9baa"; - fsType = "btrfs"; - options = [ "subvol=home" "compress-force=zstd" "noatime" "autodefrag" "ssd" ]; - }; - - fileSystems."/var" = - { device = "/dev/disk/by-uuid/95b3583e-41d8-4a34-9ff5-52a7546b9baa"; - fsType = "btrfs"; - options = [ "subvol=var" "compress-force=zstd" "noatime" "autodefrag" "ssd" ]; - }; - - fileSystems."/media/bittorrent" = - { device = "/dev/disk/by-uuid/95b3583e-41d8-4a34-9ff5-52a7546b9baa"; - fsType = "btrfs"; - options = [ "subvol=bittorrent" "nodatacow" "ssd" ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/CA29-07D6"; - fsType = "vfat"; - }; - - swapDevices = [ - { - device = "/dev/disk/by-partuuid/1bba72d3-9a12-4407-87ab-f2640dbbadf5"; - randomEncryption.enable = true; - } - ]; - - virtualisation.virtualbox.guest.enable = true; - networking.hostId = "c4ab8679"; - boot.initrd.supportedFilesystems = [ "btrfs" ]; - boot.supportedFilesystems = [ "btrfs" ]; -} diff --git a/machines/NixOS-VM/system b/machines/NixOS-VM/system deleted file mode 100644 index 9bdfd5f..0000000 --- a/machines/NixOS-VM/system +++ /dev/null @@ -1 +0,0 @@ -x86_64-linux \ No newline at end of file diff --git a/machines/Oracle-Cloud/default.nix b/machines/Oracle-Cloud/default.nix deleted file mode 100644 index f723be7..0000000 --- a/machines/Oracle-Cloud/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ inputs, lib, ... }: { - imports = [ - ./hardware-configuration.nix - inputs.self.nixosRoles.server - ]; - - deviceSpecific.devInfo = { - cpu = { - arch = "aarch64"; - vendor = "broadcom"; - clock = 2800; - cores = 4; - }; - drive = { - type = "ssd"; - speed = 1000; - size = 150; - }; - gpu = { - vendor = "other"; - }; - bigScreen = false; - ram = 24; - }; - deviceSpecific.isHost = false; - deviceSpecific.isShared = false; - deviceSpecific.isGaming = false; - deviceSpecific.enableVirtualisation = false; - deviceSpecific.wireguard.enable = false; - - boot.cleanTmpDir = true; - # networking.hostName = lib.mkForce "Oracle-Cloud"; -} diff --git a/machines/Oracle-Cloud/hardware-configuration.nix b/machines/Oracle-Cloud/hardware-configuration.nix deleted file mode 100644 index a9c0495..0000000 --- a/machines/Oracle-Cloud/hardware-configuration.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ modulesPath, ... }: -{ - imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; - boot.loader.grub = { - efiSupport = true; - efiInstallAsRemovable = true; - device = "nodev"; - }; - fileSystems."/boot" = { device = "/dev/disk/by-uuid/A368-4D28"; fsType = "vfat"; }; - boot.initrd.kernelModules = [ "nvme" ]; - fileSystems."/" = { device = "/dev/sda3"; fsType = "xfs"; }; - swapDevices = [ { - device = "/dev/disk/by-partuuid/87bcc339-3295-4fc0-a219-1c31436b1c51"; - randomEncryption.enable = true; - } ]; -} diff --git a/machines/Oracle-Cloud/system b/machines/Oracle-Cloud/system deleted file mode 100644 index ab65297..0000000 --- a/machines/Oracle-Cloud/system +++ /dev/null @@ -1 +0,0 @@ -aarch64-linux \ No newline at end of file diff --git a/machines/Packard-Server/default.nix b/machines/Packard-Server/default.nix deleted file mode 100644 index 81fac3c..0000000 --- a/machines/Packard-Server/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ inputs, lib, ... }: { - imports = with inputs.self.nixosModules; with inputs.self.nixosProfiles; [ - ./hardware-configuration.nix - inputs.self.nixosRoles.server - - hardware - light - mullvad - services - ]; - - deviceSpecific.devInfo = { - cpu = { - vendor = "intel"; - clock = 2300; - cores = 4; - }; - drive = { - type = "hdd"; - speed = 100; - size = 500; - }; - gpu = { - vendor = "intel"; - }; - bigScreen = false; - ram = 6; - }; - deviceSpecific.enableVirtualisation = true; - deviceSpecific.wireguard.enable = true; - deviceSpecific.isLaptop = lib.mkForce true; - - boot = { - cleanTmpDir = true; - # kernelParams = [ "video=VGA-1:d" ]; - loader = { - timeout = lib.mkForce 4; - systemd-boot.enable = true; - }; - }; - - services.tlp.settings.TLP_DEFAULT_MODE = lib.mkForce "AC"; - services.logind.lidSwitch = "lock"; -} diff --git a/machines/Packard-Server/hardware-configuration.nix b/machines/Packard-Server/hardware-configuration.nix deleted file mode 100644 index 09985ff..0000000 --- a/machines/Packard-Server/hardware-configuration.nix +++ /dev/null @@ -1,78 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/3e19dedb-658b-4173-a8ad-8d733d18f525"; - fsType = "btrfs"; - options = [ "subvol=nixos" "compress-force=zstd" "noatime" "autodefrag" ]; - }; - - boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/46765375-31b6-46a0-8956-1f0e05cf1ff9"; - - fileSystems."/nix" = - { device = "/dev/disk/by-uuid/3e19dedb-658b-4173-a8ad-8d733d18f525"; - fsType = "btrfs"; - options = [ "subvol=nix" "compress-force=zstd" "noatime" "autodefrag" ]; - }; - - fileSystems."/home" = - { device = "/dev/disk/by-uuid/3e19dedb-658b-4173-a8ad-8d733d18f525"; - fsType = "btrfs"; - options = [ "subvol=home" "compress-force=zstd" "noatime" "autodefrag" ]; - }; - - fileSystems."/var" = - { device = "/dev/disk/by-uuid/3e19dedb-658b-4173-a8ad-8d733d18f525"; - fsType = "btrfs"; - options = [ "subvol=var" "compress-force=zstd" "noatime" "autodefrag" ]; - }; - - fileSystems."/media/bittorrent" = - { device = "/dev/disk/by-uuid/3e19dedb-658b-4173-a8ad-8d733d18f525"; - fsType = "btrfs"; - options = [ - "subvol=bittorrent" "nodatacow" - "uid=${toString config.users.users.alukard.uid}" - "gid=${toString config.users.groups.users.gid}" - ]; - }; - - fileSystems."/media/libvirt" = - { device = "/dev/disk/by-uuid/3e19dedb-658b-4173-a8ad-8d733d18f525"; - fsType = "btrfs"; - options = [ - "subvol=libvirt" "nodatacow" - "uid=${toString config.users.users.alukard.uid}" - "gid=${toString config.users.groups.users.gid}" - ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/E02A-5F90"; - fsType = "vfat"; - }; - - swapDevices = [ - { - device = "/dev/disk/by-partuuid/f25cdcc8-c1b3-4014-882e-1a693a15e1f5"; - randomEncryption.enable = true; - } - ]; - - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - networking.hostId = "923a7c8b"; - boot.initrd.supportedFilesystems = [ "btrfs" ]; - boot.supportedFilesystems = [ "btrfs" ]; -} diff --git a/machines/Packard-Server/system b/machines/Packard-Server/system deleted file mode 100644 index 9bdfd5f..0000000 --- a/machines/Packard-Server/system +++ /dev/null @@ -1 +0,0 @@ -x86_64-linux \ No newline at end of file diff --git a/machines/Wayland-VM/default.nix b/machines/Wayland-VM/default.nix index 6ac1804..e629f47 100644 --- a/machines/Wayland-VM/default.nix +++ b/machines/Wayland-VM/default.nix @@ -1,6 +1,6 @@ { modulesPath, inputs, lib, pkgs, ... }: { imports = [ - # ./hardware-configuration.nix + ./hardware-configuration.nix "${modulesPath}/profiles/qemu-guest.nix" "${modulesPath}/profiles/minimal.nix" ./system-path.nix diff --git a/profiles/overlay.nix b/profiles/overlay.nix index d197651..ead3cdb 100644 --- a/profiles/overlay.nix +++ b/profiles/overlay.nix @@ -35,7 +35,6 @@ with lib; { ibm-plex-powerline = pkgs.callPackage ./packages/ibm-plex-powerline.nix { }; kitti3 = pkgs.python3Packages.callPackage ./packages/kitti3.nix { }; mpris-ctl = pkgs.callPackage ./packages/mpris-ctl.nix { }; - multimc = pkgs.qt5.callPackage ./packages/multimc.nix { multimc-repo = inputs.multimc-cracked; }; parsec = pkgs.callPackage ./packages/parsec.nix { }; reshade-shaders = pkgs.callPackage ./packages/reshade-shaders.nix { }; seadrive-fuse = pkgs.callPackage ./packages/seadrive-fuse.nix { };