From 62445838afdd54184e8d4c1b618c4d5ed4361903 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Tue, 7 Jun 2022 18:16:53 +0200 Subject: upgrade to NixOS 22.05 --- flake.lock | 16 ++-- flake.nix | 4 +- usecases/desktop/development.nix | 5 +- usecases/desktop/graphical.nix | 36 ++++---- usecases/desktop/graphical/waybar.nix | 164 +++++++++++++++++----------------- usecases/desktop/music.nix | 7 +- 6 files changed, 110 insertions(+), 122 deletions(-) diff --git a/flake.lock b/flake.lock index bbf8fba..11d9ca9 100644 --- a/flake.lock +++ b/flake.lock @@ -22,16 +22,16 @@ ] }, "locked": { - "lastModified": 1651519540, - "narHash": "sha256-3k6p8VsTwwRPQjE8rrMh+o2AZACZn/eeYJ7ivdQ/Iro=", + "lastModified": 1654113405, + "narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0", + "rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-21.11", + "ref": "release-22.05", "repo": "home-manager", "type": "github" } @@ -54,16 +54,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1653918726, - "narHash": "sha256-C+BpRKWjuwR4a9R0w5V5AFaQiyDtRPSRec7VJCX1NI4=", + "lastModified": 1654442937, + "narHash": "sha256-dYJ79gt85hwIbPlX52eAwnkYzMexLyNRmRcTRpMn+Gw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "39945562539b572eb43915992ef82f46a7176364", + "rev": "ca2629644d4a5098004e20cb9ca179345f2acd8e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-21.11", + "ref": "nixos-22.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index da6353e..4cd55ba 100644 --- a/flake.nix +++ b/flake.nix @@ -1,11 +1,11 @@ { description = "My NixOS configurations"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05"; inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.home-manager = { - url = "github:nix-community/home-manager/release-21.11"; + url = "github:nix-community/home-manager/release-22.05"; inputs.nixpkgs.follows = "nixpkgs"; }; inputs.nur.url = "github:nix-community/NUR"; diff --git a/usecases/desktop/development.nix b/usecases/desktop/development.nix index 64e36cf..a7c9b6b 100644 --- a/usecases/desktop/development.nix +++ b/usecases/desktop/development.nix @@ -147,10 +147,7 @@ in enableBashIntegration = true; enableZshIntegration = true; - nix-direnv = { - enable = true; - enableFlakes = true; - }; + nix-direnv.enable = true; }; }; diff --git a/usecases/desktop/graphical.nix b/usecases/desktop/graphical.nix index afc61a4..059087d 100644 --- a/usecases/desktop/graphical.nix +++ b/usecases/desktop/graphical.nix @@ -15,7 +15,7 @@ inputs: users.extraUsers.minijackson.packages = with pkgs; [ arandr - gnome3.dconf + dconf gnome3.eog gnome3.evince gnome3.file-roller @@ -87,26 +87,24 @@ inputs: networking.firewall.allowedUDPPortRanges = [{ from = 1714; to = 1764; }]; home-manager.users.minijackson = { - gtk = - let - override-arc-theme = import ../../lib/override-arc-theme.nix { - inherit lib; - themeConfig = config.theme; - }; - in - { - enable = true; - iconTheme = { - # TODO: properly modify the colors - package = pkgs.arc-icon-theme; - name = "Arc"; - }; - theme = { - package = override-arc-theme pkgs.arc-theme; - name = "Arc-Dark"; - }; + gtk = { + enable = true; + iconTheme = { + # TODO: properly modify the colors + package = pkgs.gruvbox-dark-icons-gtk; + name = "oomox-gruvbox-dark"; + }; + theme = { + # package = override-arc-theme pkgs.arc-theme; + package = pkgs.gruvbox-dark-gtk; + name = "gruvbox-dark"; }; + gtk4.extraConfig = { + gtk-application-prefer-dark-theme = true; + }; + }; + services.kdeconnect = { enable = true; indicator = true; diff --git a/usecases/desktop/graphical/waybar.nix b/usecases/desktop/graphical/waybar.nix index e9a227a..84fa694 100644 --- a/usecases/desktop/graphical/waybar.nix +++ b/usecases/desktop/graphical/waybar.nix @@ -30,104 +30,102 @@ inputs: "tray" ]; - modules = { - mpd = lib.mkIf config.services.mpd.enable { - format = "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) "; - format-stopped = "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped "; - format-disconnected = "Disconnected "; - - on-click-middle = "${pkgs.alacritty}/bin/alacritty --command ncmpcpp"; - - consume-icons = { - on = " "; - }; - - random-icons = { - on = " "; - }; - - repeat-icons = { - on = " "; - }; - - single-icons = { - on = "1 "; - }; - - state-icons = { - playing = ""; - paused = ""; - }; - }; + mpd = lib.mkIf config.services.mpd.enable { + format = "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) "; + format-stopped = "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped "; + format-disconnected = "Disconnected "; - idle_inhibitor = { - format = "{icon}"; - format-icons = { - activated = ""; - deactivated = ""; - }; - }; + on-click-middle = "${pkgs.alacritty}/bin/alacritty --command ncmpcpp"; - clock = { - tooltip-format = "{:%Y-%m-%d | %H:%M}"; - format-alt = "{:%Y-%m-%d}"; + consume-icons = { + on = " "; }; - cpu = { format = "{usage}% "; }; - - memory = { format = "{}% "; }; - - battery = { - states = { good = 90; }; - format = "{capacity}% {icon}"; - format-icons = [ - "" - "" - "" - "" - "" - ]; + random-icons = { + on = " "; }; - "network#eth" = { - interface = "enp*"; - format-ethernet = "{ipaddr}/{cidr} "; - format-disconnected = "Disconnected "; + repeat-icons = { + on = " "; }; - "network#wlan" = { - interface = "wlp*"; - format-wifi = "{essid} ({signalStrength}%) "; - format-disconnected = "Disconnected "; - tooltip = true; - tooltip-format-wifi = "{ipaddr}/{cidr}"; + single-icons = { + on = "1 "; }; - temperature = { - hwmon-path = "/sys/class/hwmon/hwmon0/temp1_input"; - format = "{temperatureC} °C "; + state-icons = { + playing = ""; + paused = ""; }; + }; - backlight = { - format = "{percent}% {icon}"; - format-icons = [ "" "" ]; + idle_inhibitor = { + format = "{icon}"; + format-icons = { + activated = ""; + deactivated = ""; }; + }; + + clock = { + tooltip-format = "{:%Y-%m-%d | %H:%M}"; + format-alt = "{:%Y-%m-%d}"; + }; + + cpu = { format = "{usage}% "; }; + + memory = { format = "{}% "; }; + + battery = { + states = { good = 90; }; + format = "{capacity}% {icon}"; + format-icons = [ + "" + "" + "" + "" + "" + ]; + }; + + "network#eth" = { + interface = "enp*"; + format-ethernet = "{ipaddr}/{cidr} "; + format-disconnected = "Disconnected "; + }; + + "network#wlan" = { + interface = "wlp*"; + format-wifi = "{essid} ({signalStrength}%) "; + format-disconnected = "Disconnected "; + tooltip = true; + tooltip-format-wifi = "{ipaddr}/{cidr}"; + }; + + temperature = { + hwmon-path = "/sys/class/hwmon/hwmon0/temp1_input"; + format = "{temperatureC} °C "; + }; + + backlight = { + format = "{percent}% {icon}"; + format-icons = [ "" "" ]; + }; - pulseaudio = { - format = "{volume}% {icon}"; - format-bluetooth = "{volume}% {icon}"; - format-muted = ""; - format-icons = { - headphones = ""; - handsfree = ""; - headset = ""; - phone = ""; - portable = ""; - car = ""; - default = [ "" "" ]; - }; - on-click = "pavucontrol"; + pulseaudio = { + format = "{volume}% {icon}"; + format-bluetooth = "{volume}% {icon}"; + format-muted = ""; + format-icons = { + headphones = ""; + handsfree = ""; + headset = ""; + phone = ""; + portable = ""; + car = ""; + default = [ "" "" ]; }; + on-click = "pavucontrol"; }; }]; diff --git a/usecases/desktop/music.nix b/usecases/desktop/music.nix index e65d08e..d6c3fde 100644 --- a/usecases/desktop/music.nix +++ b/usecases/desktop/music.nix @@ -34,7 +34,7 @@ inputs: } ''; - startWhenNeeded = true; + #startWhenNeeded = true; }; home-manager.users.minijackson = { config, ... }: @@ -42,11 +42,6 @@ inputs: programs.beets = { enable = true; - package = pkgs.beets.override { - # Python SoCo failed to build - enableSonosUpdate = false; - }; - settings = { plugins = [ "absubmit" -- cgit v1.2.3