From 2f5fcd3f45de1138253e213422bd9155a8752339 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Wed, 19 Jun 2024 17:59:47 -0500 Subject: [PATCH] tmp --- flake.lock | 60 ++++++++++++++++---------------- hosts/desktop/configuration.nix | 1 + hosts/pi4/configuration.nix | 33 ++++++++++++++++-- hosts/pi4/home.nix | 61 --------------------------------- 4 files changed, 61 insertions(+), 94 deletions(-) diff --git a/flake.lock b/flake.lock index 8269f38..bb6c6dc 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1718291710, - "narHash": "sha256-yp3pQStGFCd0qSAULA7RaI9evMRZHPuN4dUuNNOhH80=", + "lastModified": 1718729996, + "narHash": "sha256-VO+5K2V1VpkIuYkqKH/aBsdlqUZFTjoxktbVVcbie4s=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "edbd85ef842fad14b8fe26cad2067868674dcf8d", + "rev": "741b5b7885bdbf32abafb2753cdd9436236b6c5c", "type": "github" }, "original": { @@ -227,11 +227,11 @@ ] }, "locked": { - "lastModified": 1718243258, - "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", + "lastModified": 1718716991, + "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", "owner": "nix-community", "repo": "home-manager", - "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", + "rev": "fab8e511d58f9c3f1cf8456abd685bfd381f7ebe", "type": "github" }, "original": { @@ -247,11 +247,11 @@ ] }, "locked": { - "lastModified": 1717527182, - "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", + "lastModified": 1718530513, + "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "owner": "nix-community", "repo": "home-manager", - "rev": "845a5c4c073f74105022533907703441e0464bc3", + "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "type": "github" }, "original": { @@ -268,11 +268,11 @@ ] }, "locked": { - "lastModified": 1718243258, - "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", + "lastModified": 1718716991, + "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", "owner": "nix-community", "repo": "home-manager", - "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", + "rev": "fab8e511d58f9c3f1cf8456abd685bfd381f7ebe", "type": "github" }, "original": { @@ -305,11 +305,11 @@ ] }, "locked": { - "lastModified": 1718173451, - "narHash": "sha256-ySzjpSDAmecKsoSqgqjKfEsgzRMiI87pLLJgY8haP+s=", + "lastModified": 1718695495, + "narHash": "sha256-ZimPldKvfVEKcpJjC3WZnAtLeEZely08t3m76pbXqIE=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "326c1ab2b816f520d298b7a4319a0b50cde01c48", + "rev": "d723a7e3962d683acdcd5658b351fdefe16bf04f", "type": "github" }, "original": { @@ -393,11 +393,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1718440858, - "narHash": "sha256-iMVwdob8F6P6Ib+pnhMZqyvYI10ZxmvA885jjnEaO54=", + "lastModified": 1718662658, + "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "58b905ea87674592aa84c37873e6c07bc3807aba", + "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf", "type": "github" }, "original": { @@ -486,11 +486,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1718459188, - "narHash": "sha256-umwY+ivE98n/6EwEtobOlqf1t9VddhPIIZ6rVmFXlHg=", + "lastModified": 1718548414, + "narHash": "sha256-1obyIuQPR/Kq1j5/i/5EuAfQrDwjYnjCDG8iLtXmBhQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0cd562157274df3783840bdcb0ce6d9c4cf4aa29", + "rev": "cde8f7e11f036160b0fd6a9e07dc4c8e4061cf06", "type": "github" }, "original": { @@ -502,11 +502,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718160348, - "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", + "lastModified": 1718530797, + "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", + "rev": "b60ebf54c15553b393d144357375ea956f89e9a9", "type": "github" }, "original": { @@ -534,11 +534,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1718208800, - "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=", + "lastModified": 1718437845, + "narHash": "sha256-ZT7Oc1g4I4pHVGGjQFnewFVDRLH5cIZhEzODLz9YXeY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b", + "rev": "752c634c09ceb50c45e751f8791cb45cb3d46c9e", "type": "github" }, "original": { @@ -550,11 +550,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1718318537, - "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", + "lastModified": 1718530797, + "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", + "rev": "b60ebf54c15553b393d144357375ea956f89e9a9", "type": "github" }, "original": { diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index c413fab..fc75b14 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -103,6 +103,7 @@ in # Enable Desktop Environment. displayManager = { sddm.enable = plasma; + sddm.wayland.enable = plasma; defaultSession = if plasma then "plasma" else "gnome"; }; diff --git a/hosts/pi4/configuration.nix b/hosts/pi4/configuration.nix index 40a911b..8a67f05 100644 --- a/hosts/pi4/configuration.nix +++ b/hosts/pi4/configuration.nix @@ -22,7 +22,6 @@ in imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ./docker-pi4.nix ../default.nix ]; @@ -40,14 +39,29 @@ in "usb_storage" ]; loader = { - grub.enable = false; - generic-extlinux-compatible.enable = true; + systemd-boot.enable = true; }; + # kernelParams = [ + # "snd_bcm2835.enable_hdmi=1" + # ]; }; + # hardware = { + # raspberry-pi."4".fkms-3d.enable = true; + # raspberry-pi."4".apply-overlays-dtmerge.enable = true; + # raspberry-pi."4".audio.enable = true; + # deviceTree = { + # enable = true; + # filter = "*rpi-4-*.dtb"; + # }; + # pulseaudio.enable = true; + # }; + # Set your time zone. time.timeZone = timezone; + sound.enable = true; + networking = { hostName = hostname; wireless = { @@ -57,8 +71,18 @@ in }; }; + # systemd.services.btattach = { + # before = [ "bluetooth.service" ]; + # after = [ "dev-ttyAMA0.device" ]; + # wantedBy = [ "multi-user.target" ]; + # serviceConfig = { + # ExecStart = "${pkgs.bluez}/bin/btattach -B /dev/ttyAMA0 -P bcm -S 3000000"; + # }; + # }; + environment.systemPackages = with pkgs; [ vim + libraspberrypi raspberrypi-eeprom htop git @@ -75,11 +99,14 @@ in "wheel" "docker" ]; + shell = pkgs.zsh; }; }; virtualisation.docker.enable = true; + console.enable = false; + # This option defines the first version of NixOS you have installed on this particular machine, # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. # diff --git a/hosts/pi4/home.nix b/hosts/pi4/home.nix index c23361a..64da31e 100644 --- a/hosts/pi4/home.nix +++ b/hosts/pi4/home.nix @@ -11,7 +11,6 @@ programs = { fish.enable = false; - mangohud.enable = true; java.enable = true; zsh = { @@ -52,64 +51,4 @@ }; programs.command-not-found.enable = true; - - home.packages = with pkgs; [ - # gamescope # using chaotic git version - # gamescope-wsi # using chaotic git version - deadnix - firefox - freerdp - gamescope_git - gamescope-wsi_git - gnome.gnome-tweaks - gnomeExtensions.appindicator - gnomeExtensions.arcmenu - gnomeExtensions.dash-to-panel - gnomeExtensions.tiling-assistant - goverlay - heroic - lm_sensors - lutris - mangohud - morph - neofetch - nixfmt-rfc-style - orca-slicer - papirus-icon-theme - pop-gtk-theme - protonvpn-gui - protonvpn-gui - python3 - tree - virt-manager - vmware-horizon-client - vorta - ]; - - dconf = { - enable = false; - settings = { - "org/gnome/desktop/interface".clock-format = "12h"; - "org/gnome/desktop/interface".color-scheme = "prefer-dark"; - "org/gnome/desktop/interface".enable-hot-corners = false; - "org/gnome/desktop/interface".font-antialiasing = "grayscale"; - "org/gnome/desktop/interface".font-hinting = "slight"; - "org/gnome/desktop/interface".icon-theme = "Papirus-Dark"; - "org/gnome/desktop/peripherals/mouse".accel-profile = "flat"; - "org/gnome/desktop/peripherals/touchpad".two-finger-scrolling-enabled = true; - "org/gnome/desktop/peripherals/touchpad".tap-to-click = true; - "org/gnome/mutter".experimental-features = [ "scale-monitor-framebuffer" "variable-refresh-rate" ]; - "org/gnome/tweaks".show-extensions-notice = false; - "org/gnome/shell".enabled-extensions = [ - "appindicatorsupport@rgcjonas.gmail.com" - "arcmenu@arcmenu.com" - "user-theme@gnome-shell-extensions.gcampax.github.com" - "dash-to-panel@jderose9.github.com" - "tiling-assistant@leleat-on-github" - ]; - "org/gnome/shell/extensions/dash-to-panel".primary-monitor = 1; - "org/gnome/shell/extensions/dash-to-panel".multi-monitors = false; - "org/gtk/settings/file-chooser".clock-format = "12h"; - }; - }; }