4 Commits f15ed8ff26 ... 8aa0dbf76e

Autore SHA1 Messaggio Data
  Johan Rong 8aa0dbf76e sdkfg 6 giorni fa
  Johan Rong a8fe235963 add pawse 6 giorni fa
  Johan Rong c0202e3bad Merge branch 'master' of github.com:johron/nix-dots 6 giorni fa
  Johan Rong 92f2b2ed12 onthespot 6 giorni fa

+ 115 - 23
flake.lock

@@ -19,11 +19,11 @@
     "dank-qml-common_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1792768249,
-        "narHash": "sha256-ST868TtggCJDEMkWTTOj2oG4F2s+SiAjwjs3kYbJltI=",
+        "lastModified": 1792829559,
+        "narHash": "sha256-8J9RuGpmYCFRcpLlRQunqL0FqjsNSzlsK/QFZV2hm1A=",
         "owner": "duxlabs-dev",
         "repo": "dux-qml-common",
-        "rev": "c392faee932369df77fa6aee466752a4580e9b9b",
+        "rev": "bb917ea0718892c875ca0955939f63b31dc64e1e",
         "type": "github"
       },
       "original": {
@@ -35,11 +35,11 @@
     "dank-qml-common_3": {
       "flake": false,
       "locked": {
-        "lastModified": 1792513666,
-        "narHash": "sha256-RDqPdPrM5lnwRrfFGLz3IwgTjCV2Ie+nrTD3ldj1t/s=",
+        "lastModified": 1792829559,
+        "narHash": "sha256-8J9RuGpmYCFRcpLlRQunqL0FqjsNSzlsK/QFZV2hm1A=",
         "owner": "duxlabs-dev",
         "repo": "dux-qml-common",
-        "rev": "ebf5e6c002da1bdaa4aaa2f319fea7b8507abc42",
+        "rev": "bb917ea0718892c875ca0955939f63b31dc64e1e",
         "type": "github"
       },
       "original": {
@@ -79,11 +79,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1792770166,
-        "narHash": "sha256-OX++NJ3tbZxCD+luFROZey1xFGI7mnoou/4yp9qplRg=",
+        "lastModified": 1792831670,
+        "narHash": "sha256-yqYf1mayqqSgGgHXDaWcN4P/xs8TcuV3QuLeQpTy8Ww=",
         "owner": "duxlabs-dev",
         "repo": "dux-files",
-        "rev": "7816966ad330772ad574560dfdac75886a739bfa",
+        "rev": "5908e136ee1516f2909be9a4681da29ad569af39",
         "type": "github"
       },
       "original": {
@@ -100,11 +100,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1792683863,
-        "narHash": "sha256-S+1g1tKn2QorHHjJA0lMYZUYPWlQkeQ93dLxiafeW8E=",
+        "lastModified": 1792831735,
+        "narHash": "sha256-x6R81W86jUCuxudaWwHJpnQD+v3vl1Y6FOvwxEsflZo=",
         "owner": "duxlabs-dev",
         "repo": "dux-greeter",
-        "rev": "4034ba1f5035ce384b322e8b2865495dad3cbb93",
+        "rev": "52f2393505a8149f81034ebddd7e86e93c432800",
         "type": "github"
       },
       "original": {
@@ -215,11 +215,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1792438572,
-        "narHash": "sha256-5mQQOcggBRBXB7NlzUxO0dbvQN4euJOISjNybrtfxPk=",
+        "lastModified": 1792818383,
+        "narHash": "sha256-199i7ubVSXTMl+0AAlL7cVCXSjcI+jWByMcimYjeMX0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "24f8f8e786f87d6a818e1746cb2389bf922afdab",
+        "rev": "24f2190587513b9c2f73db112a17844ae912d965",
         "type": "github"
       },
       "original": {
@@ -238,11 +238,11 @@
         "scenefx": "scenefx"
       },
       "locked": {
-        "lastModified": 1792753812,
-        "narHash": "sha256-yqtyYZQaJ6owTvRtgcv3rtIEngjzkalJ80eknjmJXwQ=",
+        "lastModified": 1792817697,
+        "narHash": "sha256-S823QIxWR96C1ltI+PXg1BT5cHsBv3zH19X2kT7hQkc=",
         "owner": "mangowm",
         "repo": "mango",
-        "rev": "a3990ecfd4ad14650712a599cd9010fcb72419bf",
+        "rev": "900b8d7e06c396a20b6d4e56f242c4e240a69dfa",
         "type": "github"
       },
       "original": {
@@ -253,16 +253,16 @@
     },
     "nix-flatpak": {
       "locked": {
-        "lastModified": 1767983141,
-        "narHash": "sha256-7ZCulYUD9RmJIDULTRkGLSW1faMpDlPKcbWJLYHoXcs=",
+        "lastModified": 1791644091,
+        "narHash": "sha256-nw4/Nzl13+A45km82FF4rXo9O7fGfXNk98UqyTRozog=",
         "owner": "gmodena",
         "repo": "nix-flatpak",
-        "rev": "440818969ac2cbd77bfe025e884d0aa528991374",
+        "rev": "7c7c1739cf476c2f85642f441f967cd91f479d2c",
         "type": "github"
       },
       "original": {
         "owner": "gmodena",
-        "ref": "v0.7.0",
+        "ref": "v0.8.0",
         "repo": "nix-flatpak",
         "type": "github"
       }
@@ -314,6 +314,38 @@
         "type": "github"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1792502884,
+        "narHash": "sha256-IoNisKcGbUjdd45qCqywGMCYmZ5EnkxezvLII0FWwNA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "02c087f3fe673c9e317f206a627cb6b910336dbe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "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",
@@ -334,6 +366,24 @@
         "type": "github"
       }
     },
+    "onthespot": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1792840764,
+        "narHash": "sha256-5K0puL424PKOv4Lj1ySFIu1voNUz2cR5AJuyt5F0Mqk=",
+        "owner": "johron",
+        "repo": "onthespot",
+        "rev": "029766acbf5067819689c0b0543c3351ca5f4059",
+        "type": "github"
+      },
+      "original": {
+        "owner": "johron",
+        "repo": "onthespot",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "dux": "dux",
@@ -344,7 +394,30 @@
         "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs",
         "nixvim": "nixvim",
-        "something-x": "something-x"
+        "onthespot": "onthespot",
+        "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": {
@@ -391,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,

+ 3 - 1
flake.nix

@@ -7,7 +7,7 @@
       url = "github:nix-community/home-manager/release-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.7.0";
+    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.8.0";
     mangowm = {
       url = "github:mangowm/mango";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -19,6 +19,8 @@
       url = "github:SoaOaoS/something-x";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    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

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

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