Johan Rong 6 天之前
父节点
当前提交
8aa0dbf76e
共有 6 个文件被更改,包括 78 次插入 和 7 次删除
  1. 58 1
      flake.lock
  2. 2 3
      flake.nix
  3. 14 0
      home/modules/apps/sonora.nix
  4. 1 0
      hosts/ono/home/default.nix
  5. 1 0
      hosts/straume/home/default.nix
  6. 2 3
      nixos/profiles/workstation/default.nix

+ 58 - 1
flake.lock

@@ -330,6 +330,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1790822859,
+        "narHash": "sha256-69xHQhAeMAD2wDXO7T2pcOZIF9Sga2W+JkmY2a11Ops=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixvim": {
       "inputs": {
         "flake-parts": "flake-parts_2",
@@ -379,7 +395,29 @@
         "nixpkgs": "nixpkgs",
         "nixvim": "nixvim",
         "onthespot": "onthespot",
-        "something-x": "something-x"
+        "something-x": "something-x",
+        "sonora": "sonora"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "sonora",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1789196581,
+        "narHash": "sha256-yJr1Bt4fKkKIpPYbsKGqJ0VFdoDnURgRwuffmBQ2WzY=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "228ecefb6329d5a531b77b46b581a2f0c26ee056",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
       }
     },
     "scenefx": {
@@ -426,6 +464,25 @@
         "type": "github"
       }
     },
+    "sonora": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_4",
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1792658446,
+        "narHash": "sha256-hTnTma8lpsxKPJK6BrnOdmsqv9HR7sDSxHm0aJtDjhI=",
+        "owner": "sonorahq",
+        "repo": "sonora",
+        "rev": "e2d099c3c714f8f011ea3ac98e260c91932bbb83",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sonorahq",
+        "repo": "sonora",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1689347949,

+ 2 - 3
flake.nix

@@ -19,9 +19,8 @@
       url = "github:SoaOaoS/something-x";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    onthespot = {
-      url = "github:johron/onthespot";
-    };
+    onthespot.url = "github:johron/onthespot";
+    sonora.url = "github:sonorahq/sonora";
 
     dux = {
       url = "github:duxlabs-dev/dux-shell/stable";

+ 14 - 0
home/modules/apps/sonora.nix

@@ -0,0 +1,14 @@
+{ inputs, ... }:
+
+{
+  imports = [
+    inputs.sonora.homeManagerModules.default
+  ];
+
+  programs.sonora = {
+    enable = true;
+    settings = {
+      appearance.theme = "dark";
+    };
+  };
+}

+ 1 - 0
hosts/ono/home/default.nix

@@ -9,6 +9,7 @@
 
     ../../../home/modules/apps/alacritty.nix
     ../../../home/modules/apps/firefox.nix
+    ../../../home/modules/apps/sonora.nix
     ../../../home/modules/apps/fish
     ../../../home/modules/apps/emacs
     ../../../home/modules/apps/neovim

+ 1 - 0
hosts/straume/home/default.nix

@@ -9,6 +9,7 @@
 
     ../../../home/modules/apps/alacritty.nix
     ../../../home/modules/apps/firefox.nix
+    ../../../home/modules/apps/sonora.nix
     ../../../home/modules/apps/fish
     ../../../home/modules/apps/emacs
     ../../../home/modules/apps/neovim

+ 2 - 3
nixos/profiles/workstation/default.nix

@@ -3,7 +3,6 @@
 {
   imports = [
     ./boot-splash.nix
-    #./inputs.nix
   ];
 
   environment.systemPackages = with pkgs; [
@@ -51,7 +50,7 @@
     inputs.something-x.packages.${pkgs.system}.something-x
     inputs.onthespot.packages.${pkgs.stdenv.hostPlatform.system}.default
   ];
-
+  
   services.samba = {
     enable = true;
     openFirewall = true;
@@ -70,7 +69,7 @@
       "com.github.tchx84.Flatseal"
       "com.dec05eba.gpu_screen_recorder"
       "com.ultimaker.cura"
-      { flatpakref = "https://popovpsk.github.io/pawse/pawse.flatpakref"; sha256="1vrx7pbvrk713msarhvc6r1pkn8bcblhwflfmxawqvmjw50x6xp0"; }
+      # { flatpakref = "https://popovpsk.github.io/pawse/pawse.flatpakref"; sha256="1vrx7pbvrk713msarhvc6r1pkn8bcblhwflfmxawqvmjw50x6xp0"; }
     ];
   };