From 836accbaee437b4ed06c3a1f5c450a6b421e488d Mon Sep 17 00:00:00 2001 From: kB01 Date: Mon, 12 Aug 2024 00:33:16 +0200 Subject: [PATCH 01/20] Added Source for Voloxo Host --- systems/x86_64-linux/voloxo/default.nix | 291 +++++++++++++++++++++++ systems/x86_64-linux/voloxo/hardware.nix | 44 ++++ systems/x86_64-linux/voloxo/modules.nix | 10 + systems/x86_64-linux/voloxo/symbols/dv2 | 80 +++++++ 4 files changed, 425 insertions(+) create mode 100644 systems/x86_64-linux/voloxo/default.nix create mode 100644 systems/x86_64-linux/voloxo/hardware.nix create mode 100644 systems/x86_64-linux/voloxo/modules.nix create mode 100644 systems/x86_64-linux/voloxo/symbols/dv2 diff --git a/systems/x86_64-linux/voloxo/default.nix b/systems/x86_64-linux/voloxo/default.nix new file mode 100644 index 0000000..8593936 --- /dev/null +++ b/systems/x86_64-linux/voloxo/default.nix @@ -0,0 +1,291 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ + # Snowfall Lib provides a customized `lib` instance with access to your flake's library + # as well as the libraries available from your flake's inputs. + lib, + # An instance of `pkgs` with your overlays and packages applied is also available. + pkgs, + # You also have access to your flake's inputs. + inputs, + + # Additional metadata is provided by Snowfall Lib. + namespace, # The namespace used for your flake, defaulting to "internal" if not set. + system, # The system architecture for this host (eg. `x86_64-linux`). + target, # The Snowfall Lib target for this system (eg. `x86_64-iso`). + format, # A normalized name for the system target (eg. `iso`). + virtual, # A boolean to determine whether this system is a virtual target using nixos-generators. + systems, # An attribute map of your defined hosts. + + # All other arguments come from the system system. + config, + ... +}: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware.nix +# ./modules.nix + ]; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + # Crosscompiling + boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; + + networking.hostName = "voloxo"; # Define your hostname. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Enable networking + networking.networkmanager.enable = true; + + # Set your time zone. + time.timeZone = "Europe/Berlin"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "de_DE.UTF-8"; + LC_IDENTIFICATION = "de_DE.UTF-8"; + LC_MEASUREMENT = "de_DE.UTF-8"; + LC_MONETARY = "de_DE.UTF-8"; + LC_NAME = "de_DE.UTF-8"; + LC_NUMERIC = "de_DE.UTF-8"; + LC_PAPER = "de_DE.UTF-8"; + LC_TELEPHONE = "de_DE.UTF-8"; + LC_TIME = "de_DE.UTF-8"; + }; + + # Experimental Features + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + + # Nvidia Configuration + hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; + hardware.bluetooth.enable = true; + hardware.bluetooth.powerOnBoot = true; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + services.xserver.videoDrivers = [ "nvidia" ]; + + # Enable the KDE Plasma Desktop Environment. + services.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + + # Configure keymap in X11 + services.xserver.xkb = { + layout = "us,dv2,de"; + variant = "esc:swapcaps"; + extraLayouts.dv2 = { + description = "German Dvorak Type 2"; + languages = [ "de" ]; + symbolsFile = ./symbols/dv2; + }; + }; + + # Configure console keymap + console.keyMap = "de"; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound with pipewire. + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; + + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.enable = true; + }; + + services.onlyoffice = { + enable = true; + }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.kb = { + isNormalUser = true; + description = "kb"; + extraGroups = [ "networkmanager" "wheel" ]; + packages = with pkgs; [ + firefox + kate + thunderbird + cheese + obs-studio + blender + syncthing + keepassxc + freetube + libreoffice + adafruit-nrfutil + prismlauncher + gimp + inkscape + veracrypt + matrix-commander + vlc + protonvpn-gui + telegram-desktop + logseq + signal-desktop + kid3 + calibre + spotify-player + tidal-hifi + iamb # Matrix with Vim-Binds + yazi + nerdfonts + scrcpy + ryujinx + razergenie + webcord + ]; + }; + + # Define Service Users + users.groups.languagetool = {}; + users.users.languagetool = { + isSystemUser = true; + group = "languagetool"; + }; + + # Enable automatic login for the user. + services.displayManager.autoLogin.enable = true; + services.displayManager.autoLogin.user = "kb"; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + nixpkgs.config.permittedInsecurePackages = [ + "electron-27.3.11" + ]; + + programs.vim = { + enable = true; + defaultEditor = true; + }; + programs.ssh.startAgent = true; + programs.kdeconnect.enable = true; + programs.steam = { + enable = true; + remotePlay.openFirewall = true; + }; + + programs.firefox.enable = true; + programs.firefox.nativeMessagingHosts.packages = [ pkgs.firefoxpwa ]; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + wget + fastfetch + usbutils + fprintd + nss + mesa + python3 + zulu + zulu8 + languagetool + btop + firefoxpwa + bookworm + foliate + gparted + git + ntfs3g + ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; + + # List services that you want to enable: + systemd.services.languagetool = { + description = "LanguageTool HTTP Server for local Spellchecking"; + wants = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "/run/current-system/sw/bin/languagetool-http-server --port 8081 --allow-origin '*'"; + WorkingDirectory = "~"; # Defaults to "/" If the user has no home + User = "languagetool"; + Restart = "always"; + RestartSec = 30; + }; + }; + +# services.udev.extraRules = '' +#ENV{ID_VENDOR_ID}=="EloTouchSystems_Inc",ENV{ID_MODEL_ID}=="Elo_TouchSystems_2216_AccuTouch®_USB_Touchmonitor_Interface",ENV{WL_OUTPUT}="DP-0",ENV{LIBINPUT_CALIBRATION_MATRIX}="0.4 0 0 0 -0.347826087 0.652173913" +#''; + +# services.xserver.inputClassSections = [ +# '' +# Identifier "calibration" +# MatchProduct "EloTouchSystems,Inc Elo TouchSystems 2216 AccuTouch® USB Touchmonitor Interface" +# Option "MinX" "6225" +# Option "MaxX" "59846" +# Option "MinY" "57849" +# Option "MaxY" "5925" +# Option "InvertY" "1" +# '' +# ]; + + # Virtualisation + virtualisation.podman = { + enable = true; + dockerCompat = true; + dockerSocket.enable = true; + }; + + services.syncthing = { + enable = true; + user = "kb"; + dataDir = "/home/kb/sync"; + configDir = "/home/kb/.config/syncthing"; + }; + + + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "23.05"; # Did you read the comment? + +} diff --git a/systems/x86_64-linux/voloxo/hardware.nix b/systems/x86_64-linux/voloxo/hardware.nix new file mode 100644 index 0000000..5a835e1 --- /dev/null +++ b/systems/x86_64-linux/voloxo/hardware.nix @@ -0,0 +1,44 @@ +# 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 = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ "nvidia" ]; + boot.kernelModules = [ "kvm-amd" "sg" ]; + boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/f1abb1b8-0cc5-46f3-9e97-72f793c4b496"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."luks-07910f1e-c989-4acc-8d81-fef02a2596b3".device = "/dev/disk/by-uuid/07910f1e-c989-4acc-8d81-fef02a2596b3"; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/1ECE-940A"; + fsType = "vfat"; + }; + + swapDevices = [ ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp9s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; + hardware.openrazer = { + enable = true; + users = [ "kb" ]; + }; +} diff --git a/systems/x86_64-linux/voloxo/modules.nix b/systems/x86_64-linux/voloxo/modules.nix new file mode 100644 index 0000000..580b360 --- /dev/null +++ b/systems/x86_64-linux/voloxo/modules.nix @@ -0,0 +1,10 @@ +{ inputs, config, pkgs, lib, system, ... }: +{ + + + + modules.packagemanagers.appimage = true; + + +} + diff --git a/systems/x86_64-linux/voloxo/symbols/dv2 b/systems/x86_64-linux/voloxo/symbols/dv2 new file mode 100644 index 0000000..7bf9d76 --- /dev/null +++ b/systems/x86_64-linux/voloxo/symbols/dv2 @@ -0,0 +1,80 @@ +// German Dvorak keymap by Thorsten Staerk (www.staerk.de/thorsten) +// Have acute and grave as dead keys, tilde and circumflex alive as they are needed +// in many programming languages. +// to use this keymap, use a 105-key-keyboard and the command setxkbmap -model pc105 -layout dvorak -variant de +// source: http://www-lehre.informatik.uni-osnabrueck.de/~rfreund/dvorak.php +// Some modifications by Simon Spruenker (simon.spruenker.de) e. g.: +// Can also be used on 104-key-keyboard without loosing adiaeresis. +partial alphanumeric_keys +xkb_symbols "dvorak" { + include "us(dvorak)" + + name[Group1]="Germany - Dvorak"; + + key { [ asciicircum, degree ] }; + + key { [ 1, exclam, onesuperior ] }; + key { [ 2, quotedbl, twosuperior ] }; + key { [ 3, section, threesuperior ] }; + key { [ 4, dollar, bar ] }; + key { [ 5, percent, bar ] }; + key { [ 6, ampersand, brokenbar ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + key { [ plus, asterisk, asciitilde ] }; + key { [ less, greater, dead_grave ] }; + + key { [ udiaeresis, Udiaeresis, braceleft ] }; + key { [ comma, semicolon, bracketleft ] }; + key { [ period, colon, bracketright ] }; + key { [ p, P, braceright ] }; + key { [ c, C, copyright, Cacute ] }; + key { [ t, T, trademark ] }; + key { [ z, Z, zabovedot, Zabovedot ] }; + key { [ question, ssharp ] }; + key { [ slash, backslash, dead_acute ] }; + + key { [ a, A, at, aogonek ] }; + key { [ o, O, oacute, Oacute ] }; + key { [ e, E, EuroSign, eogonek ] }; + key { [ i, I, bar ] }; + key { [ u, U ] }; + key { [ h, H ] }; + key { [ d, D ] }; + key { [ r, R, registered ] }; + key { [ n, N, nacute, Nacute ] }; + key { [ s, S, sacute, Sacute] }; + key { [ l, L, lstroke, Lstroke ] }; + + key { [ odiaeresis, Odiaeresis, adiaeresis, Adiaeresis ] }; + key { [ q, Q, at ] }; + key { [ m, M, mu ] }; + key { [ numbersign, apostrophe ] }; + + key { [ minus, underscore, hyphen, diaeresis] }; + + key { [ adiaeresis, Adiaeresis, bar ] }; + + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "Sundeadkeys" { + + // For naming consistency + + include "de(basic)" + +}; + +partial alphanumeric_keys +xkb_symbols "sundeadkeys" { + + // For naming consistency + + include "de(Sundeadkeys)" + + name[Group1]="Germany - Sun dead keys"; +}; From 06eeb5b433fd6dcb69fa714bfd2e4315b0e67453 Mon Sep 17 00:00:00 2001 From: kB01 Date: Mon, 12 Aug 2024 01:03:17 +0200 Subject: [PATCH 02/20] Added voloxo Host Info --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index cb4fb6a..c50d1ba 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,15 @@ Cpu: AMD Ryzen 5 5625U Ram: 16GB +### voloxo +My Gaming Desktop + +Cpu: AMD Ryzen 5 5600X + +Ram: 32GB + +Gpu: NVIDIA GeForce GTX 1070 + ## License [MIT © kB01](../LICENSE) From a28fae41d8b503986a777a5c91181c92d270e19e Mon Sep 17 00:00:00 2001 From: kB01 Date: Mon, 12 Aug 2024 01:36:59 +0200 Subject: [PATCH 03/20] Added Workflow test, Removed flake.lock, Updated Gitignore --- .github/workflows/build.yml | 14 + .gitignore | 3 +- flake.lock | 681 ------------------------------------ 3 files changed, 16 insertions(+), 682 deletions(-) create mode 100644 .github/workflows/build.yml delete mode 100644 flake.lock diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..39e21ad --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,14 @@ +on: [push, pull_request, workflow_dispatch] + +jobs: + build-HyperC: + runs-on: docker + container: + image: nixos/nix + name: Build NixOS Iso + steps: + - name: Checkout + uses: actions/checkout@v4 + - run: echo /home/runner/externals/node20/bin >> $GITHUB_PATH + - name: Get System Info + run: nix-shell -p fastfetch --run "fastfetch" >> $GITHUB_PATH diff --git a/.gitignore b/.gitignore index 234b15e..1789832 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -/flake.lock +flake.lock +result diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 1d64c69..0000000 --- a/flake.lock +++ /dev/null @@ -1,681 +0,0 @@ -{ - "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils-plus": { - "inputs": { - "flake-utils": "flake-utils" - }, - "locked": { - "lastModified": 1696331477, - "narHash": "sha256-YkbRa/1wQWdWkVJ01JvV+75KIdM37UErqKgTf0L54Fk=", - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "rev": "bfc53579db89de750b25b0c5e7af299e0c06d7d3", - "type": "github" - }, - "original": { - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "type": "github" - } - }, - "flake-utils-plus_2": { - "inputs": { - "flake-utils": "flake-utils_2" - }, - "locked": { - "lastModified": 1715533576, - "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=", - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", - "type": "github" - }, - "original": { - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", - "type": "github" - } - }, - "flake-utils-plus_3": { - "inputs": { - "flake-utils": "flake-utils_3" - }, - "locked": { - "lastModified": 1696331477, - "narHash": "sha256-YkbRa/1wQWdWkVJ01JvV+75KIdM37UErqKgTf0L54Fk=", - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "rev": "bfc53579db89de750b25b0c5e7af299e0c06d7d3", - "type": "github" - }, - "original": { - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "type": "github" - } - }, - "flake-utils-plus_4": { - "inputs": { - "flake-utils": "flake-utils_4" - }, - "locked": { - "lastModified": 1696331477, - "narHash": "sha256-YkbRa/1wQWdWkVJ01JvV+75KIdM37UErqKgTf0L54Fk=", - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "rev": "bfc53579db89de750b25b0c5e7af299e0c06d7d3", - "type": "github" - }, - "original": { - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nix-data": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "snowfall-lib": "snowfall-lib" - }, - "locked": { - "lastModified": 1698676531, - "narHash": "sha256-kLcAtvZPa1VKHmMJR3xiX94lkkmfUFvzn/pnw6r5w4I=", - "owner": "snowflakelinux", - "repo": "nix-data", - "rev": "c69c03a0ce67b59c99559c5b14a123cb0122509d", - "type": "github" - }, - "original": { - "owner": "snowflakelinux", - "repo": "nix-data", - "type": "github" - } - }, - "nix-software-center": { - "inputs": { - "nixos-appstream-data": "nixos-appstream-data", - "nixpkgs": [ - "snowflakeos-modules", - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1714856183, - "narHash": "sha256-Ue7xV+rZqImux4DDj3VMla4LIH2g8VeXbTJwgvX7wOo=", - "owner": "snowfallorg", - "repo": "nix-software-center", - "rev": "b9e0f53536e1e94e7d8c3cda3c6866b3f9d01386", - "type": "github" - }, - "original": { - "owner": "snowfallorg", - "repo": "nix-software-center", - "type": "github" - } - }, - "nixos-appstream-data": { - "inputs": { - "flake-utils": [ - "snowflakeos-modules", - "nix-software-center", - "utils" - ], - "nixpkgs": [ - "snowflakeos-modules", - "nix-software-center", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712858390, - "narHash": "sha256-XE7gr+zU3N4SHPAhsgk8cVAFp1iBg+Lxxp3y4dUF1vE=", - "owner": "korfuri", - "repo": "nixos-appstream-data", - "rev": "0465d42a4433faa63b7a5eb0b8d397937c9fc13a", - "type": "github" - }, - "original": { - "owner": "korfuri", - "ref": "flake", - "repo": "nixos-appstream-data", - "type": "github" - } - }, - "nixos-conf-editor": { - "inputs": { - "flake-compat": "flake-compat_3", - "nixpkgs": [ - "snowflakeos-modules", - "nixpkgs" - ], - "snowfall-lib": "snowfall-lib_3" - }, - "locked": { - "lastModified": 1707338010, - "narHash": "sha256-UtLeZzDdk96sLTRcWsGrkWCslNUDytrGe0VmOTB/iig=", - "owner": "snowfallorg", - "repo": "nixos-conf-editor", - "rev": "27b5e92f580f794c690093503869aab242f075ab", - "type": "github" - }, - "original": { - "owner": "snowfallorg", - "repo": "nixos-conf-editor", - "type": "github" - } - }, - "nixos-hardware": { - "locked": { - "lastModified": 1717574423, - "narHash": "sha256-cz3P5MZffAHwL2IQaNzsqUBsJS+u0J/AAwArHMAcCa0=", - "owner": "nixos", - "repo": "nixos-hardware", - "rev": "d6c6cf6f5fead4057d8fb2d5f30aa8ac1727f177", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "master", - "repo": "nixos-hardware", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1698318101, - "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "nix-data": "nix-data", - "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", - "snowfall-lib": "snowfall-lib_2", - "snowflakeos-modules": "snowflakeos-modules" - } - }, - "snow": { - "inputs": { - "nixpkgs": [ - "snowflakeos-modules", - "nixpkgs" - ], - "utils": "utils_2" - }, - "locked": { - "lastModified": 1704745201, - "narHash": "sha256-CPS6G6ZxyP3HV/R4xxc6VB2vFuiTF7xy31ncE+6KILk=", - "owner": "snowfallorg", - "repo": "snow", - "rev": "bb99e674ed04e4d1b27c2e60957579eef1cb5500", - "type": "github" - }, - "original": { - "owner": "snowfallorg", - "repo": "snow", - "type": "github" - } - }, - "snowfall-lib": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils-plus": "flake-utils-plus", - "nixpkgs": [ - "nix-data", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1696432959, - "narHash": "sha256-oJQZv2MYyJaVyVJY5IeevzqpGvMGKu5pZcCCJvb+xjc=", - "owner": "snowfallorg", - "repo": "lib", - "rev": "92803a029b5314d4436a8d9311d8707b71d9f0b6", - "type": "github" - }, - "original": { - "owner": "snowfallorg", - "repo": "lib", - "type": "github" - } - }, - "snowfall-lib_2": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils-plus": "flake-utils-plus_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1716675292, - "narHash": "sha256-7TFvVE4HR/b65/0AAhewYHEJzUXxIEJn82ow5bCkrDo=", - "owner": "snowfallorg", - "repo": "lib", - "rev": "5d6e9f235735393c28e1145bec919610b172a20f", - "type": "github" - }, - "original": { - "owner": "snowfallorg", - "repo": "lib", - "type": "github" - } - }, - "snowfall-lib_3": { - "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils-plus": "flake-utils-plus_3", - "nixpkgs": [ - "snowflakeos-modules", - "nixos-conf-editor", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1696432959, - "narHash": "sha256-oJQZv2MYyJaVyVJY5IeevzqpGvMGKu5pZcCCJvb+xjc=", - "owner": "snowfallorg", - "repo": "lib", - "rev": "92803a029b5314d4436a8d9311d8707b71d9f0b6", - "type": "github" - }, - "original": { - "owner": "snowfallorg", - "repo": "lib", - "type": "github" - } - }, - "snowfall-lib_4": { - "inputs": { - "flake-compat": "flake-compat_5", - "flake-utils-plus": "flake-utils-plus_4", - "nixpkgs": [ - "snowflakeos-modules", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1696432959, - "narHash": "sha256-oJQZv2MYyJaVyVJY5IeevzqpGvMGKu5pZcCCJvb+xjc=", - "owner": "snowfallorg", - "repo": "lib", - "rev": "92803a029b5314d4436a8d9311d8707b71d9f0b6", - "type": "github" - }, - "original": { - "owner": "snowfallorg", - "repo": "lib", - "type": "github" - } - }, - "snowflakeos-module-manager": { - "inputs": { - "nixpkgs": [ - "snowflakeos-modules", - "nixpkgs" - ], - "utils": "utils_3" - }, - "locked": { - "lastModified": 1695940028, - "narHash": "sha256-vsrX7uApokekSNIw1PLAOA/sFobBoLbXMoI/yp+coZo=", - "owner": "snowfallorg", - "repo": "snowflakeos-module-manager", - "rev": "68970b1a6c8cb25015636d91a48baefa8e5c4d48", - "type": "github" - }, - "original": { - "owner": "snowfallorg", - "repo": "snowflakeos-module-manager", - "type": "github" - } - }, - "snowflakeos-modules": { - "inputs": { - "nix-software-center": "nix-software-center", - "nixos-conf-editor": "nixos-conf-editor", - "nixpkgs": "nixpkgs_2", - "snow": "snow", - "snowfall-lib": "snowfall-lib_4", - "snowflakeos-module-manager": "snowflakeos-module-manager" - }, - "locked": { - "lastModified": 1710783230, - "narHash": "sha256-ETwwZZw3WZINEL0jIXAYEfb4gPsSdqaiDGKefobXVaw=", - "owner": "snowflakelinux", - "repo": "snowflakeos-modules", - "rev": "5a7241ba0d80d593eb9cd83b56e1836306f72b18", - "type": "github" - }, - "original": { - "owner": "snowflakelinux", - "repo": "snowflakeos-modules", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "utils": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_3": { - "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} From 1739fae4d3d186d2694287a7c8e3dc04dcecb898 Mon Sep 17 00:00:00 2001 From: kB01 Date: Mon, 12 Aug 2024 01:42:45 +0200 Subject: [PATCH 04/20] Trigger Workflow From 2aeec898f8984c28721924deca740603e18d7c81 Mon Sep 17 00:00:00 2001 From: kB01 Date: Mon, 12 Aug 2024 01:46:48 +0200 Subject: [PATCH 05/20] Edit workflow --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 39e21ad..d0f45e5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,4 +11,5 @@ jobs: uses: actions/checkout@v4 - run: echo /home/runner/externals/node20/bin >> $GITHUB_PATH - name: Get System Info - run: nix-shell -p fastfetch --run "fastfetch" >> $GITHUB_PATH + run: | + nix-shell -p fastfetch --run "fastfetch" From b15dcbaa3d5d9afd01c5cb4435f29a18ae8a318d Mon Sep 17 00:00:00 2001 From: kB01 Date: Mon, 12 Aug 2024 01:52:28 +0200 Subject: [PATCH 06/20] Updated Workflow --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d0f45e5..b081aa1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,12 +4,12 @@ jobs: build-HyperC: runs-on: docker container: - image: nixos/nix + image: niteo/nixpkgs-nixos-unstable name: Build NixOS Iso steps: - - name: Checkout - uses: actions/checkout@v4 - - run: echo /home/runner/externals/node20/bin >> $GITHUB_PATH + - name: Update Nix Store + run: | + nix-store --update - name: Get System Info run: | nix-shell -p fastfetch --run "fastfetch" From c460267420934f4baa7ac7552a02e91f48ac195f Mon Sep 17 00:00:00 2001 From: kB01 Date: Mon, 12 Aug 2024 01:56:21 +0200 Subject: [PATCH 07/20] Added Image Tag --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b081aa1..3451a3b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ jobs: build-HyperC: runs-on: docker container: - image: niteo/nixpkgs-nixos-unstable + image: niteo/nixpkgs-nixos-unstable:9e70e9f732fbb15872cb4ea11bd43c14328a0b69 name: Build NixOS Iso steps: - name: Update Nix Store From 77cce5d01e1b759af26c5bf8b4b7b40d53286adb Mon Sep 17 00:00:00 2001 From: kB01 Date: Mon, 12 Aug 2024 01:57:28 +0200 Subject: [PATCH 08/20] Changed Workflow --- .github/workflows/build.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3451a3b..7b9a21a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,8 +8,6 @@ jobs: name: Build NixOS Iso steps: - name: Update Nix Store - run: | - nix-store --update + run: nix-store --update - name: Get System Info - run: | - nix-shell -p fastfetch --run "fastfetch" + run: nix-shell -p fastfetch --run "fastfetch" From 623b957b7185ea6f674ade8f4044897f6ea94060 Mon Sep 17 00:00:00 2001 From: kB01 Date: Mon, 12 Aug 2024 01:59:34 +0200 Subject: [PATCH 09/20] Modified Nix Update --- .github/workflows/build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7b9a21a..1c11129 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,6 +8,8 @@ jobs: name: Build NixOS Iso steps: - name: Update Nix Store - run: nix-store --update + run: | + nix-channel --update - name: Get System Info - run: nix-shell -p fastfetch --run "fastfetch" + run: | + nix-shell -p fastfetch --run "fastfetch" From 6b9217dcc9fea2657807f8e6e7627157fc363449 Mon Sep 17 00:00:00 2001 From: kB01 Date: Mon, 12 Aug 2024 02:02:46 +0200 Subject: [PATCH 10/20] Modified Workflow Info --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c11129..46b6134 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,4 +12,4 @@ jobs: nix-channel --update - name: Get System Info run: | - nix-shell -p fastfetch --run "fastfetch" + nix-shell -p fastfetch --run fastfetch From 636ca40533632e60fa47446c4fb052ab4bd0f414 Mon Sep 17 00:00:00 2001 From: kB01 Date: Mon, 12 Aug 2024 02:25:50 +0200 Subject: [PATCH 11/20] HyperC Readme Link Test --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c50d1ba..6e3e534 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Now When you want to change your System, you ... ## Hosts -### HyperC +### [HyperC](./systems/x86_64-linux/HyperC) Surface Pro 2017 Tablet Cpu: Intel i5-7300U From 75fbeeb43c16b6c6b7f355a8d34d1753b4d9c1c9 Mon Sep 17 00:00:00 2001 From: kB01 Date: Mon, 12 Aug 2024 02:27:28 +0200 Subject: [PATCH 12/20] Added Links to Config Directories to Hosts in Readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6e3e534..1a19039 100644 --- a/README.md +++ b/README.md @@ -39,14 +39,14 @@ Cpu: Intel i5-7300U Ram: 8GB -### yerukall +### [yerukall](.systems/x86_64-linux/yerukall) Lenovo Thinkpad E14 Gen 4 Cpu: AMD Ryzen 5 5625U Ram: 16GB -### voloxo +### [voloxo](.systems/x86_64-linux/voloxo) My Gaming Desktop Cpu: AMD Ryzen 5 5600X From e4ba8da5358ace56ce2dc44723c70a6ba00d807c Mon Sep 17 00:00:00 2001 From: kB01 Date: Mon, 12 Aug 2024 02:42:53 +0200 Subject: [PATCH 13/20] Updated Instructions in readme --- README.md | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1a19039..5183655 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,11 @@ ![Forgejo Release](https://img.shields.io/gitea/v/release/kb01/nix-config?gitea_url=https%3A%2F%2Fgit.kb-one.de) [![standard-readme compliant](https://img.shields.io/badge/readme%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/RichardLitt/standard-readme) -This repository contains my NixOS Configuration Files. +This repository contains my Flake based NixOS Configuration Files. ## Usage + +### Setup Clone this Repository somewhere you can edit it easily: ```bash git clone https://git.kb-one.de/kb01/aux-config ~/Projects/aux-config @@ -22,13 +24,28 @@ sudo rm -R /etc/nixos sudo git clone ~/Projects/aux-config /etc/nixos ``` +Install Nixos Variant +```bash +cd /etc/nixos +sudo nixos-rebuild switch --flake .#voloxo # Or use any other Host +``` +Future Rebuilds don't need the Host Specifie, because it is now set. `sudo nixos-rebuild switch --flake .` + +### Updating the Flake Based NixOS Installation +```bash +cd /etc/nixos +sudo nix flake --update # This Updates the flake.lock +sudo nixos-rebuild switch --flake . +``` + +### Modify NixOS Installation Now When you want to change your System, you ... 1. Edit the config in ~/Project/aux-config `vim system/x86_64-linux/$HOST/default.nix` 2. Commit the Changes locally `git commit -m "Some Changes"` 3. Now you `cd /etc/nixos` -4. Update the Changes `sudo git pull --rebase` +4. Update the Changes `sudo git pull` 5. Build your System to apply the changes `sudo nixos-rebuild switch --flake .` -6. If you are Satisfied with your Changes, switch to ~/Projects/aux-config and Push your Changes to the Remote +6. When you're satisfied with your changes, go to ~/Projects/aux-config and push your changes to the remote ## Hosts From f9ae75dbb7af5900df67ad933c41348572125f34 Mon Sep 17 00:00:00 2001 From: kB01 Date: Tue, 13 Aug 2024 00:20:34 +0200 Subject: [PATCH 14/20] Added KDE Connect --- systems/x86_64-linux/HyperC/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/systems/x86_64-linux/HyperC/default.nix b/systems/x86_64-linux/HyperC/default.nix index f170620..8ba3d87 100644 --- a/systems/x86_64-linux/HyperC/default.nix +++ b/systems/x86_64-linux/HyperC/default.nix @@ -166,6 +166,8 @@ # Install firefox. programs.firefox.enable = true; + programs.kdeconnect.enable = true; + # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ From e2d87deab8f1606beb7b9fb7e203cba9c33ec959 Mon Sep 17 00:00:00 2001 From: kB01 Date: Tue, 13 Aug 2024 00:28:34 +0200 Subject: [PATCH 15/20] added Electron Insecure exception, fixed programs.vim, updated transmission packetname --- systems/x86_64-linux/HyperC/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/systems/x86_64-linux/HyperC/default.nix b/systems/x86_64-linux/HyperC/default.nix index 8ba3d87..5f0e6a1 100644 --- a/systems/x86_64-linux/HyperC/default.nix +++ b/systems/x86_64-linux/HyperC/default.nix @@ -11,6 +11,9 @@ ]; nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nixpkgs.config.permittedInsecurePackages = [ + "electron-27.3.11" + ]; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "veracrypt" @@ -184,7 +187,10 @@ ]; # Set default Editor - programs.vim.defaultEditor = true; + programs.vim = { + enable = true; + defaultEditor = true; + }; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. @@ -204,7 +210,7 @@ dataDir = "/home/kb"; configDir = "/home/kb/.config/syncthing"; }; - services.transmission.settings = { + services.transmission_3.settings = { download-dir = "${config.services.transmission.home}/Torrents"; }; # Enable the OpenSSH daemon. From 4a0ba1a7663c477213b7a15337d18800d0ea636f Mon Sep 17 00:00:00 2001 From: kB01 Date: Tue, 13 Aug 2024 00:30:27 +0200 Subject: [PATCH 16/20] Fixed Transmission Packetname confusion --- systems/x86_64-linux/HyperC/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/systems/x86_64-linux/HyperC/default.nix b/systems/x86_64-linux/HyperC/default.nix index 5f0e6a1..7b33e8a 100644 --- a/systems/x86_64-linux/HyperC/default.nix +++ b/systems/x86_64-linux/HyperC/default.nix @@ -126,7 +126,7 @@ vim filelight taxi - transmission + transmission_3 transmission-remote-gtk bookworm foliate @@ -210,7 +210,7 @@ dataDir = "/home/kb"; configDir = "/home/kb/.config/syncthing"; }; - services.transmission_3.settings = { + services.transmission.settings = { download-dir = "${config.services.transmission.home}/Torrents"; }; # Enable the OpenSSH daemon. From 5093fe8fb6723dc3e5a0c2ef326e91f2c4564495 Mon Sep 17 00:00:00 2001 From: kB01 Date: Fri, 23 Aug 2024 12:05:12 +0200 Subject: [PATCH 17/20] Added user Schlossrave for Event Light Control --- systems/x86_64-linux/HyperC/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/systems/x86_64-linux/HyperC/default.nix b/systems/x86_64-linux/HyperC/default.nix index 7b33e8a..df83b4c 100644 --- a/systems/x86_64-linux/HyperC/default.nix +++ b/systems/x86_64-linux/HyperC/default.nix @@ -108,6 +108,19 @@ # services.xserver.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.schlossrave = { + isNormalUser = true; + description = "schlossrave Service Account"; + extraGroups = [ "networkmanager" ]; + packages = with pkgs; [ + kdePackages.kate + fastfetch + btop + firefox + qlcplus + dig + ]; + }; users.users.kb = { isNormalUser = true; description = "kb"; From 2b8376d27de65fcca78143752c2e314146e32012 Mon Sep 17 00:00:00 2001 From: kB01 Date: Fri, 23 Aug 2024 16:16:16 +0200 Subject: [PATCH 18/20] Removed MyPaint because Build fails --- systems/x86_64-linux/HyperC/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/x86_64-linux/HyperC/default.nix b/systems/x86_64-linux/HyperC/default.nix index df83b4c..2b9d52f 100644 --- a/systems/x86_64-linux/HyperC/default.nix +++ b/systems/x86_64-linux/HyperC/default.nix @@ -134,7 +134,7 @@ xournalpp xournal rnote - mypaint + #mypaint firefox vim filelight From a9ab3790dec9550ada0d43efc9f0a29f79c36c77 Mon Sep 17 00:00:00 2001 From: kB01 Date: Fri, 23 Aug 2024 16:51:19 +0200 Subject: [PATCH 19/20] Removed iamb, because compile fails --- systems/x86_64-linux/HyperC/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/x86_64-linux/HyperC/default.nix b/systems/x86_64-linux/HyperC/default.nix index 2b9d52f..ab137ab 100644 --- a/systems/x86_64-linux/HyperC/default.nix +++ b/systems/x86_64-linux/HyperC/default.nix @@ -171,7 +171,7 @@ inkscape obs-studio steam - iamb # Matrix CLI + #iamb # Matrix CLI element-desktop # Matrix GUI dig alacritty # Terminal From 295610583a098901efcf4e572ea0a4e1765e125c Mon Sep 17 00:00:00 2001 From: kB01 Date: Mon, 26 Aug 2024 15:16:33 +0200 Subject: [PATCH 20/20] Re-Added Uninstallable Packages --- systems/x86_64-linux/HyperC/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/systems/x86_64-linux/HyperC/default.nix b/systems/x86_64-linux/HyperC/default.nix index ab137ab..df83b4c 100644 --- a/systems/x86_64-linux/HyperC/default.nix +++ b/systems/x86_64-linux/HyperC/default.nix @@ -134,7 +134,7 @@ xournalpp xournal rnote - #mypaint + mypaint firefox vim filelight @@ -171,7 +171,7 @@ inkscape obs-studio steam - #iamb # Matrix CLI + iamb # Matrix CLI element-desktop # Matrix GUI dig alacritty # Terminal